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 2014/01/10 05:42:09 UTC

svn commit: r1557027 - in /openmeetings/trunk/singlewebapp: docs/ src/axis/java/org/apache/openmeetings/axis/services/

Author: solomax
Date: Fri Jan 10 04:42:08 2014
New Revision: 1557027

URL: http://svn.apache.org/r1557027
Log:
[OPENMEETINGS-802] SOAP/REST methods are fixed to work as expected

Modified:
    openmeetings/trunk/singlewebapp/docs/JabberService.html
    openmeetings/trunk/singlewebapp/docs/RoomService.html
    openmeetings/trunk/singlewebapp/docs/UserService.html
    openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/JabberWebService.java
    openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/JabberWebServiceFacade.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
    openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java

Modified: openmeetings/trunk/singlewebapp/docs/JabberService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/JabberService.html?rev=1557027&r1=1557026&r2=1557027&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/JabberService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/JabberService.html Fri Jan 10 04:42:08 2014
@@ -48,7 +48,7 @@ limitations under the License.
        <div class="navigation">
 	                               <div>
                 <a href="#getAvailableRooms"><b>getAvailableRooms</b></a><br/>
-                <div class="navigation_comment"><i >Get List&lt;Rooms&gt; of all rooms available to the user.
+                <div class="navigation_comment"><i >Get List&lt;RoomDTO&gt; of all rooms available to the user.
  No admin rights are necessary for this call</i></div>
                 </div>
                                                <div>
@@ -77,7 +77,7 @@ limitations under the License.
     			       			    			)
     			</i><br/>
     			<p>
-    			  Get List&lt;Rooms&gt; of all rooms available to the user.
+    			  Get List&lt;RoomDTO&gt; of all rooms available to the user.
  No admin rights are necessary for this call
     			</p>
     			<p>

Modified: openmeetings/trunk/singlewebapp/docs/RoomService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/RoomService.html?rev=1557027&r1=1557026&r2=1557027&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/RoomService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/RoomService.html Fri Jan 10 04:42:08 2014
@@ -646,7 +646,7 @@ limitations under the License.
     			  List of available room types
     			</p>
     			<p>
-                  Return Type: org.apache.openmeetings.db.entity.room.RoomType[]
+                  Return Type: java.util.List
                 </p>
     			<p>Params:</p>
     			    			
@@ -664,7 +664,7 @@ 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</td>
+	                     <td valign="top">- The SID of the User. This SID must be marked as Loggedin</td>
 	                   </tr>
 	                   
 	                   	                   	                   </tbody>
@@ -708,7 +708,7 @@ 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</td>
+	                     <td valign="top">- The SID of the User. This SID must be marked as Loggedin</td>
 	                   </tr>
 	                   
 	                   	                   	    			   <tr>
@@ -760,7 +760,7 @@ 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</td>
+	                     <td valign="top">- The SID of the User. This SID must be marked as Loggedin</td>
 	                   </tr>
 	                   
 	                   	                   	    			   <tr>
@@ -768,7 +768,7 @@ limitations under the License.
 	                     		                     		long
 	                     		                     </td>
 	                     <td valign="top">rooms_id</td>
-	                     <td valign="top">the room id</td>
+	                     <td valign="top">- the room id</td>
 	                   </tr>
 	                   
 	                   	                   	                   </tbody>
@@ -853,7 +853,7 @@ limitations under the License.
  orderby or rooms_id
     			</p>
     			<p>
-                  Return Type: org.apache.openmeetings.db.dto.basic.SearchResult
+                  Return Type: org.apache.openmeetings.db.dto.room.RoomSearchResult
                 </p>
     			<p>Params:</p>
     			    			
@@ -871,7 +871,7 @@ 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</td>
+	                     <td valign="top">- The SID of the User. This SID must be marked as Loggedin</td>
 	                   </tr>
 	                   
 	                   	                   	    			   <tr>
@@ -879,7 +879,7 @@ limitations under the License.
 	                     		                     		int
 	                     		                     </td>
 	                     <td valign="top">start</td>
-	                     <td valign="top">The id you want to start</td>
+	                     <td valign="top">- The id you want to start</td>
 	                   </tr>
 	                   
 	                   	                   	    			   <tr>
@@ -887,7 +887,7 @@ limitations under the License.
 	                     		                     		int
 	                     		                     </td>
 	                     <td valign="top">max</td>
-	                     <td valign="top">The maximum you want to get</td>
+	                     <td valign="top">- The maximum you want to get</td>
 	                   </tr>
 	                   
 	                   	                   	    			   <tr>
