Author: solomax
Date: Mon Oct 28 04:41:04 2013
New Revision: 1536247
URL: http://svn.apache.org/r1536247
Log:
[OPENMEETINGS-820] addRoomToOrg REST/SOAP method is added
Modified:
openmeetings/branches/2.x/src/org/apache/openmeetings/axis/services/RoomWebService.java
openmeetings/branches/2.x/src/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
Modified:
openmeetings/branches/2.x/src/org/apache/openmeetings/axis/services/RoomWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1536247&r1=1536246&r2=1536247&view=diff
==============================================================================
---
openmeetings/branches/2.x/src/org/apache/openmeetings/axis/services/RoomWebService.java
(original)
+++
openmeetings/branches/2.x/src/org/apache/openmeetings/axis/services/RoomWebService.java
Mon Oct 28 04:41:04 2013
@@ -2514,4 +2514,25 @@ public class RoomWebService {
}
}
+ /**
+ * Adds a room to an organization
+ *
+ * @param SID - The SID of the User. This SID must be marked as Loggedin
+ * @param rooms_id - Id of room to be added
+ * @param organisation_id - Id of organisation that the room is being
paired with
+ *
+ * @return Id of the relation created, null or -1 in case of the error
+ */
+ public Long addRoomToOrg(String SID, Long rooms_id, Long
organisation_id) {
+ try {
+ Long users_id = sessiondataDao.checkSession(SID);
+ Long user_level =
userManager.getUserLevelByID(users_id);
+ if (authLevelUtil.checkWebServiceLevel(user_level)) {
+ return
roomManager.addRoomToOrganisation(user_level, rooms_id, organisation_id);
+ }
+ } catch (Exception err) {
+ log.error("[addRoomToOrg]", err);
+ }
+ return new Long(-1);
+ }
}
Modified:
openmeetings/branches/2.x/src/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java?rev=1536247&r1=1536246&r2=1536247&view=diff
==============================================================================
---
openmeetings/branches/2.x/src/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
(original)
+++
openmeetings/branches/2.x/src/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
Mon Oct 28 04:41:04 2013
@@ -654,4 +654,7 @@ public class RoomWebServiceFacade extend
paramName, paramValue);
}
+ public Long addRoomToOrg(String SID, Long rooms_id, Long
organisation_id) throws AxisFault {
+ return getBean(RoomWebService.class).addRoomToOrg(SID,
rooms_id, organisation_id);
+ }
}
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=1536247&r1=1536246&r2=1536247&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
Mon Oct 28 04:41:04 2013
@@ -2478,4 +2478,25 @@ public class RoomWebService {
}
}
+ /**
+ * Adds a room to an organization
+ *
+ * @param SID - The SID of the User. This SID must be marked as Loggedin
+ * @param rooms_id - Id of room to be added
+ * @param organisation_id - Id of organisation that the room is being
paired with
+ *
+ * @return Id of the relation created, null or -1 in case of the error
+ */
+ public Long addRoomToOrg(String SID, Long rooms_id, Long
organisation_id) {
+ try {
+ Long users_id = sessiondataDao.checkSession(SID);
+ Long user_level =
userManager.getUserLevelByID(users_id);
+ if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
+ return
roomManager.addRoomToOrganisation(user_level, rooms_id, organisation_id);
+ }
+ } catch (Exception err) {
+ log.error("[addRoomToOrg]", err);
+ }
+ return new Long(-1);
+ }
}
Modified:
openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java?rev=1536247&r1=1536246&r2=1536247&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
(original)
+++
openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
Mon Oct 28 04:41:04 2013
@@ -649,4 +649,8 @@ public class RoomWebServiceFacade extend
public int modifyRoomParameter(String SID, Long room_id, String
paramName, Object paramValue) throws AxisFault {
return getBean(RoomWebService.class).modifyRoomParameter(SID,
room_id, paramName, paramValue);
}
+
+ public Long addRoomToOrg(String SID, Long rooms_id, Long
organisation_id) throws AxisFault {
+ return getBean(RoomWebService.class).addRoomToOrg(SID,
rooms_id, organisation_id);
+ }
}
