You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/08/05 19:15:03 UTC
svn commit: r1369621 - in /incubator/openmeetings/trunk/singlewebapp: docs/
src/org/openmeetings/app/data/conference/ src/org/openmeetings/axis/services/
Author: sebawagner
Date: Sun Aug 5 17:15:02 2012
New Revision: 1369621
URL: http://svn.apache.org/viewvc?rev=1369621&view=rev
Log:
Fixes: Deleting of room via SOAP/REST api was only possible if user level is admin (SOAP-Only should be sufficient)
updateRoom API calls "allowUserQuestions" not synced + hideOptions API call not duplicated in WebServiceFacade
Modified:
incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebServiceFacade.java
Modified: incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html?rev=1369621&r1=1369620&r2=1369621&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html Sun Aug 5 17:15:02 2012
@@ -153,9 +153,7 @@ limitations under the License.
</div>
<div>
<a href="#updateRoomWithModerationQuestionsAudioTypeAndHideOptions"><b>updateRoomWithModerationQuestionsAudioTypeAndHideOptions</b></a><br/>
- <div class="navigation_comment"><i >update room with options for user questions, audio only and hide
-
- * @param SID The SID of the User. This SID must be marked as Loggedin</i></div>
+ <div class="navigation_comment"><i >update room with options for user questions, audio only and hide</i></div>
</div>
<div>
<a href="#deleteRoom"><b>deleteRoom</b></a><br/>
@@ -2034,7 +2032,8 @@ limitations under the License.
Boolean
</td>
<td valign="top">hideWhiteboard</td>
- <td valign="top">hide or show Whiteboard. If whitboard is hidden, video pods and scrollbar appear instead.</td>
+ <td valign="top">hide or show Whiteboard. If whitboard is hidden, video pods
+ and scrollbar appear instead.</td>
</tr>
</tbody>
@@ -2815,16 +2814,12 @@ limitations under the License.
)
</i><br/>
<p>
- update room with options for user questions, audio only and hide
-
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ update room with options for user questions, audio only and hide
</p>
<p>
Return Type: java.lang.Long
</p>
<p>Params:</p>
- <b>Warning:</b><i> Params in this method do not seem to be correctly documentated</i>
- <br/><br/>
<table rules="all" border="1">
<thead>
@@ -2839,13 +2834,21 @@ limitations under the License.
<td valign="top">
String
</td>
+ <td valign="top">SID</td>
+ <td valign="top">The SID of the User. This SID must be marked as Loggedin</td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ Long
+ </td>
<td valign="top">room_id</td>
<td valign="top">the room id to update</td>
</tr>
<tr>
<td valign="top">
- Long
+ String
</td>
<td valign="top">name</td>
<td valign="top">new name of the room</td>
@@ -2853,7 +2856,7 @@ limitations under the License.
<tr>
<td valign="top">
- String
+ Long
</td>
<td valign="top">roomtypes_id</td>
<td valign="top">new type of room (1 = Conference, 2 = Audience, 3 =
@@ -2862,7 +2865,7 @@ limitations under the License.
<tr>
<td valign="top">
- Long
+ String
</td>
<td valign="top">comment</td>
<td valign="top">new comment</td>
@@ -2870,15 +2873,15 @@ limitations under the License.
<tr>
<td valign="top">
- String
+ Long
</td>
<td valign="top">numberOfPartizipants</td>
- <td valign="top">new numberOfParticipants</td>
+ <td valign="top">number of participants</td>
</tr>
<tr>
<td valign="top">
- Long
+ Boolean
</td>
<td valign="top">ispublic</td>
<td valign="top">is public</td>
@@ -2889,7 +2892,8 @@ limitations under the License.
Boolean
</td>
<td valign="top">appointment</td>
- <td valign="top">if the room is an appointment</td>
+ <td valign="top">if the room is an appointment (use false if not sure what that
+ means)</td>
</tr>
<tr>
@@ -2903,7 +2907,7 @@ limitations under the License.
<tr>
<td valign="top">
- Boolean
+ Integer
</td>
<td valign="top">demoTime</td>
<td valign="top">time in seconds after the user will be logged out (only
@@ -2912,7 +2916,7 @@ limitations under the License.
<tr>
<td valign="top">
- Integer
+ Boolean
</td>
<td valign="top">isModeratedRoom</td>
<td valign="top">Users have to wait until a Moderator arrives. Use the
@@ -2990,7 +2994,8 @@ limitations under the License.
Boolean
</td>
<td valign="top">hideWhiteboard</td>
- <td valign="top">hide or show Whiteboard. If whitboard is hidden, video pods and scrollbar appear instead.</td>
+ <td valign="top">hide or show Whiteboard. If whitboard is hidden, video pods
+ and scrollbar appear instead.</td>
</tr>
</tbody>
@@ -3086,7 +3091,8 @@ limitations under the License.
String
</td>
<td valign="top">SID</td>
- <td valign="top">The SID of the User. This SID must be marked as Loggedin _Admin</td>
+ <td valign="top">The SID of the User. This SID must be marked as Loggedin
+ _Admin</td>
</tr>
<tr>
@@ -3867,8 +3873,8 @@ limitations under the License.
String
</td>
<td valign="top">SID</td>
- <td valign="top">The SID of the User. This SID must be marked as Loggedin
- a valid Session Token</td>
+ <td valign="top">The SID of the User. This SID must be marked as Loggedin a
+ valid Session Token</td>
</tr>
<tr>
@@ -4021,8 +4027,8 @@ limitations under the License.
String
</td>
<td valign="top">SID</td>
- <td valign="top">The SID of the User. This SID must be marked as Loggedin
- a valid Session Token</td>
+ <td valign="top">The SID of the User. This SID must be marked as Loggedin a
+ valid Session Token</td>
</tr>
<tr>
@@ -4232,8 +4238,8 @@ limitations under the License.
String
</td>
<td valign="top">SID</td>
- <td valign="top">The SID of the User. This SID must be marked as Loggedin
- a valid Session Token</td>
+ <td valign="top">The SID of the User. This SID must be marked as Loggedin a
+ valid Session Token</td>
</tr>
<tr>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java?rev=1369621&r1=1369620&r2=1369621&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java Sun Aug 5 17:15:02 2012
@@ -1545,7 +1545,7 @@ public class Roommanagement {
*/
public Long deleteRoomById(long user_level, long rooms_id) {
try {
- if (authLevelManagement.checkAdminLevel(user_level)) {
+ if (authLevelManagement.checkWebServiceLevel(user_level)) {
this.deleteAllRoomsOrganisationOfRoom(rooms_id);
return this.deleteRoom(this.getRoomById(rooms_id));
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java?rev=1369621&r1=1369620&r2=1369621&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java Sun Aug 5 17:15:02 2012
@@ -139,7 +139,8 @@ public class RoomWebService {
/**
* Deletes a flv recording
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param flvRecordingId
* the id of the recording
* @return
@@ -167,7 +168,8 @@ public class RoomWebService {
/**
* Gets a list of flv recordings
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param externalUserId
* the externalUserId
* @return
@@ -215,7 +217,8 @@ public class RoomWebService {
/**
* Gets a list of flv recordings
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param externalRoomType
* externalRoomType specified when creating the room
* @param insertedBy
@@ -267,7 +270,8 @@ public class RoomWebService {
/**
* Gets a list of flv recordings
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param externalRoomType
* externalRoomType specified when creating the room
* @return
@@ -296,7 +300,8 @@ public class RoomWebService {
/**
* Gets a list of flv recordings
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param externalRoomType
* externalRoomType specified when creating the room
* @return
@@ -343,7 +348,8 @@ public class RoomWebService {
/**
* Get list of recordings
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param roomId
* the room id
* @return
@@ -391,7 +397,8 @@ public class RoomWebService {
/**
* List of available room types
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @return
* @throws AxisFault
*/
@@ -419,7 +426,8 @@ public class RoomWebService {
/**
* Returns current users for rooms ids
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param roomId1
* @param roomId2
* @param roomId3
@@ -508,7 +516,8 @@ public class RoomWebService {
/**
* returns a conference room object
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param rooms_id
* the room id
* @return
@@ -519,7 +528,8 @@ public class RoomWebService {
/**
* @deprecated this function is intend to be deleted
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param rooms_id
* @return
*/
@@ -531,7 +541,8 @@ public class RoomWebService {
/**
* Returns a object of type RoomReturn
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param rooms_id
* @return
* @throws AxisFault
@@ -589,7 +600,8 @@ public class RoomWebService {
* Returns a List of Objects of Rooms You can use "name" as value for
* orderby or rooms_id
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param start
* The id you want to start
* @param max
@@ -610,7 +622,8 @@ public class RoomWebService {
* orderby or rooms_id. It also fills the attribute currentUsers in the
* Room-Object
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param start
* The id you want to start
* @param max
@@ -634,7 +647,8 @@ public class RoomWebService {
*
* deprecated use addRoomWithModeration instead
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param name
* @param roomtypes_id
* @param comment
@@ -675,17 +689,15 @@ public class RoomWebService {
return roommanagement.addRoom(user_level, name, roomtypes_id,
comment, numberOfPartizipants, ispublic, null, false,
false, null, false, null, true, false, false, "", "", "",
- null, null, null,
- false, // hideTopBar
+ null, null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- false, //showMicrophoneStatus
- u.getServer()
- );
+ false, // showMicrophoneStatus
+ u.getServer());
} catch (Exception err) {
log.error("[addRoom] ", err);
}
@@ -695,7 +707,8 @@ public class RoomWebService {
/**
* Create a conference room
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param name
* Name of the Room
* @param roomtypes_id
@@ -732,17 +745,15 @@ public class RoomWebService {
return roommanagement.addRoom(user_level, name, roomtypes_id,
comment, numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null, true, false,
- false, "", "", "", null, null, null,
- false, // hideTopBar
+ false, "", "", "", null, null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- false, //showMicrophoneStatus
- u.getServer()
- );
+ false, // showMicrophoneStatus
+ u.getServer());
} catch (Exception err) {
log.error("[addRoomWithModeration] ", err);
}
@@ -754,7 +765,8 @@ public class RoomWebService {
* to apply for moderation this does only work in combination with the
* room-type restricted
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param name
* Name of the Room
* @param roomtypes_id
@@ -796,17 +808,15 @@ public class RoomWebService {
comment, numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
allowUserQuestions, false, false, "", "", "", null, null,
- null,
- false, // hideTopBar
+ null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- false, //showMicrophoneStatus
- u.getServer()
- );
+ false, // showMicrophoneStatus
+ u.getServer());
} catch (Exception err) {
log.error("[addRoomWithModerationAndQuestions] ", err);
}
@@ -817,7 +827,8 @@ public class RoomWebService {
*
* adds a new room with options for user questions and audio only
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param name
* Name of the Room
* @param roomtypes_id
@@ -862,28 +873,27 @@ public class RoomWebService {
comment, numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
allowUserQuestions, isAudioOnly, false, "", "", "", null,
- null, null,
- false, // hideTopBar
+ null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- false, //showMicrophoneStatus
- u.getServer()
- );
+ false, // showMicrophoneStatus
+ u.getServer());
} catch (Exception err) {
log.error("[addRoomWithModerationQuestionsAndAudioType] ", err);
throw new AxisFault(err.getMessage());
}
}
-
+
/**
*
* adds a new room with options for user questions, audio only and hide
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param name
* Name of the Room
* @param roomtypes_id
@@ -916,7 +926,7 @@ public class RoomWebService {
* @param hideTopBar
* hide or show TopBar
* @param hideChat
- * hide or show Chat
+ * hide or show Chat
* @param hideActivitiesAndActions
* hide or show Activities And Actions
* @param hideFilesExplorer
@@ -924,19 +934,21 @@ public class RoomWebService {
* @param hideActionsMenu
* hide or show Actions Menu
* @param hideScreenSharing
- * hide or show Screen Sharing
+ * hide or show Screen Sharing
* @param hideWhiteboard
- * hide or show Whiteboard. If whitboard is hidden, video pods and scrollbar appear instead.
+ * hide or show Whiteboard. If whitboard is hidden, video pods
+ * and scrollbar appear instead.
* @return
* @throws AxisFault
*/
- public Long addRoomWithModerationQuestionsAudioTypeAndHideOptions(String SID,
- String name, Long roomtypes_id, String comment,
+ public Long addRoomWithModerationQuestionsAudioTypeAndHideOptions(
+ String SID, String name, Long roomtypes_id, String comment,
Long numberOfPartizipants, Boolean ispublic, Boolean appointment,
Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom,
- Boolean allowUserQuestions, Boolean isAudioOnly, Boolean hideTopBar, Boolean hideChat,
- Boolean hideActivitiesAndActions, Boolean hideFilesExplorer,
- Boolean hideActionsMenu, Boolean hideScreenSharing,
+ Boolean allowUserQuestions, Boolean isAudioOnly,
+ Boolean hideTopBar, Boolean hideChat,
+ Boolean hideActivitiesAndActions, Boolean hideFilesExplorer,
+ Boolean hideActionsMenu, Boolean hideScreenSharing,
Boolean hideWhiteboard) throws AxisFault {
try {
Long users_id = sessionManagement.checkSession(SID);
@@ -946,10 +958,13 @@ public class RoomWebService {
comment, numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
allowUserQuestions, isAudioOnly, false, "", "", "", null,
- null, null, hideTopBar, hideChat, hideActivitiesAndActions, hideFilesExplorer,
- hideActionsMenu, hideScreenSharing, hideWhiteboard, false, u.getServer());
- } catch (Exception err) {
- log.error("[addRoomWithModerationQuestionsAudioTypeAndHideOptions] ", err);
+ null, null, hideTopBar, hideChat, hideActivitiesAndActions,
+ hideFilesExplorer, hideActionsMenu, hideScreenSharing,
+ hideWhiteboard, false, u.getServer());
+ } catch (Exception err) {
+ log.error(
+ "[addRoomWithModerationQuestionsAudioTypeAndHideOptions] ",
+ err);
throw new AxisFault(err.getMessage());
}
}
@@ -959,7 +974,8 @@ public class RoomWebService {
* if yes it returns the room id if not, it will create the room and then
* return the room id of the newly created room
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param name
* Name of the room
* @param roomtypes_id
@@ -1027,7 +1043,8 @@ public class RoomWebService {
/**
* TODO: Fix Organization Issue deprecated use updateRoomWithModeration
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param rooms_id
* @param name
* @param roomtypes_id
@@ -1070,15 +1087,14 @@ public class RoomWebService {
roomtypes_id, name, ispublic, comment,
numberOfPartizipants, null, appointment, false, null,
false, null, true, false, false, "", "", "", null,
- null, null,
- false, // hideTopBar
+ null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- false //showMicrophoneStatus
+ false // showMicrophoneStatus
);
}
} catch (Exception err) {
@@ -1090,7 +1106,8 @@ public class RoomWebService {
/**
* Updates a conference room by its room id
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param room_id
* the room id to update
* @param name
@@ -1129,15 +1146,15 @@ public class RoomWebService {
return roommanagement.updateRoomInternal(room_id, roomtypes_id,
name, ispublic, comment, numberOfPartizipants, null,
appointment, isDemoRoom, demoTime, isModeratedRoom,
- null, true, false, false, "", "", "", null, null, null,
+ null, true, false, false, "", "", "", null, null, null,
false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- false //showMicrophoneStatus
+ false // showMicrophoneStatus
);
}
} catch (Exception err) {
@@ -1148,7 +1165,8 @@ public class RoomWebService {
/**
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param room_id
* the room id to update
* @param name
@@ -1192,15 +1210,14 @@ public class RoomWebService {
name, ispublic, comment, numberOfPartizipants, null,
appointment, isDemoRoom, demoTime, isModeratedRoom,
null, allowUserQuestions, false, false, "", "", "",
- null, null, null,
- false, // hideTopBar
+ null, null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
false, // hideActionsMenu
- false, // hideScreenSharing
+ false, // hideScreenSharing
false, // hideWhiteboard
- false //showMicrophoneStatus
+ false // showMicrophoneStatus
);
}
} catch (Exception err) {
@@ -1208,12 +1225,12 @@ public class RoomWebService {
}
return new Long(-1);
}
-
+
/**
- *
* update room with options for user questions, audio only and hide
*
- * * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param room_id
* the room id to update
* @param name
@@ -1224,11 +1241,12 @@ public class RoomWebService {
* @param comment
* new comment
* @param numberOfPartizipants
- * new numberOfParticipants
+ * number of participants
* @param ispublic
* is public
* @param appointment
- * if the room is an appointment
+ * if the room is an appointment (use false if not sure what that
+ * means)
* @param isDemoRoom
* is it a Demo Room with limited time? (use false if not sure
* what that means)
@@ -1244,11 +1262,10 @@ public class RoomWebService {
* moderation
* @param isAudioOnly
* enable or disable the video / or audio-only
- *
* @param hideTopBar
* hide or show TopBar
* @param hideChat
- * hide or show Chat
+ * hide or show Chat
* @param hideActivitiesAndActions
* hide or show Activities And Actions
* @param hideFilesExplorer
@@ -1256,19 +1273,20 @@ public class RoomWebService {
* @param hideActionsMenu
* hide or show Actions Menu
* @param hideScreenSharing
- * hide or show Screen Sharing
+ * hide or show Screen Sharing
* @param hideWhiteboard
- * hide or show Whiteboard. If whitboard is hidden, video pods and scrollbar appear instead.
+ * hide or show Whiteboard. If whitboard is hidden, video pods
+ * and scrollbar appear instead.
* @return
- * @throws AxisFault
- */
- public Long updateRoomWithModerationQuestionsAudioTypeAndHideOptions(String SID, Long room_id,
- String name, Long roomtypes_id, String comment,
- Long numberOfPartizipants, Boolean ispublic, Boolean appointment,
- Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom,
- Boolean allowUserQuestions, Boolean isAudioOnly, Boolean hideTopBar, Boolean hideChat,
- Boolean hideActivitiesAndActions, Boolean hideFilesExplorer,
- Boolean hideActionsMenu, Boolean hideScreenSharing,
+ */
+ public Long updateRoomWithModerationQuestionsAudioTypeAndHideOptions(
+ String SID, Long room_id, String name, Long roomtypes_id,
+ String comment, Long numberOfPartizipants, Boolean ispublic,
+ Boolean appointment, Boolean isDemoRoom, Integer demoTime,
+ Boolean isModeratedRoom, Boolean allowUserQuestions,
+ Boolean isAudioOnly, Boolean hideTopBar, Boolean hideChat,
+ Boolean hideActivitiesAndActions, Boolean hideFilesExplorer,
+ Boolean hideActionsMenu, Boolean hideScreenSharing,
Boolean hideWhiteboard) {
try {
Long users_id = sessionManagement.checkSession(SID);
@@ -1278,8 +1296,9 @@ public class RoomWebService {
name, ispublic, comment, numberOfPartizipants, null,
appointment, isDemoRoom, demoTime, isModeratedRoom,
null, allowUserQuestions, false, false, "", "", "",
- null, null, null, hideTopBar, hideChat, hideActivitiesAndActions, hideFilesExplorer,
- hideActionsMenu, hideScreenSharing, hideWhiteboard,
+ null, null, null, hideTopBar, hideChat,
+ hideActivitiesAndActions, hideFilesExplorer,
+ hideActionsMenu, hideScreenSharing, hideWhiteboard,
false // showMicrophoneStatus
);
}
@@ -1292,7 +1311,8 @@ public class RoomWebService {
/**
* Delete a room by its room id
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param rooms_id
* @return
*/
@@ -1303,7 +1323,9 @@ public class RoomWebService {
/**
* kick all uses of a certain room
*
- * @param SID The SID of the User. This SID must be marked as Loggedin _Admin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
+ * _Admin
* @param room_id
* the room id
* @return
@@ -1329,7 +1351,8 @@ public class RoomWebService {
* external room type should be set if multiple applications use the same
* OpenMeetings instance
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param name
* new name of the room
* @param roomtypes_id
@@ -1381,7 +1404,8 @@ public class RoomWebService {
/**
* Adds a new room with options for audio only
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param name
* new name of the room
* @param roomtypes_id
@@ -1440,7 +1464,8 @@ public class RoomWebService {
/**
* Adds a new room with options for recording
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param name
* new name of the room
* @param roomtypes_id
@@ -1508,7 +1533,8 @@ public class RoomWebService {
* Add a conference room with options to disable the top menu bar in the
* conference room
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param name
* new name of the room
* @param roomtypes_id
@@ -1580,8 +1606,9 @@ public class RoomWebService {
* Calls Date is parsed as dd.mm.yyyy, time as hh:mm (don't forget the
* leading zero's)
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
- * a valid Session Token
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin a
+ * valid Session Token
* @param username
* the username of the User that he will get
* @param room_id
@@ -1696,8 +1723,9 @@ public class RoomWebService {
* Calls Date is parsed as dd.mm.yyyy, time as hh:mm (don't forget the
* leading zero's)
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
- * a valid Session Token
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin a
+ * valid Session Token
* @param username
* the Username of the User that he will get
* @param message
@@ -1834,8 +1862,9 @@ public class RoomWebService {
* Calls Date is parsed as dd.mm.yyyy, time as hh:mm (don't forget the
* leading zero's)
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
- * a valid Session Token
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin a
+ * valid Session Token
* @param username
* the Username of the User that he will get
* @param message
@@ -1932,7 +1961,8 @@ public class RoomWebService {
* Return a RoomReturn Object with information of the current users of a
* conference room
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param start
* The id you want to start
* @param max
@@ -1994,7 +2024,8 @@ public class RoomWebService {
* Return a RoomReturn Object with information of the current users of a
* conference room with option to search for special external room types
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param start
* The id you want to start
* @param max
@@ -2058,7 +2089,8 @@ public class RoomWebService {
/**
* Adds a conference room that is only available for a period of time
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param name
* new name of the room
* @param roomtypes_id
@@ -2204,7 +2236,8 @@ public class RoomWebService {
* Add a meeting member to a certain room. This is the same as adding an
* external user to a event in the calendar.
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param room_id
* The Room Id the meeting member is going to be added
* @param firstname
@@ -2260,7 +2293,8 @@ public class RoomWebService {
* Add a meeting member to a certain room. This is the same as adding an
* external user to a event in the calendar. with a certain time zone
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
* @param room_id
* The Room Id the meeting member is going to be added
* @param firstname
@@ -2325,9 +2359,12 @@ public class RoomWebService {
*
* Returns positive value if authentication was successful.
*
- * @param SID The SID of the User. This SID must be marked as Loggedin
- * @param room_id the room id
- * @param status false = close, true = open
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
+ * @param room_id
+ * the room id
+ * @param status
+ * false = close, true = open
* @return
* @throws AxisFault
*/
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebServiceFacade.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebServiceFacade.java?rev=1369621&r1=1369620&r2=1369621&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebServiceFacade.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebServiceFacade.java Sun Aug 5 17:15:02 2012
@@ -71,15 +71,19 @@ public class RoomWebServiceFacade {
}
/**
- * Deletes a flv recording
- * @param SID The SID of the User. This SID must be marked as Loggedin
- * @param flvRecordingId the id of the recording
+ * Deletes a flv recording
+ *
+ * @param SID
+ * The SID of the User. This SID must be marked as Loggedin
+ * @param flvRecordingId
+ * the id of the recording
* @return
* @throws AxisFault
*/
public boolean deleteFlvRecording(String SID, Long flvRecordingId)
throws AxisFault {
- return this.getRoomServiceProxy().deleteFlvRecording(SID, flvRecordingId);
+ return this.getRoomServiceProxy().deleteFlvRecording(SID,
+ flvRecordingId);
}
public FLVRecordingReturn[] getFlvRecordingByExternalUserId(String SID,
@@ -104,8 +108,8 @@ public class RoomWebServiceFacade {
public FlvRecording[] getFlvRecordingByExternalRoomType(String SID,
String externalRoomType) throws AxisFault {
- return this.getRoomServiceProxy().getFlvRecordingByExternalRoomType(SID,
- externalRoomType);
+ return this.getRoomServiceProxy().getFlvRecordingByExternalRoomType(
+ SID, externalRoomType);
}
public FlvRecording[] getFlvRecordingByRoomId(String SID, Long roomId)
@@ -121,9 +125,9 @@ public class RoomWebServiceFacade {
Integer roomId2, Integer roomId3, Integer roomId4, Integer roomId5,
Integer roomId6, Integer roomId7, Integer roomId8, Integer roomId9,
Integer roomId10) throws AxisFault {
- return this.getRoomServiceProxy().getRoomCounters(SID, roomId1, roomId2,
- roomId3, roomId4, roomId5, roomId6, roomId7, roomId8, roomId9,
- roomId10);
+ return this.getRoomServiceProxy().getRoomCounters(SID, roomId1,
+ roomId2, roomId3, roomId4, roomId5, roomId6, roomId7, roomId8,
+ roomId9, roomId10);
}
public Rooms getRoomById(String SID, long rooms_id) {
@@ -151,8 +155,8 @@ public class RoomWebServiceFacade {
public SearchResult<Rooms> getRooms(String SID, int start, int max,
String orderby, boolean asc) throws AxisFault {
- return this.getRoomServiceProxy()
- .getRooms(SID, start, max, orderby, asc);
+ return this.getRoomServiceProxy().getRooms(SID, start, max, orderby,
+ asc);
}
public SearchResult<Rooms> getRoomsWithCurrentUsers(String SID, int start,
@@ -242,9 +246,9 @@ public class RoomWebServiceFacade {
Boolean ispublic, Boolean appointment, Boolean isDemoRoom,
Integer demoTime, Boolean isModeratedRoom,
Boolean allowUserQuestions) throws AxisFault {
- return this.getRoomServiceProxy().addRoomWithModerationAndQuestions(SID,
- name, roomtypes_id, comment, numberOfPartizipants, ispublic,
- appointment, isDemoRoom, demoTime, isModeratedRoom,
+ return this.getRoomServiceProxy().addRoomWithModerationAndQuestions(
+ SID, name, roomtypes_id, comment, numberOfPartizipants,
+ ispublic, appointment, isDemoRoom, demoTime, isModeratedRoom,
allowUserQuestions);
}
@@ -341,9 +345,9 @@ public class RoomWebServiceFacade {
Long roomtypes_id, String comment, Long numberOfPartizipants,
Boolean ispublic, Boolean appointment, Boolean isDemoRoom,
Integer demoTime, Boolean isModeratedRoom) throws AxisFault {
- return this.getRoomServiceProxy().updateRoomWithModeration(SID, room_id,
- name, roomtypes_id, comment, numberOfPartizipants, ispublic,
- appointment, isDemoRoom, demoTime, isModeratedRoom);
+ return this.getRoomServiceProxy().updateRoomWithModeration(SID,
+ room_id, name, roomtypes_id, comment, numberOfPartizipants,
+ ispublic, appointment, isDemoRoom, demoTime, isModeratedRoom);
}
public Long updateRoomWithModerationAndQuestions(String SID, Long room_id,
@@ -351,9 +355,30 @@ public class RoomWebServiceFacade {
Long numberOfPartizipants, Boolean ispublic, Boolean appointment,
Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom,
Boolean allowUserQuestions) throws AxisFault {
- return this.getRoomServiceProxy().updateRoomWithModeration(SID, room_id,
- name, roomtypes_id, comment, numberOfPartizipants, ispublic,
- appointment, isDemoRoom, demoTime, isModeratedRoom);
+ return this.getRoomServiceProxy().updateRoomWithModerationAndQuestions(
+ SID, room_id, name, roomtypes_id, comment,
+ numberOfPartizipants, ispublic, appointment, isDemoRoom,
+ demoTime, isModeratedRoom, allowUserQuestions);
+ }
+
+ public Long updateRoomWithModerationQuestionsAudioTypeAndHideOptions(
+ String SID, Long room_id, String name, Long roomtypes_id,
+ String comment, Long numberOfPartizipants, Boolean ispublic,
+ Boolean appointment, Boolean isDemoRoom, Integer demoTime,
+ Boolean isModeratedRoom, Boolean allowUserQuestions,
+ Boolean isAudioOnly, Boolean hideTopBar, Boolean hideChat,
+ Boolean hideActivitiesAndActions, Boolean hideFilesExplorer,
+ Boolean hideActionsMenu, Boolean hideScreenSharing,
+ Boolean hideWhiteboard) {
+ return this.getRoomServiceProxy()
+ .updateRoomWithModerationQuestionsAudioTypeAndHideOptions(SID,
+ room_id, name, roomtypes_id, comment,
+ numberOfPartizipants, ispublic, appointment,
+ isDemoRoom, demoTime, isModeratedRoom,
+ allowUserQuestions, isAudioOnly, hideTopBar, hideChat,
+ hideActivitiesAndActions, hideFilesExplorer,
+ hideActionsMenu, hideScreenSharing, hideWhiteboard);
+
}
public Long deleteRoom(String SID, long rooms_id) throws AxisFault {
@@ -597,8 +622,9 @@ public class RoomWebServiceFacade {
public List<RoomReturn> getRoomsWithCurrentUsersByListAndType(String SID,
int start, int max, String orderby, boolean asc,
String externalRoomType) throws AxisFault {
- return this.getRoomServiceProxy().getRoomsWithCurrentUsersByListAndType(
- SID, start, max, orderby, asc, externalRoomType);
+ return this.getRoomServiceProxy()
+ .getRoomsWithCurrentUsersByListAndType(SID, start, max,
+ orderby, asc, externalRoomType);
}
public Long addRoomWithModerationAndExternalTypeAndStartEnd(String SID,
@@ -619,8 +645,8 @@ public class RoomWebServiceFacade {
}
public Long addMeetingMemberRemindToRoom(String SID, Long room_id,
- String firstname, String lastname, String email, String phone, String baseUrl,
- Long language_id) throws AxisFault {
+ String firstname, String lastname, String email, String phone,
+ String baseUrl, Long language_id) throws AxisFault {
return this.getRoomServiceProxy().addMeetingMemberRemindToRoom(SID,
room_id, firstname, lastname, email, phone, language_id);
}