Author: sebawagner
Date: Sun Aug 11 03:09:29 2013
New Revision: 1512861
URL: http://svn.apache.org/r1512861
Log:
OPENMEETINGS-758 Remove room admin Flash UI and Server Side related API
Removed:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/roomadmin/
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/conference/RoomManager.java
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/ConferenceService.java
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx?rev=1512861&r1=1512860&r2=1512861&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx
(original)
+++
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx
Sun Aug 11 03:09:29 2013
@@ -24,7 +24,6 @@
<!-- admin modules -->
<!-- -->
<include href="useradmin/" />
- <include href="roomadmin/" />
<!-- -->
<include href="servers/" />
Modified:
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/conference/RoomManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/conference/RoomManager.java?rev=1512861&r1=1512860&r2=1512861&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/conference/RoomManager.java
(original)
+++
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/conference/RoomManager.java
Sun Aug 11 03:09:29 2013
@@ -1132,56 +1132,6 @@ public class RoomManager {
return null;
}
- /**
- * Update a Record in the rooms table
- * @param rooms_id
- * @param roomtypes_id
- * @param name
- * @param ispublic
- * @param comment
- * @param hideActivitiesAndActions TODO
- * @param hideFilesExplorer TODO
- * @param hideActionsMenu TODO
- * @param hideScreenSharing TODO
- * @param hideWhiteboard TODO
- * @return
- */
- public Long updateRoom(long user_level, long rooms_id, long
roomtypes_id,
- String name, boolean ispublic, String comment,
- Long numberOfPartizipants, List<Integer> organisations,
- Boolean appointment, Boolean isDemoRoom, Integer
demoTime,
- Boolean isModeratedRoom, List<Map<String, Object>>
roomModerators,
- Boolean allowUserQuestions, Boolean isAudioOnly,
Boolean allowFontStyles, Boolean isClosed,
- String redirectURL, String conferencePin,
- Long ownerId, Boolean waitForRecording, Boolean
allowRecording,
- Boolean hideTopBar, Boolean hideChat, Boolean
hideActivitiesAndActions,
- Boolean hideFilesExplorer, Boolean hideActionsMenu,
Boolean hideScreenSharing, Boolean hideWhiteboard,
- Boolean showMicrophoneStatus, Boolean chatModerated,
boolean chatOpened, boolean filesOpened
- , boolean autoVideoSelect, boolean sipEnabled) {
- try {
-
- log.debug("*** updateRoom numberOfPartizipants: "
- + numberOfPartizipants);
- if (authLevelUtil.checkAdminLevel(user_level)) {
-
- return this.updateRoomInternal(rooms_id,
roomtypes_id, name,
- ispublic, comment,
numberOfPartizipants, organisations,
- appointment, isDemoRoom,
demoTime, isModeratedRoom,
- roomModerators,
allowUserQuestions, isAudioOnly, allowFontStyles,
- isClosed, redirectURL,
conferencePin,
- ownerId, waitForRecording,
allowRecording, hideTopBar, hideChat,
- hideActivitiesAndActions,
hideFilesExplorer, hideActionsMenu,
- hideScreenSharing,
hideWhiteboard, showMicrophoneStatus, chatModerated
- , chatOpened, filesOpened,
autoVideoSelect, sipEnabled);
-
- }
-
- } catch (Exception ex2) {
- log.error("[updateRoom] ", ex2);
- }
- return null;
- }
-
public Long updateRoomInternal(long rooms_id, long roomtypes_id,
String name, boolean ispublic, String comment,
Long numberOfPartizipants, List<Integer> organisations,
Modified:
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/ConferenceService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/ConferenceService.java?rev=1512861&r1=1512860&r2=1512861&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/ConferenceService.java
(original)
+++
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/ConferenceService.java
Sun Aug 11 03:09:29 2013
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
@@ -490,139 +489,6 @@ public class ConferenceService {
orderby, asc);
}
- /**
- * get all Organisations of a room
- *
- * @param SID
- * @param rooms_id
- * @return - all Organisations of a room
- */
- public List<RoomOrganisation> getOrganisationByRoom(String SID,
- long rooms_id) {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- return roomManager.getOrganisationsByRoom(user_level, rooms_id);
- }
-
- /**
- *
- * @param SID
- * @param argObject
- * @return - id of the room being saved, null in case of the error
- */
- public Long saveOrUpdateRoom(String SID, Object argObject) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- long User_level =
userManager.getUserLevelByID(users_id);
- log.debug("argObject: 1 - " +
argObject.getClass().getName());
- @SuppressWarnings("unchecked")
- LinkedHashMap<String, Object> argObjectMap =
(LinkedHashMap<String, Object>) argObject;
- log.debug("argObject: 2 - "
- +
argObjectMap.get("organisations").getClass().getName());
- @SuppressWarnings("unchecked")
- List<Integer> organisations = (List<Integer>)
argObjectMap
- .get("organisations");
- Long rooms_id = Long.valueOf(
-
argObjectMap.get("rooms_id").toString()).longValue();
- log.debug("rooms_id " + rooms_id);
-
- @SuppressWarnings("unchecked")
- List<Map<String, Object>> roomModerators =
(List<Map<String, Object>>) argObjectMap
- .get("roomModerators");
-
- Integer demoTime = null;
- if (argObjectMap.get("demoTime").toString() != null
- &&
argObjectMap.get("demoTime").toString().length() > 0) {
- demoTime = Integer.valueOf(
-
argObjectMap.get("demoTime").toString()).intValue();
- }
-
- long roomId = -1;
- if (rooms_id == 0) {
- roomId = roomManager.addRoom(
- User_level
- ,
argObjectMap.get("name").toString()
- ,
Long.valueOf(argObjectMap.get("roomtypes_id").toString()).longValue()
- ,
argObjectMap.get("comment").toString()
- ,
Long.valueOf(argObjectMap.get("numberOfPartizipants").toString()).longValue()
- ,
Boolean.valueOf(argObjectMap.get("ispublic").toString())
- , organisations
- ,
Boolean.valueOf(argObjectMap.get("appointment").toString())
- ,
Boolean.valueOf(argObjectMap.get("isDemoRoom").toString())
- , demoTime
- ,
Boolean.valueOf(argObjectMap.get("isModeratedRoom").toString())
- , roomModerators
- ,
Boolean.valueOf(argObjectMap.get("allowUserQuestions").toString())
- ,
Boolean.valueOf(argObjectMap.get("isAudioOnly").toString())
- ,
Boolean.valueOf(argObjectMap.get("allowFontStyles").toString())
- ,
Boolean.valueOf(argObjectMap.get("isClosed").toString())
- ,
argObjectMap.get("redirectURL").toString()
- ,
argObjectMap.get("conferencePin").toString()
- ,
Long.valueOf(argObjectMap.get("ownerId").toString()).longValue()
- ,
Boolean.valueOf(argObjectMap.get("waitForRecording").toString())
- ,
Boolean.valueOf(argObjectMap.get("allowRecording").toString())
- ,
Boolean.valueOf(argObjectMap.get("hideTopBar").toString())
- ,
Boolean.valueOf(argObjectMap.get("hideChat").toString())
- ,
Boolean.valueOf(argObjectMap.get("hideActivitiesAndActions").toString())
- ,
Boolean.valueOf(argObjectMap.get("hideFilesExplorer").toString())
- ,
Boolean.valueOf(argObjectMap.get("hideActionsMenu").toString())
- ,
Boolean.valueOf(argObjectMap.get("hideScreenSharing").toString())
- ,
Boolean.valueOf(argObjectMap.get("hideWhiteboard").toString())
- ,
Boolean.valueOf(argObjectMap.get("showMicrophoneStatus").toString())
- ,
Boolean.valueOf(argObjectMap.get("chatModerated").toString())
- ,
Boolean.valueOf(argObjectMap.get("chatOpened").toString())
- ,
Boolean.valueOf(argObjectMap.get("filesOpened").toString())
- ,
Boolean.valueOf(argObjectMap.get("autoVideoSelect").toString())
- ,
Boolean.valueOf(argObjectMap.get("sipEnabled").toString())
- );
- } else if (rooms_id > 0) {
- roomId = roomManager.updateRoom(
- User_level
- , rooms_id
- ,
Long.valueOf(argObjectMap.get("roomtypes_id").toString()).longValue()
- ,
argObjectMap.get("name").toString()
- ,
Boolean.valueOf(argObjectMap.get("ispublic").toString())
- ,
argObjectMap.get("comment").toString()
- ,
Long.valueOf(argObjectMap.get("numberOfPartizipants").toString()).longValue()
- , organisations
- ,
Boolean.valueOf(argObjectMap.get("appointment").toString())
- ,
Boolean.valueOf(argObjectMap.get("isDemoRoom").toString())
- , demoTime
- ,
Boolean.valueOf(argObjectMap.get("isModeratedRoom").toString())
- , roomModerators
- ,
Boolean.valueOf(argObjectMap.get("allowUserQuestions").toString())
- ,
Boolean.valueOf(argObjectMap.get("isAudioOnly").toString())
- ,
Boolean.valueOf(argObjectMap.get("allowFontStyles").toString())
- ,
Boolean.valueOf(argObjectMap.get("isClosed").toString())
- ,
argObjectMap.get("redirectURL").toString()
- ,
argObjectMap.get("conferencePin").toString()
- ,
Long.valueOf(argObjectMap.get("ownerId").toString()).longValue()
- ,
Boolean.valueOf(argObjectMap.get("waitForRecording").toString())
- ,
Boolean.valueOf(argObjectMap.get("allowRecording").toString())
- ,
Boolean.valueOf(argObjectMap.get("hideTopBar").toString())
- ,
Boolean.valueOf(argObjectMap.get("hideChat").toString())
- ,
Boolean.valueOf(argObjectMap.get("hideActivitiesAndActions").toString())
- ,
Boolean.valueOf(argObjectMap.get("hideFilesExplorer").toString())
- ,
Boolean.valueOf(argObjectMap.get("hideActionsMenu").toString())
- ,
Boolean.valueOf(argObjectMap.get("hideScreenSharing").toString())
- ,
Boolean.valueOf(argObjectMap.get("hideWhiteboard").toString())
- ,
Boolean.valueOf(argObjectMap.get("showMicrophoneStatus").toString())
- ,
Boolean.valueOf(argObjectMap.get("chatModerated").toString())
- ,
Boolean.valueOf(argObjectMap.get("chatOpened").toString())
- ,
Boolean.valueOf(argObjectMap.get("filesOpened").toString())
- ,
Boolean.valueOf(argObjectMap.get("autoVideoSelect").toString())
- ,
Boolean.valueOf(argObjectMap.get("sipEnabled").toString())
- );
- }
-
- return roomId;
-
- } catch (Exception e) {
- log.error("saveOrUpdateRoom", e);
- }
- return null;
- }
-
public List<RoomModerator> getRoomModeratorsByRoomId(String SID,
Long roomId) {
try {
