Author: solomax
Date: Fri Oct 14 07:02:21 2016
New Revision: 1764821
URL: http://svn.apache.org/viewvc?rev=1764821&view=rev
Log:
[OPENMEETINGS-553] import/export should work as expected
Modified:
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1764821&r1=1764820&r2=1764821&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Fri Oct 14 07:02:21 2016
@@ -185,7 +185,7 @@ public class BackupImport {
private final Map<String, String> fileMap = new HashMap<>();
private enum Maps {
- USERS, ORGANISATIONS, APPOINTMENTS, ROOMS, MESSAGEFOLDERS,
USERCONTACTS
+ USERS, ORGANISATIONS, CALENDARS, APPOINTMENTS, ROOMS,
MESSAGEFOLDERS, USERCONTACTS
};
private static File validate(String zipname, File intended) throws
IOException {
@@ -452,8 +452,11 @@ public class BackupImport {
registry.bind(User.class, new UserConverter(userDao,
userMap));
//registry.bind(OmCalendar.SyncType.class,
OmCalendarSyncTypeConverter.class);
List<OmCalendar> list = readList(serializer, f,
"calendars.xml", "calendars", OmCalendar.class, true);
- for (OmCalendar a : list) {
-
+ for (OmCalendar c : list) {
+ Long id = c.getId();
+ c.setId(null);
+ c = calendarDao.update(c);
+ calendarMap.put(id, c.getId());
}
}
@@ -1245,6 +1248,11 @@ public class BackupImport {
newId = groupMap.get(oldId);
}
break;
+ case CALENDARS:
+ if (calendarMap.containsKey(oldId)) {
+ newId = calendarMap.get(oldId);
+ }
+ break;
case APPOINTMENTS:
if (appointmentMap.containsKey(oldId)) {
newId = appointmentMap.get(oldId);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java?rev=1764821&r1=1764820&r2=1764821&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
Fri Oct 14 07:02:21 2016
@@ -32,12 +32,12 @@ public class OmCalendarConverter extends
public OmCalendarConverter() {
//default constructor is for export
}
-
+
public OmCalendarConverter(OmCalendarDao calendarDao, Map<Long, Long>
idMap) {
this.calendarDao = calendarDao;
this.idMap = idMap;
}
-
+
@Override
public OmCalendar read(InputNode node) throws Exception {
long oldId = getLong(node);
@@ -52,4 +52,4 @@ public class OmCalendarConverter extends
node.setData(true);
node.setValue(value == null ? "0" : "" + value.getId());
}
-}
\ No newline at end of file
+}
Modified:
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1764821&r1=1764820&r2=1764821&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
(original)
+++
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Fri Oct 14 07:02:21 2016
@@ -185,7 +185,7 @@ public class BackupImport {
private final Map<String, String> fileMap = new HashMap<>();
private enum Maps {
- USERS, ORGANISATIONS, APPOINTMENTS, ROOMS, MESSAGEFOLDERS,
USERCONTACTS
+ USERS, ORGANISATIONS, CALENDARS, APPOINTMENTS, ROOMS,
MESSAGEFOLDERS, USERCONTACTS
};
private static File validate(String zipname, File intended) throws
IOException {
@@ -452,8 +452,11 @@ public class BackupImport {
registry.bind(User.class, new UserConverter(userDao,
userMap));
//registry.bind(OmCalendar.SyncType.class,
OmCalendarSyncTypeConverter.class);
List<OmCalendar> list = readList(serializer, f,
"calendars.xml", "calendars", OmCalendar.class, true);
- for (OmCalendar a : list) {
-
+ for (OmCalendar c : list) {
+ Long id = c.getId();
+ c.setId(null);
+ c = calendarDao.update(c);
+ calendarMap.put(id, c.getId());
}
}
@@ -1245,6 +1248,11 @@ public class BackupImport {
newId = groupMap.get(oldId);
}
break;
+ case CALENDARS:
+ if (calendarMap.containsKey(oldId)) {
+ newId = calendarMap.get(oldId);
+ }
+ break;
case APPOINTMENTS:
if (appointmentMap.containsKey(oldId)) {
newId = appointmentMap.get(oldId);
Modified:
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java?rev=1764821&r1=1764820&r2=1764821&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
(original)
+++
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
Fri Oct 14 07:02:21 2016
@@ -32,12 +32,12 @@ public class OmCalendarConverter extends
public OmCalendarConverter() {
//default constructor is for export
}
-
+
public OmCalendarConverter(OmCalendarDao calendarDao, Map<Long, Long>
idMap) {
this.calendarDao = calendarDao;
this.idMap = idMap;
}
-
+
@Override
public OmCalendar read(InputNode node) throws Exception {
long oldId = getLong(node);
@@ -52,4 +52,4 @@ public class OmCalendarConverter extends
node.setData(true);
node.setValue(value == null ? "0" : "" + value.getId());
}
-}
\ No newline at end of file
+}