@@ -895,7 +895,7 @@ limitations under the License.
 	                     		                     		String
 	                     		                     </td>
 	                     <td valign="top">orderby</td>
-	                     <td valign="top">The column it will be ordered</td>
+	                     <td valign="top">- The column it will be ordered</td>
 	                   </tr>
 	                   
 	                   	                   	    			   <tr>
@@ -903,7 +903,7 @@ limitations under the License.
 	                     		                     		boolean
 	                     		                     </td>
 	                     <td valign="top">asc</td>
-	                     <td valign="top">Asc or Desc sort ordering</td>
+	                     <td valign="top">- Asc or Desc sort ordering</td>
 	                   </tr>
 	                   
 	                   	                   	                   </tbody>
@@ -937,7 +937,7 @@ limitations under the License.
  Room-Object
     			</p>
     			<p>
-                  Return Type: org.apache.openmeetings.db.dto.basic.SearchResult
+                  Return Type: org.apache.openmeetings.db.dto.room.RoomSearchResult
                 </p>
     			<p>Params:</p>
     			    			
@@ -955,7 +955,7 @@ 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</td>
+	                     <td valign="top">- The SID of the User. This SID must be marked as Loggedin</td>
 	                   </tr>
 	                   
 	                   	                   	    			   <tr>
@@ -963,7 +963,7 @@ limitations under the License.
 	                     		                     		int
 	                     		                     </td>
 	                     <td valign="top">start</td>
-	                     <td valign="top">The id you want to start</td>
+	                     <td valign="top">- The id you want to start</td>
 	                   </tr>
 	                   
 	                   	                   	    			   <tr>
@@ -971,7 +971,7 @@ limitations under the License.
 	                     		                     		int
 	                     		                     </td>
 	                     <td valign="top">max</td>
-	                     <td valign="top">The maximum you want to get</td>
+	                     <td valign="top">- The maximum you want to get</td>
 	                   </tr>
 	                   
 	                   	                   	    			   <tr>
@@ -979,7 +979,7 @@ limitations under the License.
 	                     		                     		String
 	                     		                     </td>
 	                     <td valign="top">orderby</td>
-	                     <td valign="top">The column it will be ordered</td>
+	                     <td valign="top">- The column it will be ordered</td>
 	                   </tr>
 	                   
 	                   	                   	    			   <tr>
@@ -987,7 +987,7 @@ limitations under the License.
 	                     		                     		boolean
 	                     		                     </td>
 	                     <td valign="top">asc</td>
-	                     <td valign="top">Asc or Desc sort ordering</td>
+	                     <td valign="top">- Asc or Desc sort ordering</td>
 	                   </tr>
 	                   
 	                   	                   	                   </tbody>

Modified: openmeetings/trunk/singlewebapp/docs/UserService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/UserService.html?rev=1557027&r1=1557026&r2=1557027&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/UserService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/UserService.html Fri Jan 10 04:42:08 2014
@@ -54,7 +54,7 @@ limitations under the License.
                 </div>
                                                <div>
                 <a href="#loginUser"><b>loginUser</b></a><br/>
-                <div class="navigation_comment"><i >uth function, use the SID you get by getSession, return positive means
+                <div class="navigation_comment"><i >Auth function, use the SID you get by getSession, return positive means
  logged-in, if negative its an ErrorCode, you have to invoke the Method
  getErrorByCode to get the Text-Description of that ErrorCode</i></div>
                 </div>
@@ -223,7 +223,7 @@ limitations under the License.
     			       			    			)
     			</i><br/>
     			<p>
-    			  uth function, use the SID you get by getSession, return positive means
+    			  Auth function, use the SID you get by getSession, return positive means
  logged-in, if negative its an ErrorCode, you have to invoke the Method
  getErrorByCode to get the Text-Description of that ErrorCode
     			</p>
@@ -246,7 +246,7 @@ limitations under the License.
 	                     		                     		String
 	                     		                     </td>
 	                     <td valign="top">SID</td>
-	                     <td valign="top">The SID from getSession</td>
+	                     <td valign="top">- The SID from getSession</td>
 	                   </tr>
 	                   
 	                   	                   	    			   <tr>
@@ -254,7 +254,7 @@ limitations under the License.
 	                     		                     		String
 	                     		                     </td>
 	                     <td valign="top">username</td>
-	                     <td valign="top">Username from OpenMeetings, the user has to have Admin-rights</td>
+	                     <td valign="top">- Username from OpenMeetings, the user has to have Admin-rights</td>
 	                   </tr>
 	                   
 	                   	                   	    			   <tr>
@@ -262,7 +262,7 @@ limitations under the License.
 	                     		                     		String
 	                     		                     </td>
 	                     <td valign="top">userpass</td>
