Author: solomax
Date: Thu Apr 26 08:22:22 2012
New Revision: 1330704
URL: http://svn.apache.org/viewvc?rev=1330704&view=rev
Log:
OPENMEETINGS-232 room import is fixed, as well as timezone input for admin (now
accepts iCal)
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/ImportHelper.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1330704&r1=1330703&r2=1330704&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
Thu Apr 26 08:22:22 2012
@@ -559,8 +559,7 @@ public class ImportInitvalues {
log.debug("Configuration ADDED");
}
- public void loadDefaultRooms(boolean createRooms) {
-
+ public void loadRoomTypes() {
long conference_Id = roommanagement
.addRoomType("conference (1-25 users)", false);
log.debug("conference_Id: " + conference_Id);
@@ -575,8 +574,19 @@ public class ImportInitvalues {
long interview_Id = roommanagement
.addRoomType("interview (1:1 meeting with
recording)", false);
log.debug("interview_Id: " + interview_Id);
-
+
+ //Custom room type is not in use anymore
+ roommanagement.addRoomType("custom (extension point for your
plugin)", true);
+ log.debug("RoomTypes ADDED");
+ }
+
+ public void loadDefaultRooms(boolean createRooms) {
if (createRooms) {
+ //hardcoded IDs (they are not intended to be changed)
+ long conference_Id = 1;
+ long restricted_Id = 3;
+ long interview_Id = 4;
+
roommanagement.addRoom(3, "public Interview Room",
interview_Id,
"", new Long(16), true, null, false,
false, null, false,
null, true, false, false, "", "", "",
null, null, null,
@@ -778,8 +788,10 @@ public class ImportInitvalues {
String timeZoneName = item.attributeValue("name");
String timeZoneLabel = item.attributeValue("label");
Integer orderId =
Integer.valueOf(item.attributeValue("orderId"));
+ String iCal = item.attributeValue("iCal");
OmTimeZone omTimeZone = new OmTimeZone();
+ omTimeZone.setIcal(iCal);
omTimeZone.setJname(timeZoneName);
omTimeZone.setLabel(timeZoneLabel);
omTimeZone.setOrderId(orderId);
@@ -966,11 +978,12 @@ public class ImportInitvalues {
loadSalutations();
// AppointMent Categories
loadInitAppointmentCategories();
- // Appointment Remindertypes
+ // Appointment Reminder types
loadInitAppointmentReminderTypes();
// Appointment poll types
loadPollTypes();
-
+ loadRoomTypes();
+
loadConfiguration(cfg);
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceService.java?rev=1330704&r1=1330703&r2=1330704&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceService.java
Thu Apr 26 08:22:22 2012
@@ -374,7 +374,7 @@ public class ConferenceService {
.equals(room_types_id))
continue;
-
rooom.setCurrentusers(this.getRoomClientsListByRoomId(rooom
+
rooom.setCurrentusers(getRoomClientsListByRoomId(rooom
.getRooms_id()));
result.add(rooom);
}
@@ -758,7 +758,7 @@ public class ConferenceService {
log.debug("getRoomClientsListByRoomId");
try {
LinkedList<RoomClient> clients = new
LinkedList<RoomClient>();
- HashMap<String, RoomClient> clientList =
this.clientListManager
+ HashMap<String, RoomClient> clientList =
clientListManager
.getClientListByRoom(room_id);
for (Iterator<String> iter =
clientList.keySet().iterator(); iter
.hasNext();) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java?rev=1330704&r1=1330703&r2=1330704&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java
Thu Apr 26 08:22:22 2012
@@ -318,16 +318,18 @@ public class Admin {
,
connectionProperties
);
}
- ClassPathXmlApplicationContext ctx =
getApplicationContext(ctxName);
- ImportInitvalues importInit =
ctx.getBean(ImportInitvalues.class);
if (cmdl.hasOption("file")) {
File backup =
checkRestoreFile(file);
dropDB(connectionProperties);
+
+ ImportInitvalues importInit =
getApplicationContext(ctxName).getBean(ImportInitvalues.class);
importInit.loadSystem(langPath,
cfg);
restoreOm(ctxName, backup);
} else {
- AdminUserDetails admin =
checkAdminDetails(importInit, langPath);
+ AdminUserDetails admin =
checkAdminDetails(ctxName, langPath);
dropDB(connectionProperties);
+
+ ImportInitvalues importInit =
getApplicationContext(ctxName).getBean(ImportInitvalues.class);
importInit.loadAll(langPath,
cfg, admin.login, admin.pass, admin.email, admin.group, admin.tz);
}
@@ -411,7 +413,7 @@ public class Admin {
String tz = null;
}
- private AdminUserDetails checkAdminDetails(ImportInitvalues importInit,
String langPath) throws Exception {
+ private AdminUserDetails checkAdminDetails(String ctxName, String
langPath) throws Exception {
AdminUserDetails admin = new AdminUserDetails();
admin.login = cmdl.getOptionValue("user");
admin.email = cmdl.getOptionValue("email");
@@ -436,13 +438,14 @@ public class Admin {
}
admin.pass = cmdl.getOptionValue("password");
if (checkPassword(admin.pass)) {
- System.out.print("Please enter password:");
+ System.out.print("Please enter password for the user '"
+ admin.login + "':");
admin.pass = new BufferedReader(new
InputStreamReader(System.in)).readLine();
if (checkPassword(admin.pass)) {
System.out.println("Password was not provided,
or too short, should be at least " +
InstallationConfig.USER_PASSWORD_MINIMUM_LENGTH + " character long.");
System.exit(1);
}
}
+ ImportInitvalues importInit =
getApplicationContext(ctxName).getBean(ImportInitvalues.class);
Map<String, String> tzMap =
ImportHelper.getAllTimeZones(importInit.getTimeZones(langPath));
admin.tz = null;
if (cmdl.hasOption("tz")) {
@@ -451,8 +454,9 @@ public class Admin {
}
if (admin.tz == null) {
System.out.println("Please enter timezone, Possible
timezones are:");
- for (String tzJname : tzMap.keySet()) {
- System.out.println(tzJname);
+
+ for (String tzIcal : tzMap.keySet()) {
+ System.out.println(String.format("%1$-25s%2$s",
"\"" + tzIcal + "\"", tzMap.get(tzIcal)));
}
System.exit(1);
}
@@ -464,6 +468,9 @@ public class Admin {
}
private void dropDB(ConnectionProperties props) throws Exception {
+ //FIXME drop will not work unless any of the --db-* option is
specified
+ //FIXME drop will drop not all tables (tables count is reduced
since 1.9)
+ //FIXME drop will throw an exception if table name is
changed/table is added
if(cmdl.hasOption("drop")) {
String[] mappingToolArgs = {"-sa", "drop", "-p",
omHome.getAbsolutePath() + "/WEB-INF/classes/META-INF/persistence.xml",
"-connectionDriverName",
props.getDriverName(), "-connectionURL", props.getConnectionURL(),
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1330704&r1=1330703&r2=1330704&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
Thu Apr 26 08:22:22 2012
@@ -1770,265 +1770,245 @@ public class BackupImportController exte
return null;
}
- private void importRooms(File roomFile) throws Exception {
-
- this.getRoomListByXML(roomFile);
-
- }
-
@SuppressWarnings("unchecked")
- private void getRoomListByXML(File roomFile) {
+ private void importRooms(File roomFile) throws Exception {
try {
-
- // List<Rooms> roomList = new LinkedList<Rooms>();
-
- // List<RoomModerators> roomModeratorList = new
- // LinkedList<RoomModerators>();
-
SAXReader reader = new SAXReader();
Document document = reader.read(roomFile);
Element root = document.getRootElement();
- for (Iterator<Element> i = root.elementIterator();
i.hasNext();) {
- Element itemObject = i.next();
- if (itemObject.getName().equals("rooms")) {
+ Element rooms = root.element("rooms");
+ for (Iterator<Element> innerIter = rooms
+ .elementIterator("room");
innerIter.hasNext();) {
+
+ Element roomObject = innerIter.next();
+
+ Long rooms_id =
importLongType(unformatString(roomObject
+
.element("rooms_id").getText()));
+ String name =
unformatString(roomObject.element("name")
+ .getText());
+ String deleted =
unformatString(roomObject.element(
+ "deleted").getText());
+ String comment =
unformatString(roomObject.element(
+ "comment").getText());
+ Long numberOfPartizipants =
importLongType(unformatString((roomObject
+
.element("numberOfPartizipants").getText())));
+ Boolean appointment =
importBooleanType(unformatString(roomObject
+
.element("appointment").getText()));
+ Long externalRoomId =
importLongType(unformatString(roomObject
+
.element("externalRoomId").getText()));
+ String externalRoomType =
unformatString(roomObject
+
.element("externalRoomType").getText());
+ Long roomtypes_id =
importLongType(unformatString(roomObject
+
.element("roomtypeId").getText()));
+
+ Boolean isDemoRoom = false;
+ if (roomObject
+ .element("isDemoRoom") != null)
{
+ isDemoRoom =
importBooleanType(unformatString(roomObject
+
.element("isDemoRoom").getText()));
+ }
+
+ Integer demoTime = null;
+ if (roomObject
+ .element("demoTime") != null) {
+ demoTime =
importIntegerType(unformatString(roomObject
+
.element("demoTime").getText()));
+ }
+
+ Boolean isModeratedRoom = false;
+ if (roomObject.element("isModeratedRoom") !=
null) {
+ isModeratedRoom =
importBooleanType(unformatString(roomObject
+
.element("isModeratedRoom").getText()));
+ }
+
+ Boolean allowUserQuestions = true;
+ if (roomObject.element("allowUserQuestions") !=
null) {
+ allowUserQuestions =
importBooleanType(unformatString(roomObject
+
.element("allowUserQuestions").getText()));
+ }
+
+
+ Boolean isAudioOnly = false;
+ if (roomObject.element("isAudioOnly") != null) {
+ isAudioOnly =
importBooleanType(unformatString(roomObject
+
.element("isAudioOnly").getText()));
+ }
+
+ String sipNumber = "";
+ if (roomObject.element("sipNumber") != null) {
+ sipNumber =
unformatString(roomObject.element(
+ "sipNumber").getText());
+ }
+
+ String conferencePin = "";
+ if (roomObject.element("conferencePin") !=
null) {
+ conferencePin =
unformatString(roomObject
+
.element("conferencePin").getText());
+ }
+
+ Boolean showMicrophoneStatus = false;
+ if (roomObject.element("showMicrophoneStatus")
!= null) {
+ showMicrophoneStatus =
importBooleanType(unformatString(roomObject
+
.element("showMicrophoneStatus").getText()));
+ }
- for (Iterator<Element> innerIter =
itemObject
-
.elementIterator("room"); innerIter.hasNext();) {
+ Long ownerId = null;
+ if (roomObject.element("ownerid") != null) {
+ ownerId = getNewId(
+
importLongType(unformatString(roomObject
+
.element("ownerid").getText())),
+ Maps.USERS);
+ }
- Element roomObject =
innerIter.next();
+ Boolean ispublic = false;
+ if (roomObject.element("ispublic") != null) {
+ ispublic =
importBooleanType(unformatString(roomObject
+
.element("ispublic").getText()));
+ }
- Long rooms_id =
importLongType(unformatString(roomObject
-
.element("rooms_id").getText()));
- String name =
unformatString(roomObject.element("name")
- .getText());
- String deleted =
unformatString(roomObject.element(
-
"deleted").getText());
- String comment =
unformatString(roomObject.element(
-
"comment").getText());
- Long numberOfPartizipants =
importLongType(unformatString((roomObject
-
.element("numberOfPartizipants").getText())));
- Boolean appointment =
importBooleanType(unformatString(roomObject
-
.element("appointment").getText()));
- Long externalRoomId =
importLongType(unformatString(roomObject
-
.element("externalRoomId").getText()));
- String externalRoomType =
unformatString(roomObject
-
.element("externalRoomType").getText());
- Long roomtypes_id =
importLongType(unformatString(roomObject
-
.element("roomtypeId").getText()));
-
- Boolean isDemoRoom = false;
- if (roomObject
-
.element("isDemoRoom") != null) {
- isDemoRoom =
importBooleanType(unformatString(roomObject
-
.element("isDemoRoom").getText()));
- }
-
- Integer demoTime = null;
- if (roomObject
-
.element("demoTime") != null) {
- demoTime =
importIntegerType(unformatString(roomObject
-
.element("demoTime").getText()));
- }
-
- Boolean isModeratedRoom = false;
- if
(roomObject.element("isModeratedRoom") != null) {
- isModeratedRoom =
importBooleanType(unformatString(roomObject
-
.element("isModeratedRoom").getText()));
- }
-
- Boolean allowUserQuestions =
true;
- if
(roomObject.element("allowUserQuestions") != null) {
- allowUserQuestions =
importBooleanType(unformatString(roomObject
-
.element("allowUserQuestions").getText()));
- }
-
-
- Boolean isAudioOnly = false;
- if
(roomObject.element("isAudioOnly") != null) {
- isAudioOnly =
importBooleanType(unformatString(roomObject
-
.element("isAudioOnly").getText()));
- }
-
- String sipNumber = "";
- if
(roomObject.element("sipNumber") != null) {
- sipNumber =
unformatString(roomObject.element(
-
"sipNumber").getText());
- }
-
- String conferencePin = "";
- if
(roomObject.element("conferencePin") != null) {
- conferencePin =
unformatString(roomObject
-
.element("conferencePin").getText());
- }
-
- Boolean showMicrophoneStatus =
false;
- if
(roomObject.element("showMicrophoneStatus") != null) {
- showMicrophoneStatus =
importBooleanType(unformatString(roomObject
-
.element("showMicrophoneStatus").getText()));
- }
+ Boolean waitForRecording = false;
+ if (roomObject.element("waitForRecording") !=
null) {
+ waitForRecording =
importBooleanType(unformatString(roomObject
+
.element("waitForRecording").getText()));
+ }
- Long ownerId = null;
- if
(roomObject.element("ownerid") != null) {
- ownerId = getNewId(
-
importLongType(unformatString(roomObject
-
.element("ownerid").getText())),
-
Maps.USERS);
- }
+ Boolean hideTopBar = false;
+ if (roomObject.element("hideTopBar") != null) {
+ hideTopBar =
importBooleanType(unformatString(roomObject
+
.element("hideTopBar").getText()));
+ }
- Boolean ispublic = false;
- if
(roomObject.element("ispublic") != null) {
- ispublic =
importBooleanType(unformatString(roomObject
-
.element("ispublic").getText()));
- }
+ Boolean isClosed = false;
+ if (roomObject.element("isClosed") != null) {
+ isClosed =
importBooleanType(unformatString(roomObject
+
.element("isClosed").getText()));
+ }
- Boolean waitForRecording =
false;
- if
(roomObject.element("waitForRecording") != null) {
- waitForRecording =
importBooleanType(unformatString(roomObject
-
.element("waitForRecording").getText()));
- }
+ Boolean allowRecording = false;
+ if (roomObject.element("allowRecording") !=
null) {
+ allowRecording =
importBooleanType(unformatString(roomObject
+
.element("allowRecording").getText()));
+ }
- Boolean hideTopBar = false;
- if
(roomObject.element("hideTopBar") != null) {
- hideTopBar =
importBooleanType(unformatString(roomObject
-
.element("hideTopBar").getText()));
- }
+ String redirectURL = "";
+ if (roomObject.element("redirectURL") != null) {
+ redirectURL =
unformatString(roomObject.element(
+
"redirectURL").getText());
+ }
+
+ Boolean hideActionsMenu = false;
+ if (roomObject.element("hideActionsMenu") !=
null) {
+ hideTopBar =
importBooleanType(unformatString(roomObject
+
.element("hideActionsMenu").getText()));
+ }
+
+ Boolean hideActivitiesAndActions = false;
+ if
(roomObject.element("hideActivitiesAndActions") != null) {
+ hideTopBar =
importBooleanType(unformatString(roomObject
+
.element("hideActivitiesAndActions").getText()));
+ }
+
+ Boolean hideChat = false;
+ if (roomObject.element("hideChat") != null) {
+ hideTopBar =
importBooleanType(unformatString(roomObject
+
.element("hideChat").getText()));
+ }
+
+ Boolean hideFilesExplorer = false;
+ if (roomObject.element("hideFilesExplorer") !=
null) {
+ hideTopBar =
importBooleanType(unformatString(roomObject
+
.element("hideFilesExplorer").getText()));
+ }
+
+ Boolean hideScreenSharing = false;
+ if (roomObject.element("hideScreenSharing") !=
null) {
+ hideTopBar =
importBooleanType(unformatString(roomObject
+
.element("hideScreenSharing").getText()));
+ }
+
+ Boolean hideWhiteboard = false;
+ if (roomObject.element("hideWhiteboard") !=
null) {
+ hideTopBar =
importBooleanType(unformatString(roomObject
+
.element("hideWhiteboard").getText()));
+ }
- Boolean isClosed = false;
- if
(roomObject.element("isClosed") != null) {
- isClosed =
importBooleanType(unformatString(roomObject
-
.element("isClosed").getText()));
- }
+ Rooms room = new Rooms();
+ room.setRooms_id(rooms_id);
+ room.setOwnerId(ownerId);
+ room.setName(name);
+ room.setDeleted(deleted);
+ room.setComment(comment);
+
room.setNumberOfPartizipants(numberOfPartizipants);
+ room.setAppointment(appointment);
+ room.setExternalRoomId(externalRoomId);
+ room.setExternalRoomType(externalRoomType);
+ room.setRoomtype(roommanagement
+
.getRoomTypesById(roomtypes_id));
+ room.setIsDemoRoom(isDemoRoom);
+ room.setDemoTime(demoTime);
+ room.setIsModeratedRoom(isModeratedRoom);
+ room.setAllowUserQuestions(allowUserQuestions);
+ room.setIsAudioOnly(isAudioOnly);
+ room.setSipNumber(sipNumber);
+ room.setConferencePin(conferencePin);
+ room.setIspublic(ispublic);
+ room.setIsClosed(isClosed);
+ room.setRedirectURL(redirectURL);
+ room.setWaitForRecording(waitForRecording);
+ room.setHideTopBar(hideTopBar);
+ room.setAllowRecording(allowRecording);
+
room.setShowMicrophoneStatus(showMicrophoneStatus);
+ room.setHideActionsMenu(hideActionsMenu);
+
room.setHideActivitiesAndActions(hideActivitiesAndActions);
+ room.setHideChat(hideChat);
+ room.setHideFilesExplorer(hideFilesExplorer);
+ room.setHideScreenSharing(hideScreenSharing);
+ room.setHideWhiteboard(hideWhiteboard);
+
+ Long roomId = room.getRooms_id();
+
+ // We need to reset this as openJPA reject to
store them
+ // otherwise
+ room.setRooms_id(null);
+
+ Long newRoomId = roommanagement.addRoom(room);
+ roomsMap.put(roomId, newRoomId);
+
+ for (Iterator<Element> iterMods = roomObject
+
.elementIterator("room_moderators"); iterMods
+ .hasNext();) {
- Boolean allowRecording = false;
- if
(roomObject.element("allowRecording") != null) {
- allowRecording =
importBooleanType(unformatString(roomObject
-
.element("allowRecording").getText()));
- }
+ Element room_moderators =
iterMods.next();
- String redirectURL = "";
- if
(roomObject.element("redirectURL") != null) {
- redirectURL =
unformatString(roomObject.element(
-
"redirectURL").getText());
- }
-
- Boolean hideActionsMenu = false;
- if
(roomObject.element("hideActionsMenu") != null) {
- hideTopBar =
importBooleanType(unformatString(roomObject
-
.element("hideActionsMenu").getText()));
- }
-
- Boolean
hideActivitiesAndActions = false;
- if
(roomObject.element("hideActivitiesAndActions") != null) {
- hideTopBar =
importBooleanType(unformatString(roomObject
-
.element("hideActivitiesAndActions").getText()));
- }
-
- Boolean hideChat = false;
- if
(roomObject.element("hideChat") != null) {
- hideTopBar =
importBooleanType(unformatString(roomObject
-
.element("hideChat").getText()));
- }
-
- Boolean hideFilesExplorer =
false;
- if
(roomObject.element("hideFilesExplorer") != null) {
- hideTopBar =
importBooleanType(unformatString(roomObject
-
.element("hideFilesExplorer").getText()));
- }
-
- Boolean hideScreenSharing =
false;
- if
(roomObject.element("hideScreenSharing") != null) {
- hideTopBar =
importBooleanType(unformatString(roomObject
-
.element("hideScreenSharing").getText()));
- }
-
- Boolean hideWhiteboard = false;
- if
(roomObject.element("hideWhiteboard") != null) {
- hideTopBar =
importBooleanType(unformatString(roomObject
-
.element("hideWhiteboard").getText()));
- }
+ for (Iterator<Element> iterMod =
room_moderators
+
.elementIterator("room_moderator"); iterMod
+ .hasNext();) {
- Rooms room = new Rooms();
- room.setRooms_id(rooms_id);
- room.setOwnerId(ownerId);
- room.setName(name);
- room.setDeleted(deleted);
- room.setComment(comment);
-
room.setNumberOfPartizipants(numberOfPartizipants);
-
room.setAppointment(appointment);
-
room.setExternalRoomId(externalRoomId);
-
room.setExternalRoomType(externalRoomType);
- room.setRoomtype(roommanagement
-
.getRoomTypesById(roomtypes_id));
- room.setIsDemoRoom(isDemoRoom);
- room.setDemoTime(demoTime);
-
room.setIsModeratedRoom(isModeratedRoom);
-
room.setAllowUserQuestions(allowUserQuestions);
-
room.setIsAudioOnly(isAudioOnly);
- room.setSipNumber(sipNumber);
-
room.setConferencePin(conferencePin);
- room.setIspublic(ispublic);
- room.setIsClosed(isClosed);
-
room.setRedirectURL(redirectURL);
-
room.setWaitForRecording(waitForRecording);
- room.setHideTopBar(hideTopBar);
-
room.setAllowRecording(allowRecording);
-
room.setShowMicrophoneStatus(showMicrophoneStatus);
-
room.setHideActionsMenu(hideActionsMenu);
-
room.setHideActivitiesAndActions(hideActivitiesAndActions);
- room.setHideChat(hideChat);
-
room.setHideFilesExplorer(hideFilesExplorer);
-
room.setHideScreenSharing(hideScreenSharing);
-
room.setHideWhiteboard(hideWhiteboard);
-
- Long roomId =
room.getRooms_id();
-
- // We need to reset this as
openJPA reject to store them
- // otherwise
- room.setRooms_id(null);
-
- Long newRoomId =
roommanagement.addRoom(room);
- roomsMap.put(roomId, newRoomId);
-
- for (Iterator<Element> iterMods
= roomObject
-
.elementIterator("room_moderators"); iterMods
- .hasNext();) {
-
- Element room_moderators
= iterMods.next();
-
- for (Iterator<Element>
iterMod = room_moderators
-
.elementIterator("room_moderator"); iterMod
-
.hasNext();) {
-
- Element
room_moderator = iterMod.next();
-
- RoomModerators
roomModerators = new RoomModerators();
-
- Long user_id =
getNewId(
-
importLongType(unformatString(room_moderator
-
.element("user_id").getText())),
-
Maps.USERS);
- Boolean
is_supermoderator = importBooleanType(unformatString(room_moderator
-
.element("is_supermoderator").getText()));
+ Element room_moderator =
iterMod.next();
-
roomModerators.setDeleted("false");
-
roomModerators.setRoomId(getNewId(rooms_id,
-
Maps.ROOMS));
-
roomModerators.setUser(userManagement
-
.getUserById(user_id));
- roomModerators
-
.setIsSuperModerator(is_supermoderator);
+ RoomModerators roomModerators =
new RoomModerators();
-
roomModeratorsDao
-
.addRoomModeratorByObj(roomModerators);
+ Long user_id = getNewId(
+
importLongType(unformatString(room_moderator
+
.element("user_id").getText())),
+ Maps.USERS);
+ Boolean is_supermoderator =
importBooleanType(unformatString(room_moderator
+
.element("is_supermoderator").getText()));
- }
+
roomModerators.setDeleted("false");
+
roomModerators.setRoomId(getNewId(rooms_id,
+ Maps.ROOMS));
+
roomModerators.setUser(userManagement
+
.getUserById(user_id));
+ roomModerators
+
.setIsSuperModerator(is_supermoderator);
- }
+ roomModeratorsDao
+
.addRoomModeratorByObj(roomModerators);
}
-
}
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/ImportHelper.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/ImportHelper.java?rev=1330704&r1=1330703&r2=1330704&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/ImportHelper.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/ImportHelper.java
Thu Apr 26 08:22:22 2012
@@ -50,10 +50,10 @@ public class ImportHelper {
log.debug("omTimeZoneList :: " + tzList.size());
for (OmTimeZone omTimeZone : tzList) {
- String labelName = omTimeZone.getJname() + " ("
- + omTimeZone.getLabel() + ")";
+ String labelName = omTimeZone.getLabel() + " ("
+ + omTimeZone.getJname() + ")";
log.debug("labelName :: " + labelName);
- result.put(omTimeZone.getJname(), labelName);
+ result.put(omTimeZone.getIcal(), labelName);
}
return result;
