You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/10/30 05:31:36 UTC
svn commit: r1536962 - in /openmeetings/trunk/singlewebapp:
docs/RoomService.html
src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
src/db/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
Author: solomax
Date: Wed Oct 30 04:31:35 2013
New Revision: 1536962
URL: http://svn.apache.org/r1536962
Log:
[OPENMEETINGS-822] addRoom and addRoomWithModeration functions creates not closed rooms
Modified:
openmeetings/trunk/singlewebapp/docs/RoomService.html
openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
Modified: openmeetings/trunk/singlewebapp/docs/RoomService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/RoomService.html?rev=1536962&r1=1536961&r2=1536962&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/RoomService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/RoomService.html Wed Oct 30 04:31:35 2013
@@ -239,6 +239,10 @@ limitations under the License.
<a href="#modifyRoomParameter"><b>modifyRoomParameter</b></a><br/>
<div class="navigation_comment"><i >Method to update arbitrary room parameter.</i></div>
</div>
+ <div>
+ <a href="#addRoomToOrg"><b>addRoomToOrg</b></a><br/>
+ <div class="navigation_comment"><i >Adds a room to an organization</i></div>
+ </div>
</div>
<h3>Methods Details in RoomService</h3>
@@ -5144,6 +5148,68 @@ limitations under the License.
REST Sample Call/URL:<br/>
<a href="http://localhost:5080/openmeetings/services/RoomService/modifyRoomParameter?SID=VALUE&room_id=VALUE¶mName=VALUE¶mValue=VALUE">http://localhost:5080/openmeetings/services/RoomService/modifyRoomParameter?SID=VALUE&room_id=VALUE&paramName=VALUE&paramValue=VALUE</a>
</div>
+ <div class="method">
+ <div class="method_header">
+ <div style="margin-left:10px">
+ <a name="addRoomToOrg" ><b>addRoomToOrg</b></a>
+ </div>
+ </div>
+
+ Method: <i>addRoomToOrg (
+ String SID
+ ,
+ Long rooms_id
+ ,
+ Long organisation_id
+ )
+ </i><br/>
+ <p>
+ Adds a room to an organization
+ </p>
+ <p>
+ Return Type: java.lang.Long
+ </p>
+ <p>Params:</p>
+
+ <table rules="all" border="1">
+ <thead>
+ <tr>
+ <th width="200" align="left">Type</th>
+ <th width="200" align="left">Fieldname</th>
+ <th width="400" align="left">Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <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">rooms_id</td>
+ <td valign="top">- Id of room to be added</td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ Long
+ </td>
+ <td valign="top">organisation_id</td>
+ <td valign="top">- Id of organisation that the room is being paired with</td>
+ </tr>
+
+ </tbody>
+ </table>
+ <br/>
+ REST Sample Call/URL:<br/>
+ <a href="http://localhost:5080/openmeetings/services/RoomService/addRoomToOrg?SID=VALUE&rooms_id=VALUE&organisation_id=VALUE">http://localhost:5080/openmeetings/services/RoomService/addRoomToOrg?SID=VALUE&rooms_id=VALUE&organisation_id=VALUE</a>
+ </div>
</body>
Modified: openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1536962&r1=1536961&r2=1536962&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java Wed Oct 30 04:31:35 2013
@@ -710,7 +710,8 @@ public class RoomWebService {
if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
return roomManager.addRoom(3L, name, roomtypes_id, comment,
numberOfPartizipants, ispublic, null, false, false,
- null, false, null, true, false, false, true, "", "",
+ null, false, null, true, false, false, false //isClosed
+ , "", "",
null, null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
@@ -774,7 +775,8 @@ public class RoomWebService {
return roomManager.addRoom(3L, name, roomtypes_id, comment,
numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null, true,
- false, false, true, "", "", null, null, null, false, // hideTopBar
+ false, true, false //isClosed
+ , "", "", null, null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
false, // hideFilesExplorer
@@ -843,7 +845,8 @@ public class RoomWebService {
return roomManager.addRoom(3L, name, roomtypes_id, comment,
numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
- allowUserQuestions, false, true, false, "", "", null,
+ allowUserQuestions, false, true, false //isClosed
+ , "", "", null,
null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
@@ -915,7 +918,8 @@ public class RoomWebService {
return roomManager.addRoom(3L, name, roomtypes_id, comment,
numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
- allowUserQuestions, isAudioOnly, true, false, "", "",
+ allowUserQuestions, isAudioOnly, true, false //isClosed
+ , "", "",
null, null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
@@ -1007,7 +1011,8 @@ public class RoomWebService {
return roomManager.addRoom(3L, name, roomtypes_id, comment,
numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
- allowUserQuestions, isAudioOnly, true, false, "", "",
+ allowUserQuestions, isAudioOnly, true, false //isClosed
+ , "", "",
null, null, null, hideTopBar, hideChat,
hideActivitiesAndActions, hideFilesExplorer,
hideActionsMenu, hideScreenSharing, hideWhiteboard,
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java?rev=1536962&r1=1536961&r2=1536962&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java Wed Oct 30 04:31:35 2013
@@ -50,22 +50,22 @@ public class SOAPLogin implements Serial
private Date created;
@Column(name="used")
- private Boolean used;
+ private boolean used;
@Column(name="use_date")
private Date useDate;
@Column(name="becomemoderator")
- private Boolean becomemoderator;
+ private boolean becomemoderator;
@Column(name="showaudiovideotest")
- private Boolean showAudioVideoTest;
+ private boolean showAudioVideoTest;
@Column(name="allow_same_url_multiple_times")
- private Boolean allowSameURLMultipleTimes;
+ private boolean allowSameURLMultipleTimes;
@Column(name="show_nick_name_dialog")
- private Boolean showNickNameDialog;
+ private boolean showNickNameDialog;
@Column(name="client_url")
private String clientURL;
@@ -77,7 +77,7 @@ public class SOAPLogin implements Serial
private String landingZone;
@Column(name="allow_recording")
- private Boolean allowRecording;
+ private boolean allowRecording;
public long getSoapLoginId() {
return soapLoginId;
@@ -114,10 +114,10 @@ public class SOAPLogin implements Serial
this.created = created;
}
- public Boolean getUsed() {
+ public boolean getUsed() {
return used;
}
- public void setUsed(Boolean used) {
+ public void setUsed(boolean used) {
this.used = used;
}
@@ -128,31 +128,31 @@ public class SOAPLogin implements Serial
this.useDate = useDate;
}
- public Boolean getBecomemoderator() {
+ public boolean getBecomemoderator() {
return becomemoderator;
}
- public void setBecomemoderator(Boolean becomemoderator) {
+ public void setBecomemoderator(boolean becomemoderator) {
this.becomemoderator = becomemoderator;
}
- public Boolean getShowAudioVideoTest() {
+ public boolean getShowAudioVideoTest() {
return showAudioVideoTest;
}
- public void setShowAudioVideoTest(Boolean showAudioVideoTest) {
+ public void setShowAudioVideoTest(boolean showAudioVideoTest) {
this.showAudioVideoTest = showAudioVideoTest;
}
- public Boolean getAllowSameURLMultipleTimes() {
+ public boolean getAllowSameURLMultipleTimes() {
return allowSameURLMultipleTimes;
}
- public void setAllowSameURLMultipleTimes(Boolean allowSameURLMultipleTimes) {
+ public void setAllowSameURLMultipleTimes(boolean allowSameURLMultipleTimes) {
this.allowSameURLMultipleTimes = allowSameURLMultipleTimes;
}
- public Boolean getShowNickNameDialog() {
+ public boolean getShowNickNameDialog() {
return showNickNameDialog;
}
- public void setShowNickNameDialog(Boolean showNickNameDialog) {
+ public void setShowNickNameDialog(boolean showNickNameDialog) {
this.showNickNameDialog = showNickNameDialog;
}
@@ -177,10 +177,10 @@ public class SOAPLogin implements Serial
this.landingZone = landingZone;
}
- public Boolean getAllowRecording() {
+ public boolean getAllowRecording() {
return allowRecording;
}
- public void setAllowRecording(Boolean allowRecording) {
+ public void setAllowRecording(boolean allowRecording) {
this.allowRecording = allowRecording;
}