-	                     <td valign="top">Userpass from OpenMeetings</td>
+	                     <td valign="top">- Userpass from OpenMeetings</td>
 	                   </tr>
 	                   
 	                   	                   	                   </tbody>

Modified: openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/JabberWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/JabberWebService.java?rev=1557027&r1=1557026&r2=1557027&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/JabberWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/JabberWebService.java Fri Jan 10 04:42:08 2014
@@ -18,6 +18,7 @@
  */
 package org.apache.openmeetings.axis.services;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.openmeetings.data.conference.InvitationManager;
@@ -26,6 +27,7 @@ import org.apache.openmeetings.db.dao.ba
 import org.apache.openmeetings.db.dao.room.RoomDao;
 import org.apache.openmeetings.db.dao.server.SessiondataDao;
 import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.dto.room.RoomDTO;
 import org.apache.openmeetings.db.entity.room.Invitation;
 import org.apache.openmeetings.db.entity.room.Invitation.Valid;
 import org.apache.openmeetings.db.entity.room.Room;
@@ -69,37 +71,41 @@ public class JabberWebService {
 	private RoomDao roomDao;
 
 	/**
-	 * Get List&lt;Rooms&gt; of all rooms available to the user.
+	 * Get List&lt;RoomDTO&gt; of all rooms available to the user.
 	 * No admin rights are necessary for this call
 	 * 
 	 * @param SID The SID from UserService.getSession
-	 * @return List&lt;Rooms&gt; of Rooms
+	 * @return List&lt;RoomDTO&gt; of Rooms
 	 */
-	public List<Room> getAvailableRooms(String SID) {
+	public List<RoomDTO> getAvailableRooms(String SID) {
 		log.debug("getAvailableRooms enter");
+		
+		List<Room> rl = new ArrayList<Room>();
+		List<Room> al = conferenceService.getAppointedMeetingRoomsWithoutType(SID);
+		if (al != null) {
+			rl.addAll(al);
+		}
 
-		List<Room> result = this.conferenceService
-				.getAppointedMeetingRoomsWithoutType(SID);
-
-		List<Room> pbl = this.conferenceService.getRoomsPublicWithoutType(SID);
+		List<Room> pbl = conferenceService.getRoomsPublicWithoutType(SID);
 		if (pbl != null) {
-			result.addAll(pbl);
+			rl.addAll(pbl);
 		}
 
-		Long users_id = this.sessiondataDao.checkSession(SID);
-		User u = this.userManager.getUserById(users_id);
+		Long users_id = sessiondataDao.checkSession(SID);
+		User u = userManager.getUserById(users_id);
 		for (Organisation_Users ou : u.getOrganisation_users()) {
-			List<RoomOrganisation> rol = this.conferenceService
-					.getRoomsByOrganisationWithoutType(SID, ou
-							.getOrganisation().getOrganisation_id().longValue());
+			List<RoomOrganisation> rol = conferenceService.getRoomsByOrganisationWithoutType(SID
+					, ou.getOrganisation().getOrganisation_id().longValue());
 			if (rol != null) {
 				for (RoomOrganisation ro : rol) {
-					result.add(ro.getRoom());
+					rl.add(ro.getRoom());
 				}
 			}
 		}
-		for (Room r : result) {
+		List<RoomDTO> result = new ArrayList<RoomDTO>();
+		for (Room r : rl) {
 			r.setCurrentusers(null);
+			result.add(new RoomDTO(r));
 		}
 		return result;
 	}

Modified: openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java?rev=1557027&r1=1557026&r2=1557027&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java (original)
+++ openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java Fri Jan 10 04:42:08 2014
@@ -18,8 +18,10 @@
  */
 package org.apache.openmeetings.axis.services;
 
+import java.util.List;
+
 import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.dto.room.RoomDTO;
 
 /**
  * This class provides method entry points necessary for OM to Jabber integration.
@@ -30,15 +32,15 @@ import org.apache.openmeetings.db.entity
 public class JabberWebServiceFacade extends BaseWebService {
 	
 	/**
-	 * Get array of all rooms available to the user.
+	 * Get list of all rooms available to the user.
 	 * No admin rights are necessary for this call
 	 * 
 	 * @param SID The SID from {@link UserWebService.getSession}
 	 * @return array of Rooms
 	 * @throws AxisFault 
 	 */
-	public Room[] getAvailableRooms(String SID) throws AxisFault {
-		return getBean(JabberWebService.class).getAvailableRooms(SID).toArray(new Room[0]);
+	public List<RoomDTO> getAvailableRooms(String SID) throws AxisFault {
+		return getBean(JabberWebService.class).getAvailableRooms(SID);
 	}
 
 	/**

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=1557027&r1=1557026&r2=1557027&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 Fri Jan 10 04:42:08 2014
@@ -44,8 +44,8 @@ import org.apache.openmeetings.db.dao.ro
 import org.apache.openmeetings.db.dao.server.ISessionManager;
 import org.apache.openmeetings.db.dao.server.SessiondataDao;
 import org.apache.openmeetings.db.dao.user.AdminUserDao;
-import org.apache.openmeetings.db.dto.basic.SearchResult;
 import org.apache.openmeetings.db.dto.file.RecordingObject;
+import org.apache.openmeetings.db.dto.room.RoomSearchResult;
 import org.apache.openmeetings.db.entity.calendar.Appointment;
 import org.apache.openmeetings.db.entity.calendar.MeetingMember;
 import org.apache.openmeetings.db.entity.record.FlvRecording;
@@ -393,26 +393,13 @@ 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 - List of available room types
 	 * @throws AxisFault
 	 */
-	public RoomType[] getRoomTypes(String SID) throws AxisFault {
+	public List<RoomType> getRoomTypes(String SID) throws AxisFault {
 		try {
-			List<RoomType> rommTypesList = conferenceService.getRoomTypes(SID);
-			RoomType[] roomTypesArray = new RoomType[rommTypesList.size()];
-
-			int count = 0;
-			for (Iterator<RoomType> it = rommTypesList.iterator(); it
-					.hasNext();) {
-				RoomType roomType = it.next();
-				roomTypesArray[count] = roomType;
-				count++;
-			}
-
-			return roomTypesArray;
-
+			return conferenceService.getRoomTypes(SID);
 		} catch (Exception err) {
 			log.error("[getRoomTypes]", err);
 			throw new AxisFault(err.getMessage());
@@ -422,8 +409,7 @@ 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 roomId
 	 * @return - current users for rooms ids
 	 * @throws AxisFault
@@ -471,10 +457,8 @@ public class RoomWebService {
 	/**
 	 * returns a conference room object
 	 * 
-	 * @param SID
-	 *            The SID of the User. This SID must be marked as Loggedin
-	 * @param rooms_id
-	 *            the room id
+	 * @param SID - The SID of the User. This SID must be marked as Loggedin
+	 * @param rooms_id - the room id
 	 * @return - room with the id given
 	 */
 	public Room getRoomById(String SID, long rooms_id) {
@@ -490,8 +474,7 @@ public class RoomWebService {
 	 * @return - object of type RoomReturn
 	 * @throws AxisFault
 	 */
-	public RoomReturn getRoomWithClientObjectsById(String SID, long rooms_id)
-			throws AxisFault {
+	public RoomReturn getRoomWithClientObjectsById(String SID, long rooms_id) throws AxisFault {
 		try {
 			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
@@ -543,22 +526,16 @@ 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 start
-	 *            The id you want to start
-	 * @param max
-	 *            The maximum you want to get
-	 * @param orderby
-	 *            The column it will be ordered
-	 * @param asc
-	 *            Asc or Desc sort ordering
+	 * @param SID - The SID of the User. This SID must be marked as Loggedin
+	 * @param start - The id you want to start
+	 * @param max - The maximum you want to get
+	 * @param orderby - The column it will be ordered
+	 * @param asc - Asc or Desc sort ordering
 	 *            
 	 * @return - List of Objects of Rooms
 	 */
-	public SearchResult<Room> getRooms(String SID, int start, int max,
-			String orderby, boolean asc) {
-		return conferenceService.getRooms(SID, start, max, orderby, asc, "");
+	public RoomSearchResult getRooms(String SID, int start, int max, String orderby, boolean asc) {
+		return new RoomSearchResult(conferenceService.getRooms(SID, start, max, orderby, asc, ""));
 	}
 
 	/**
@@ -566,23 +543,16 @@ 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 start
-	 *            The id you want to start
-	 * @param max
-	 *            The maximum you want to get
-	 * @param orderby
-	 *            The column it will be ordered
-	 * @param asc
-	 *            Asc or Desc sort ordering
+	 * @param SID - The SID of the User. This SID must be marked as Loggedin
+	 * @param start - The id you want to start
+	 * @param max - The maximum you want to get
+	 * @param orderby - The column it will be ordered
+	 * @param asc - Asc or Desc sort ordering
 	 *            
 	 * @return - List of Objects of Rooms
 	 */
-	public SearchResult<Room> getRoomsWithCurrentUsers(String SID, int start,
-			int max, String orderby, boolean asc) {
-		return conferenceService.getRoomsWithCurrentUsers(SID, start, max,
-				orderby, asc);
+	public RoomSearchResult getRoomsWithCurrentUsers(String SID, int start, int max, String orderby, boolean asc) {
+		return new RoomSearchResult(conferenceService.getRoomsWithCurrentUsers(SID, start, max, orderby, asc));
 	}
 
 	// TODO: Add functions to get Users of a Room

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=1557027&r1=1557026&r2=1557027&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 Fri Jan 10 04:42:08 2014
@@ -30,15 +30,7 @@ import org.apache.openmeetings.db.entity
 
 public class RoomWebServiceFacade extends BaseWebService {
 
-	// TODO: Not implemented yet
-	// public List<Rooms_Organisation> getRoomsByOrganisationAndType(String SID,
-	// long organisation_id, long roomtypes_id) {
-	// return conferenceService.getRoomsByOrganisationAndType(SID,
-	// organisation_id, roomtypes_id);
-	// }
-
-	public Room[] getRoomsPublic(String SID, Long roomtypes_id)
-			throws AxisFault {
+	public Room[] getRoomsPublic(String SID, Long roomtypes_id) throws AxisFault {
 		return getBean(RoomWebService.class).getRoomsPublic(SID, roomtypes_id);
 	}
 
@@ -77,18 +69,15 @@ public class RoomWebServiceFacade extend
 				.getFlvRecordingByExternalRoomTypeByList(SID, externalRoomType);
 	}
 
-	public FlvRecording[] getFlvRecordingByExternalRoomType(String SID,
-			String externalRoomType) throws AxisFault {
-		return getBean(RoomWebService.class).getFlvRecordingByExternalRoomType(
-				SID, externalRoomType);
+	public FlvRecording[] getFlvRecordingByExternalRoomType(String SID, String externalRoomType) throws AxisFault {
+		return getBean(RoomWebService.class).getFlvRecordingByExternalRoomType(SID, externalRoomType);
 	}
 
-	public FlvRecording[] getFlvRecordingByRoomId(String SID, Long roomId)
-			throws AxisFault {
+	public FlvRecording[] getFlvRecordingByRoomId(String SID, Long roomId) throws AxisFault {
 		return getBean(RoomWebService.class).getFlvRecordingByRoomId(SID, roomId);
 	}
 
-	public RoomType[] getRoomTypes(String SID) throws AxisFault {
+	public List<RoomType> getRoomTypes(String SID) throws AxisFault {
 		return getBean(RoomWebService.class).getRoomTypes(SID);
 	}
 
@@ -107,13 +96,11 @@ public class RoomWebServiceFacade extend
 	}
 
 	public RoomSearchResult getRooms(String SID, int start, int max, String orderby, boolean asc) throws AxisFault {
-		return new RoomSearchResult(getBean(RoomWebService.class).getRooms(SID, start, max, orderby, asc));
+		return getBean(RoomWebService.class).getRooms(SID, start, max, orderby, asc);
 	}
 
-	public RoomSearchResult getRoomsWithCurrentUsers(String SID, int start, int max, String orderby
-			, boolean asc) throws AxisFault {
-		return new RoomSearchResult(getBean(RoomWebService.class).getRoomsWithCurrentUsers(SID, start,
-				max, orderby, asc));
+	public RoomSearchResult getRoomsWithCurrentUsers(String SID, int start, int max, String orderby , boolean asc) throws AxisFault {
+		return getBean(RoomWebService.class).getRoomsWithCurrentUsers(SID, start, max, orderby, asc);
 	}
 
 	/**

Modified: openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java?rev=1557027&r1=1557026&r2=1557027&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java Fri Jan 10 04:42:08 2014
@@ -91,16 +91,13 @@ public class UserWebService {
 	}
 
 	/**
-	 * uth function, use the SID you get by getSession, return positive means
+	 * Auth function, use the SID you get by getSession, return positive means
 	 * logged-in, if negative its an ErrorCode, you have to invoke the Method
 	 * getErrorByCode to get the Text-Description of that ErrorCode
 	 * 
-	 * @param SID
-	 *            The SID from getSession
-	 * @param username
-	 *            Username from OpenMeetings, the user has to have Admin-rights
-	 * @param userpass
-	 *            Userpass from OpenMeetings
+	 * @param SID - The SID from getSession
+	 * @param username - Username from OpenMeetings, the user has to have Admin-rights
+	 * @param userpass - Userpass from OpenMeetings
 	 *            
 	 * @return - id of the logged in user, -1 in case of the error
 	 */