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/03/28 17:45:18 UTC
svn commit: r1582818 - in /openmeetings: branches/3.0.x/docs/
branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/
trunk/singlewebapp/docs/
trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/
Author: solomax
Date: Fri Mar 28 16:45:17 2014
New Revision: 1582818
URL: http://svn.apache.org/r1582818
Log:
Deprecated SOAP methods are removed
Modified:
openmeetings/branches/3.0.x/docs/UserService.html
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java
openmeetings/trunk/singlewebapp/docs/UserService.html
openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java
Modified: openmeetings/branches/3.0.x/docs/UserService.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/docs/UserService.html?rev=1582818&r1=1582817&r2=1582818&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/docs/UserService.html (original)
+++ openmeetings/branches/3.0.x/docs/UserService.html Fri Mar 28 16:45:17 2014
@@ -97,20 +97,6 @@
<div class="navigation_comment"><i >Delete a certain user by its external user id</i></div>
</div>
<div>
- <a href="#setUserObject"><b>setUserObject</b></a><br/>
- <div class="navigation_comment"><i >deprecated use setUserObjectAndGenerateRoomHash
-
- Description: sets the SessionObject for a certain SID, after setting this
- Session-Object you can use the SID + a RoomId to enter any Room.</i></div>
- </div>
- <div>
- <a href="#setUserObjectWithExternalUser"><b>setUserObjectWithExternalUser</b></a><br/>
- <div class="navigation_comment"><i >deprecated use setUserObjectAndGenerateRoomHash
-
- Description: sets the SessionObject for a certain SID, after setting this
- Session-Object you can use the SID + a RoomId to enter any Room.</i></div>
- </div>
- <div>
<a href="#setUserObjectAndGenerateRoomHash"><b>setUserObjectAndGenerateRoomHash</b></a><br/>
<div class="navigation_comment"><i >Description: sets the SessionObject for a certain SID, after setting this
Session-Object you can use the SID + a RoomId to enter any Room. ...
@@ -1014,216 +1000,6 @@
<div class="method">
<div class="method_header">
<div style="margin-left:10px">
- <a name="setUserObject" ><b>setUserObject</b></a>
- </div>
- </div>
-
- Method: <i>setUserObject (
- String SID
- ,
- String username
- ,
- String firstname
- ,
- String lastname
- ,
- String profilePictureUrl
- ,
- String email
- )
- </i><br/>
- <p>
- deprecated use setUserObjectAndGenerateRoomHash
-
- Description: sets the SessionObject for a certain SID, after setting this
- Session-Object you can use the SID + a RoomId to enter any Room.
- </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 from getSession</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">username</td>
- <td valign="top">any username</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">firstname</td>
- <td valign="top">any firstname</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">lastname</td>
- <td valign="top">any lastname</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">profilePictureUrl</td>
- <td valign="top">any profilePictureUrl</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">email</td>
- <td valign="top">any email</td>
- </tr>
-
- </tbody>
- </table>
- <br/>
- REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/UserService/setUserObject?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE">http://localhost:5080/openmeetings/services/UserService/setUserObject?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE</a>
- </div>
- <div class="method">
- <div class="method_header">
- <div style="margin-left:10px">
- <a name="setUserObjectWithExternalUser" ><b>setUserObjectWithExternalUser</b></a>
- </div>
- </div>
-
- Method: <i>setUserObjectWithExternalUser (
- String SID
- ,
- String username
- ,
- String firstname
- ,
- String lastname
- ,
- String profilePictureUrl
- ,
- String email
- ,
- String externalUserId
- ,
- String externalUserType
- )
- </i><br/>
- <p>
- deprecated use setUserObjectAndGenerateRoomHash
-
- Description: sets the SessionObject for a certain SID, after setting this
- Session-Object you can use the SID + a RoomId to enter any Room.
- </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 from getSession</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">username</td>
- <td valign="top">any username</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">firstname</td>
- <td valign="top">any firstname</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">lastname</td>
- <td valign="top">any lastname</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">profilePictureUrl</td>
- <td valign="top">any profilePictureUrl</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">email</td>
- <td valign="top">any email</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">externalUserId</td>
- <td valign="top">if you have any external user Id you may set it here</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">externalUserType</td>
- <td valign="top">you can specify your system-name here, for example "moodle"</td>
- </tr>
-
- </tbody>
- </table>
- <br/>
- REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/UserService/setUserObjectWithExternalUser?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE">http://localhost:5080/openmeetings/services/UserService/setUserObjectWithExternalUser?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE</a>
- </div>
- <div class="method">
- <div class="method_header">
- <div style="margin-left:10px">
<a name="setUserObjectAndGenerateRoomHash" ><b>setUserObjectAndGenerateRoomHash</b></a>
</div>
</div>
Modified: openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java?rev=1582818&r1=1582817&r2=1582818&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java (original)
+++ openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java Fri Mar 28 16:45:17 2014
@@ -234,7 +234,7 @@ public class UserWebService {
return new Long(-26);
}
} catch (Exception err) {
- log.error("setUserObject", err);
+ log.error("addNewUser", err);
throw new AxisFault(err.getMessage());
}
}
@@ -321,7 +321,7 @@ public class UserWebService {
return new Long(-26);
}
} catch (Exception err) {
- log.error("setUserObject", err);
+ log.error("addNewUserWithTimeZone", err);
throw new AxisFault(err.getMessage());
}
}
@@ -493,122 +493,7 @@ public class UserWebService {
}
} catch (Exception err) {
- log.error("deleteUserById", err);
- throw new AxisFault(err.getMessage());
- }
- }
-
- /**
- * deprecated use setUserObjectAndGenerateRoomHash
- *
- * Description: sets the SessionObject for a certain SID, after setting this
- * Session-Object you can use the SID + a RoomId to enter any Room.
- *
- * @param SID
- * The SID from getSession
- * @param username
- * any username
- * @param firstname
- * any firstname
- * @param lastname
- * any lastname
- * @param profilePictureUrl
- * any profilePictureUrl
- * @param email
- * any email
- *
- * @return - 1 in case of success, -1 otherwise
- * @throws AxisFault
- */
- @Deprecated
- public Long setUserObject(String SID, String username, String firstname,
- String lastname, String profilePictureUrl, String email)
- throws AxisFault {
- log.debug("UserService.setUserObject");
-
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManagement.getUserLevelByID(users_id);
- if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
-
- RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
- username, firstname, lastname, profilePictureUrl, email);
-
- log.debug(remoteSessionObject.toString());
-
- String xmlString = remoteSessionObject.toXml();
-
- log.debug("xmlString " + xmlString);
-
- sessiondataDao.updateUserRemoteSession(SID, xmlString);
-
- return new Long(1);
- } else {
- return new Long(-26);
- }
- } catch (Exception err) {
- log.error("setUserObject", err);
- throw new AxisFault(err.getMessage());
- }
- // return new Long(-1);
- }
-
- /**
- * deprecated use setUserObjectAndGenerateRoomHash
- *
- * Description: sets the SessionObject for a certain SID, after setting this
- * Session-Object you can use the SID + a RoomId to enter any Room.
- *
- * @param SID
- * The SID from getSession
- * @param username
- * any username
- * @param firstname
- * any firstname
- * @param lastname
- * any lastname
- * @param profilePictureUrl
- * any profilePictureUrl
- * @param email
- * any email
- * @param externalUserId
- * if you have any external user Id you may set it here
- * @param externalUserType
- * you can specify your system-name here, for example "moodle"
- *
- * @return - 1 in case of success, -1 otherwise
- * @throws AxisFault
- */
- @Deprecated
- public Long setUserObjectWithExternalUser(String SID, String username,
- String firstname, String lastname, String profilePictureUrl,
- String email, String externalUserId, String externalUserType)
- throws AxisFault {
- log.debug("UserService.setUserObject");
-
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManagement.getUserLevelByID(users_id);
- if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
-
- RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
- username, firstname, lastname, profilePictureUrl,
- email, externalUserId, externalUserType);
-
- log.debug(remoteSessionObject.toString());
-
- String xmlString = remoteSessionObject.toXml();
-
- log.debug("xmlString " + xmlString);
-
- sessiondataDao.updateUserRemoteSession(SID, xmlString);
-
- return new Long(1);
- } else {
- return new Long(-26);
- }
- } catch (Exception err) {
- log.error("setUserObjectWithExternalUser", err);
+ log.error("deleteUserByExternalUserIdAndType", err);
throw new AxisFault(err.getMessage());
}
}
@@ -739,9 +624,9 @@ public class UserWebService {
String username, String firstname, String lastname,
String profilePictureUrl, String email, String externalUserId,
String externalUserType, Long room_id, int becomeModeratorAsInt,
- int showAudioVideoTestAsInt) {
- log.debug("UserService.setUserObject");
+ int showAudioVideoTestAsInt) throws AxisFault {
+ log.debug("UserService.setUserObjectAndGenerateRoomHashByURL");
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
@@ -785,7 +670,8 @@ public class UserWebService {
return "" + new Long(-26);
}
} catch (Exception err) {
- log.error("setUserObjectWithAndGenerateRoomHash", err);
+ log.error("setUserObjectAndGenerateRoomHashByURL", err);
+ throw new AxisFault(err.getMessage());
}
return "" + new Long(-1);
}
Modified: openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java?rev=1582818&r1=1582817&r2=1582818&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java (original)
+++ openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java Fri Mar 28 16:45:17 2014
@@ -149,53 +149,6 @@ public class UserWebServiceFacade extend
externalUserId, externalUserType);
}
- /**
- *
- * @param SID
- * @param firstname
- * @param lastname
- * @param profilePictureUrl
- * @param email
- * @return
- * @throws AxisFault
- */
- @Deprecated
- public Long setUserObject(String SID, String username, String firstname,
- String lastname, String profilePictureUrl, String email)
- throws AxisFault {
- return getBean(UserWebService.class).setUserObject(SID, username, firstname,
- lastname, profilePictureUrl, email);
- }
-
- /**
- * This is the advanced technique to set the User Object + simulate a User
- * from the external system, this is needed cause you can that always
- * simulate to same user in openmeetings
- *
- * @param SID
- * @param username
- * @param firstname
- * @param lastname
- * @param profilePictureUrl
- * @param email
- * @param externalUserId
- * the User Id of the external System
- * @param externalUserType
- * the Name of the external system, for example you can run
- * several external system and one meeting server
- * @return
- * @throws AxisFault
- */
- @Deprecated
- public Long setUserObjectWithExternalUser(String SID, String username,
- String firstname, String lastname, String profilePictureUrl,
- String email, String externalUserId, String externalUserType)
- throws AxisFault {
- return getBean(UserWebService.class).setUserObjectWithExternalUser(SID,
- username, firstname, lastname, profilePictureUrl, email,
- externalUserId, externalUserType);
- }
-
public String setUserObjectAndGenerateRoomHash(String SID, String username,
String firstname, String lastname, String profilePictureUrl,
String email, String externalUserId, String externalUserType,
Modified: openmeetings/trunk/singlewebapp/docs/UserService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/UserService.html?rev=1582818&r1=1582817&r2=1582818&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/UserService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/UserService.html Fri Mar 28 16:45:17 2014
@@ -97,20 +97,6 @@
<div class="navigation_comment"><i >Delete a certain user by its external user id</i></div>
</div>
<div>
- <a href="#setUserObject"><b>setUserObject</b></a><br/>
- <div class="navigation_comment"><i >deprecated use setUserObjectAndGenerateRoomHash
-
- Description: sets the SessionObject for a certain SID, after setting this
- Session-Object you can use the SID + a RoomId to enter any Room.</i></div>
- </div>
- <div>
- <a href="#setUserObjectWithExternalUser"><b>setUserObjectWithExternalUser</b></a><br/>
- <div class="navigation_comment"><i >deprecated use setUserObjectAndGenerateRoomHash
-
- Description: sets the SessionObject for a certain SID, after setting this
- Session-Object you can use the SID + a RoomId to enter any Room.</i></div>
- </div>
- <div>
<a href="#setUserObjectAndGenerateRoomHash"><b>setUserObjectAndGenerateRoomHash</b></a><br/>
<div class="navigation_comment"><i >Description: sets the SessionObject for a certain SID, after setting this
Session-Object you can use the SID + a RoomId to enter any Room. ...
@@ -1014,216 +1000,6 @@
<div class="method">
<div class="method_header">
<div style="margin-left:10px">
- <a name="setUserObject" ><b>setUserObject</b></a>
- </div>
- </div>
-
- Method: <i>setUserObject (
- String SID
- ,
- String username
- ,
- String firstname
- ,
- String lastname
- ,
- String profilePictureUrl
- ,
- String email
- )
- </i><br/>
- <p>
- deprecated use setUserObjectAndGenerateRoomHash
-
- Description: sets the SessionObject for a certain SID, after setting this
- Session-Object you can use the SID + a RoomId to enter any Room.
- </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 from getSession</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">username</td>
- <td valign="top">any username</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">firstname</td>
- <td valign="top">any firstname</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">lastname</td>
- <td valign="top">any lastname</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">profilePictureUrl</td>
- <td valign="top">any profilePictureUrl</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">email</td>
- <td valign="top">any email</td>
- </tr>
-
- </tbody>
- </table>
- <br/>
- REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/UserService/setUserObject?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE">http://localhost:5080/openmeetings/services/UserService/setUserObject?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE</a>
- </div>
- <div class="method">
- <div class="method_header">
- <div style="margin-left:10px">
- <a name="setUserObjectWithExternalUser" ><b>setUserObjectWithExternalUser</b></a>
- </div>
- </div>
-
- Method: <i>setUserObjectWithExternalUser (
- String SID
- ,
- String username
- ,
- String firstname
- ,
- String lastname
- ,
- String profilePictureUrl
- ,
- String email
- ,
- String externalUserId
- ,
- String externalUserType
- )
- </i><br/>
- <p>
- deprecated use setUserObjectAndGenerateRoomHash
-
- Description: sets the SessionObject for a certain SID, after setting this
- Session-Object you can use the SID + a RoomId to enter any Room.
- </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 from getSession</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">username</td>
- <td valign="top">any username</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">firstname</td>
- <td valign="top">any firstname</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">lastname</td>
- <td valign="top">any lastname</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">profilePictureUrl</td>
- <td valign="top">any profilePictureUrl</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">email</td>
- <td valign="top">any email</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">externalUserId</td>
- <td valign="top">if you have any external user Id you may set it here</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">externalUserType</td>
- <td valign="top">you can specify your system-name here, for example "moodle"</td>
- </tr>
-
- </tbody>
- </table>
- <br/>
- REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/UserService/setUserObjectWithExternalUser?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE">http://localhost:5080/openmeetings/services/UserService/setUserObjectWithExternalUser?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE</a>
- </div>
- <div class="method">
- <div class="method_header">
- <div style="margin-left:10px">
<a name="setUserObjectAndGenerateRoomHash" ><b>setUserObjectAndGenerateRoomHash</b></a>
</div>
</div>
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=1582818&r1=1582817&r2=1582818&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 Mar 28 16:45:17 2014
@@ -234,7 +234,7 @@ public class UserWebService {
return new Long(-26);
}
} catch (Exception err) {
- log.error("setUserObject", err);
+ log.error("addNewUser", err);
throw new AxisFault(err.getMessage());
}
}
@@ -321,7 +321,7 @@ public class UserWebService {
return new Long(-26);
}
} catch (Exception err) {
- log.error("setUserObject", err);
+ log.error("addNewUserWithTimeZone", err);
throw new AxisFault(err.getMessage());
}
}
@@ -493,122 +493,7 @@ public class UserWebService {
}
} catch (Exception err) {
- log.error("deleteUserById", err);
- throw new AxisFault(err.getMessage());
- }
- }
-
- /**
- * deprecated use setUserObjectAndGenerateRoomHash
- *
- * Description: sets the SessionObject for a certain SID, after setting this
- * Session-Object you can use the SID + a RoomId to enter any Room.
- *
- * @param SID
- * The SID from getSession
- * @param username
- * any username
- * @param firstname
- * any firstname
- * @param lastname
- * any lastname
- * @param profilePictureUrl
- * any profilePictureUrl
- * @param email
- * any email
- *
- * @return - 1 in case of success, -1 otherwise
- * @throws AxisFault
- */
- @Deprecated
- public Long setUserObject(String SID, String username, String firstname,
- String lastname, String profilePictureUrl, String email)
- throws AxisFault {
- log.debug("UserService.setUserObject");
-
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManagement.getUserLevelByID(users_id);
- if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
-
- RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
- username, firstname, lastname, profilePictureUrl, email);
-
- log.debug(remoteSessionObject.toString());
-
- String xmlString = remoteSessionObject.toXml();
-
- log.debug("xmlString " + xmlString);
-
- sessiondataDao.updateUserRemoteSession(SID, xmlString);
-
- return new Long(1);
- } else {
- return new Long(-26);
- }
- } catch (Exception err) {
- log.error("setUserObject", err);
- throw new AxisFault(err.getMessage());
- }
- // return new Long(-1);
- }
-
- /**
- * deprecated use setUserObjectAndGenerateRoomHash
- *
- * Description: sets the SessionObject for a certain SID, after setting this
- * Session-Object you can use the SID + a RoomId to enter any Room.
- *
- * @param SID
- * The SID from getSession
- * @param username
- * any username
- * @param firstname
- * any firstname
- * @param lastname
- * any lastname
- * @param profilePictureUrl
- * any profilePictureUrl
- * @param email
- * any email
- * @param externalUserId
- * if you have any external user Id you may set it here
- * @param externalUserType
- * you can specify your system-name here, for example "moodle"
- *
- * @return - 1 in case of success, -1 otherwise
- * @throws AxisFault
- */
- @Deprecated
- public Long setUserObjectWithExternalUser(String SID, String username,
- String firstname, String lastname, String profilePictureUrl,
- String email, String externalUserId, String externalUserType)
- throws AxisFault {
- log.debug("UserService.setUserObject");
-
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManagement.getUserLevelByID(users_id);
- if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
-
- RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
- username, firstname, lastname, profilePictureUrl,
- email, externalUserId, externalUserType);
-
- log.debug(remoteSessionObject.toString());
-
- String xmlString = remoteSessionObject.toXml();
-
- log.debug("xmlString " + xmlString);
-
- sessiondataDao.updateUserRemoteSession(SID, xmlString);
-
- return new Long(1);
- } else {
- return new Long(-26);
- }
- } catch (Exception err) {
- log.error("setUserObjectWithExternalUser", err);
+ log.error("deleteUserByExternalUserIdAndType", err);
throw new AxisFault(err.getMessage());
}
}
@@ -739,9 +624,9 @@ public class UserWebService {
String username, String firstname, String lastname,
String profilePictureUrl, String email, String externalUserId,
String externalUserType, Long room_id, int becomeModeratorAsInt,
- int showAudioVideoTestAsInt) {
- log.debug("UserService.setUserObject");
+ int showAudioVideoTestAsInt) throws AxisFault {
+ log.debug("UserService.setUserObjectAndGenerateRoomHashByURL");
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
@@ -785,7 +670,8 @@ public class UserWebService {
return "" + new Long(-26);
}
} catch (Exception err) {
- log.error("setUserObjectWithAndGenerateRoomHash", err);
+ log.error("setUserObjectAndGenerateRoomHashByURL", err);
+ throw new AxisFault(err.getMessage());
}
return "" + new Long(-1);
}
Modified: openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java?rev=1582818&r1=1582817&r2=1582818&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java (original)
+++ openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java Fri Mar 28 16:45:17 2014
@@ -149,53 +149,6 @@ public class UserWebServiceFacade extend
externalUserId, externalUserType);
}
- /**
- *
- * @param SID
- * @param firstname
- * @param lastname
- * @param profilePictureUrl
- * @param email
- * @return
- * @throws AxisFault
- */
- @Deprecated
- public Long setUserObject(String SID, String username, String firstname,
- String lastname, String profilePictureUrl, String email)
- throws AxisFault {
- return getBean(UserWebService.class).setUserObject(SID, username, firstname,
- lastname, profilePictureUrl, email);
- }
-
- /**
- * This is the advanced technique to set the User Object + simulate a User
- * from the external system, this is needed cause you can that always
- * simulate to same user in openmeetings
- *
- * @param SID
- * @param username
- * @param firstname
- * @param lastname
- * @param profilePictureUrl
- * @param email
- * @param externalUserId
- * the User Id of the external System
- * @param externalUserType
- * the Name of the external system, for example you can run
- * several external system and one meeting server
- * @return
- * @throws AxisFault
- */
- @Deprecated
- public Long setUserObjectWithExternalUser(String SID, String username,
- String firstname, String lastname, String profilePictureUrl,
- String email, String externalUserId, String externalUserType)
- throws AxisFault {
- return getBean(UserWebService.class).setUserObjectWithExternalUser(SID,
- username, firstname, lastname, profilePictureUrl, email,
- externalUserId, externalUserType);
- }
-
public String setUserObjectAndGenerateRoomHash(String SID, String username,
String firstname, String lastname, String profilePictureUrl,
String email, String externalUserId, String externalUserType,