Author: sebawagner
Date: Mon Apr 30 13:30:48 2012
New Revision: 1332193
URL: http://svn.apache.org/viewvc?rev=1332193&view=rev
Log:
OPENMEETINGS-78 datatype of externalUserId
Modified:
incubator/openmeetings/trunk/singlewebapp/docs/FileService.html
incubator/openmeetings/trunk/singlewebapp/docs/UserService.html
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/session/RoomClient.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/logs/ConferenceLogDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/RemoteSessionObject.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/logs/ConferenceLog.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebServiceFacade.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebServiceFacade.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
Modified: incubator/openmeetings/trunk/singlewebapp/docs/FileService.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/FileService.html?rev=1332193&r1=1332192&r2=1332193&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/FileService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/FileService.html Mon Apr 30
13:30:48 2012
@@ -151,7 +151,7 @@ limitations under the License.
Method: <i>importFile (
String SID
,
- Long externalUserId
+ String externalUserId
,
Long externalFileId
,
@@ -203,7 +203,7 @@ limitations under the License.
<tr>
<td valign="top">
- Long
+ String
</td>
<td valign="top">externalUserId</td>
<td valign="top">the external user id => If the
file should goto a private
@@ -423,7 +423,7 @@ limitations under the License.
Method: <i>addFolderByExternalUserIdAndType (
String SID
,
- Long externalUserId
+ String externalUserId
,
Long parentFileExplorerItemId
,
@@ -466,7 +466,7 @@ limitations under the License.
<tr>
<td valign="top">
- Long
+ String
</td>
<td valign="top">externalUserId</td>
<td valign="top">the external file-type to
identify the file later</td>
Modified: incubator/openmeetings/trunk/singlewebapp/docs/UserService.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/UserService.html?rev=1332193&r1=1332192&r2=1332193&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/UserService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/UserService.html Mon Apr 30
13:30:48 2012
@@ -733,7 +733,7 @@ limitations under the License.
,
String jNameTimeZone
,
- Long externalUserId
+ String externalUserId
,
String externalUserType
)
@@ -874,7 +874,7 @@ limitations under the License.
<tr>
<td valign="top">
- Long
+ String
</td>
<td valign="top">externalUserId</td>
<td valign="top">externalUserId</td>
@@ -958,7 +958,7 @@ limitations under the License.
Method: <i>deleteUserByExternalUserIdAndType (
String SID
,
- Long externalUserId
+ String externalUserId
,
String externalUserType
)
@@ -990,7 +990,7 @@ limitations under the License.
<tr>
<td valign="top">
- Long
+ String
</td>
<td valign="top">externalUserId</td>
<td valign="top">externalUserId</td>
@@ -1127,7 +1127,7 @@ limitations under the License.
,
String email
,
- Long externalUserId
+ String externalUserId
,
String externalUserType
)
@@ -1202,7 +1202,7 @@ limitations under the License.
<tr>
<td valign="top">
- Long
+ String
</td>
<td valign="top">externalUserId</td>
<td valign="top">if you have any external user Id
you may set it here</td>
@@ -1243,7 +1243,7 @@ limitations under the License.
,
String email
,
- Long externalUserId
+ String externalUserId
,
String externalUserType
,
@@ -1323,7 +1323,7 @@ limitations under the License.
<tr>
<td valign="top">
- Long
+ String
</td>
<td valign="top">externalUserId</td>
<td valign="top">if you have any external user Id
you may set it here</td>
@@ -1389,7 +1389,7 @@ limitations under the License.
,
String email
,
- Long externalUserId
+ String externalUserId
,
String externalUserType
,
@@ -1473,7 +1473,7 @@ limitations under the License.
<tr>
<td valign="top">
- Long
+ String
</td>
<td valign="top">externalUserId</td>
<td valign="top">if you have any external user Id
you may set it here</td>
@@ -1539,7 +1539,7 @@ limitations under the License.
,
String email
,
- Long externalUserId
+ String externalUserId
,
String externalUserType
,
@@ -1627,7 +1627,7 @@ limitations under the License.
<tr>
<td valign="top">
- Long
+ String
</td>
<td valign="top">externalUserId</td>
<td valign="top">if you have any external user Id
you may set it here</td>
@@ -1701,7 +1701,7 @@ limitations under the License.
,
String email
,
- Long externalUserId
+ String externalUserId
,
String externalUserType
)
@@ -1779,7 +1779,7 @@ limitations under the License.
<tr>
<td valign="top">
- Long
+ String
</td>
<td valign="top">externalUserId</td>
<td valign="top">if you have any external user Id
you may set it here</td>
@@ -1820,7 +1820,7 @@ limitations under the License.
,
String email
,
- Long externalUserId
+ String externalUserId
,
String externalUserType
,
@@ -1911,7 +1911,7 @@ limitations under the License.
<tr>
<td valign="top">
- Long
+ String
</td>
<td valign="top">externalUserId</td>
<td valign="top">if you have any external user Id
you may set it here</td>
@@ -1982,7 +1982,7 @@ limitations under the License.
,
String lastname
,
- Long externalUserId
+ String externalUserId
,
String externalUserType
,
@@ -2040,7 +2040,7 @@ limitations under the License.
<tr>
<td valign="top">
- Long
+ String
</td>
<td valign="top">externalUserId</td>
<td valign="top">if you have any external user Id
you may set it here</td>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/session/RoomClient.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/session/RoomClient.java?rev=1332193&r1=1332192&r2=1332193&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/session/RoomClient.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/session/RoomClient.java
Mon Apr 30 13:30:48 2012
@@ -172,7 +172,7 @@ public class RoomClient implements Seria
private Boolean isBroadcasting = false;
//Vars to simulate external Users
- private Long externalUserId;
+ private String externalUserId;
private String externalUserType;
private List<String> sharerSIDs = new LinkedList<String>();
@@ -439,11 +439,11 @@ public class RoomClient implements Seria
this.canShare = canShare;
}
- public Long getExternalUserId() {
+ public String getExternalUserId() {
return externalUserId;
}
- public void setExternalUserId(Long externalUserId) {
+ public void setExternalUserId(String externalUserId) {
this.externalUserId = externalUserId;
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java?rev=1332193&r1=1332192&r2=1332193&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
Mon Apr 30 13:30:48 2012
@@ -83,7 +83,7 @@ public class FlvRecordingDaoImpl {
}
- public List<FlvRecording> getFlvRecordingByExternalUserId(Long
externalUserId) {
+ public List<FlvRecording> getFlvRecordingByExternalUserId(String
externalUserId) {
try {
log.debug("getFlvRecordingByExternalUserId
:externalUserId: "+externalUserId);
@@ -91,7 +91,7 @@ public class FlvRecordingDaoImpl {
String hql = "SELECT c FROM FlvRecording c, Rooms r,
Users u " +
"WHERE c.room_id = r.rooms_id " +
"AND c.insertedBy = u.user_id " +
- "AND u.externalUserId = :externalUserId
" +
+ "AND u.externalUserId LIKE
:externalUserId " +
"AND c.deleted <> :deleted ";
TypedQuery<FlvRecording> query = em.createQuery(hql,
FlvRecording.class);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/logs/ConferenceLogDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/logs/ConferenceLogDaoImpl.java?rev=1332193&r1=1332192&r2=1332193&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/logs/ConferenceLogDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/logs/ConferenceLogDaoImpl.java
Mon Apr 30 13:30:48 2012
@@ -42,7 +42,7 @@ public class ConferenceLogDaoImpl {
public Long addConferenceLog(String eventType, Long userId, String
streamid,
Long room_id, String userip, String scopeName,
- Long externalUserId, String externalUserType, String
email,
+ String externalUserId, String externalUserType, String
email,
String firstname, String lastname) {
try {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java?rev=1332193&r1=1332192&r2=1332193&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
Mon Apr 30 13:30:48 2012
@@ -1135,13 +1135,13 @@ public class Usermanagement {
return null;
}
- public Users getUserByExternalIdAndType(Long externalUserId,
+ public Users getUserByExternalIdAndType(String externalUserId,
String externalUserType) {
try {
String hql = "select c from Users as c "
- + "where c.externalUserId =
:externalUserId "
+ + "where c.externalUserId LIKE
:externalUserId "
+ "AND c.externalUserType LIKE
:externalUserType "
+ "AND c.deleted <> :deleted";
@@ -1165,7 +1165,7 @@ public class Usermanagement {
public Long addUserWithExternalKey(long level_id, int availible,
int status, String firstname, String login, String
lastname,
long language_id, String userpass, Adresses address,
Date age,
- String hash, Long externalUserId, String
externalUserType,
+ String hash, String externalUserId, String
externalUserType,
boolean generateSipUserData, String email, String
jNameTimeZone,
String pictureuri) {
try {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/RemoteSessionObject.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/RemoteSessionObject.java?rev=1332193&r1=1332192&r2=1332193&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/RemoteSessionObject.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/RemoteSessionObject.java
Mon Apr 30 13:30:48 2012
@@ -33,7 +33,7 @@ public class RemoteSessionObject {
private String pictureUrl;
private String email;
- private Long externalUserId;
+ private String externalUserId;
private String externalUserType;
public RemoteSessionObject(String username, String firstname, String
lastname,
@@ -44,7 +44,7 @@ public class RemoteSessionObject {
this.lastname = lastname;
this.pictureUrl = pictureUrl;
this.email = email;
- this.externalUserId = 0L;
+ this.externalUserId = "0";
this.externalUserType = "";
}
@@ -65,7 +65,7 @@ public class RemoteSessionObject {
*/
public RemoteSessionObject(String username, String firstname,
String lastname, String pictureUrl, String email,
- Long externalUserId, String externalUserType) {
+ String externalUserId, String externalUserType) {
super();
this.username = username;
this.firstname = firstname;
@@ -107,10 +107,10 @@ public class RemoteSessionObject {
this.email = email;
}
- public Long getExternalUserId() {
+ public String getExternalUserId() {
return externalUserId;
}
- public void setExternalUserId(Long externalUserId) {
+ public void setExternalUserId(String externalUserId) {
this.externalUserId = externalUserId;
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/logs/ConferenceLog.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/logs/ConferenceLog.java?rev=1332193&r1=1332192&r2=1332193&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/logs/ConferenceLog.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/logs/ConferenceLog.java
Mon Apr 30 13:30:48 2012
@@ -56,7 +56,7 @@ public class ConferenceLog implements Se
@Column(name="user_id")
private Long userId;
@Column(name="external_user_id")
- private Long externalUserId;
+ private String externalUserId;
@Column(name="external_user_type")
private String externalUserType;
@Column(name="streamid")
@@ -137,10 +137,10 @@ public class ConferenceLog implements Se
this.scopeName = scopeName;
}
- public Long getExternalUserId() {
+ public String getExternalUserId() {
return externalUserId;
}
- public void setExternalUserId(Long externalUserId) {
+ public void setExternalUserId(String externalUserId) {
this.externalUserId = externalUserId;
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java?rev=1332193&r1=1332192&r2=1332193&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
Mon Apr 30 13:30:48 2012
@@ -121,7 +121,7 @@ public class Users implements Serializab
// Vars to simulate external Users
@Column(name = "externalUserId")
- private Long externalUserId;
+ private String externalUserId;
@Column(name = "externalUserType")
private String externalUserType;
@@ -365,11 +365,11 @@ public class Users implements Serializab
this.activatehash = activatehash;
}
- public Long getExternalUserId() {
+ public String getExternalUserId() {
return externalUserId;
}
- public void setExternalUserId(Long externalUserId) {
+ public void setExternalUserId(String externalUserId) {
this.externalUserId = externalUserId;
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java?rev=1332193&r1=1332192&r2=1332193&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
Mon Apr 30 13:30:48 2012
@@ -593,7 +593,8 @@ public class MainService implements IPen
+
userObject.getExternalUserId());
if (userObject.getExternalUserId() !=
null
- &&
userObject.getExternalUserId() > 0) {
+ &&
userObject.getExternalUserId() != null &&
+
!userObject.getExternalUserId().equals("0")) {
// If so we need to check that
we create this user in
// OpenMeetings and update its
record
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebService.java?rev=1332193&r1=1332192&r2=1332193&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebService.java
Mon Apr 30 13:30:48 2012
@@ -119,7 +119,7 @@ public class FileWebService {
* @return
* @throws AxisFault
*/
- public FileImportError[] importFile(String SID, Long externalUserId,
+ public FileImportError[] importFile(String SID, String externalUserId,
Long externalFileId, String externalType, Long room_id,
boolean isOwner, String path, Long parentFolderId,
String fileSystemName) throws AxisFault {
@@ -344,7 +344,7 @@ public class FileWebService {
* @throws AxisFault
*/
public Long addFolderByExternalUserIdAndType(String SID,
- Long externalUserId, Long parentFileExplorerItemId,
+ String externalUserId, Long parentFileExplorerItemId,
String folderName, Long room_id, Boolean isOwner,
Long externalFilesid, String externalType) throws
AxisFault {
try {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebServiceFacade.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebServiceFacade.java?rev=1332193&r1=1332192&r2=1332193&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebServiceFacade.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebServiceFacade.java
Mon Apr 30 13:30:48 2012
@@ -91,7 +91,7 @@ public class FileWebServiceFacade {
* @return
* @throws AxisFault
*/
- public FileImportError[] importFile(String SID, Long externalUserId,
+ public FileImportError[] importFile(String SID, String externalUserId,
Long externalFileId, String externalType, Long room_id,
boolean isOwner, String path, Long parentFolderId,
String fileSystemName) throws AxisFault {
@@ -164,7 +164,7 @@ public class FileWebServiceFacade {
* @throws AxisFault
*/
public Long addFolderByExternalUserIdAndType(String SID,
- Long externalUserId, Long parentFileExplorerItemId,
+ String externalUserId, Long parentFileExplorerItemId,
String folderName, Long room_id, Boolean isOwner,
Long externalFilesid, String externalType) throws
AxisFault {
return
this.geFileServiceProxy().addFolderByExternalUserIdAndType(SID,
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=1332193&r1=1332192&r2=1332193&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
Mon Apr 30 13:30:48 2012
@@ -182,8 +182,7 @@ public class RoomWebService {
if
(authLevelManagement.checkWebServiceLevel(user_level)) {
List<FlvRecording> recordingList =
flvRecordingDao
-
.getFlvRecordingByExternalUserId(Long
-
.parseLong(externalUserId));
+
.getFlvRecordingByExternalUserId(externalUserId);
// We need to re-marshal the Rooms object cause
Axis2 cannot use
// our objects
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebService.java?rev=1332193&r1=1332192&r2=1332193&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebService.java
Mon Apr 30 13:30:48 2012
@@ -393,7 +393,7 @@ public class UserWebService {
String userpass, String lastname, String firstname,
String email,
String additionalname, String street, String zip,
String fax,
long states_id, String town, long language_id,
- String jNameTimeZone, Long externalUserId, String
externalUserType)
+ String jNameTimeZone, String externalUserId, String
externalUserType)
throws AxisFault {
try {
Long users_id = sessionManagement.checkSession(SID);
@@ -489,7 +489,7 @@ public class UserWebService {
* @throws AxisFault
*/
public Long deleteUserByExternalUserIdAndType(String SID,
- Long externalUserId, String externalUserType) throws
AxisFault {
+ String externalUserId, String externalUserType) throws
AxisFault {
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
@@ -605,7 +605,7 @@ public class UserWebService {
@Deprecated
public Long setUserObjectWithExternalUser(String SID, String username,
String firstname, String lastname, String
profilePictureUrl,
- String email, Long externalUserId, String
externalUserType)
+ String email, String externalUserId, String
externalUserType)
throws AxisFault {
log.debug("UserService.setUserObject");
@@ -678,7 +678,7 @@ public class UserWebService {
*/
public String setUserObjectAndGenerateRoomHash(String SID, String
username,
String firstname, String lastname, String
profilePictureUrl,
- String email, Long externalUserId, String
externalUserType,
+ String email, String externalUserId, String
externalUserType,
Long room_id, int becomeModeratorAsInt, int
showAudioVideoTestAsInt)
throws AxisFault {
try {
@@ -776,7 +776,7 @@ public class UserWebService {
*/
public String setUserObjectAndGenerateRoomHashByURL(String SID,
String username, String firstname, String lastname,
- String profilePictureUrl, String email, Long
externalUserId,
+ String profilePictureUrl, String email, String
externalUserId,
String externalUserType, Long room_id, int
becomeModeratorAsInt,
int showAudioVideoTestAsInt) {
log.debug("UserService.setUserObject");
@@ -879,7 +879,7 @@ public class UserWebService {
*/
public String setUserObjectAndGenerateRoomHashByURLAndRecFlag(String
SID,
String username, String firstname, String lastname,
- String profilePictureUrl, String email, Long
externalUserId,
+ String profilePictureUrl, String email, String
externalUserId,
String externalUserType, Long room_id, int
becomeModeratorAsInt,
int showAudioVideoTestAsInt, int allowRecording) {
try {
@@ -975,7 +975,7 @@ public class UserWebService {
*/
public String setUserObjectMainLandingZone(String SID, String username,
String firstname, String lastname, String
profilePictureUrl,
- String email, Long externalUserId, String
externalUserType) {
+ String email, String externalUserId, String
externalUserType) {
log.debug("UserService.setUserObjectMainLandingZone");
try {
@@ -1074,7 +1074,7 @@ public class UserWebService {
*/
public String setUserAndNickName(String SID, String username,
String firstname, String lastname, String
profilePictureUrl,
- String email, Long externalUserId, String
externalUserType,
+ String email, String externalUserId, String
externalUserType,
Long room_id, int becomeModeratorAsInt,
int showAudioVideoTestAsInt, int
showNickNameDialogAsInt) {
try {
@@ -1160,7 +1160,7 @@ public class UserWebService {
*/
public String setUserObjectAndGenerateRecordingHashByURL(String SID,
String username, String firstname, String lastname,
- Long externalUserId, String externalUserType, Long
recording_id) {
+ String externalUserId, String externalUserType, Long
recording_id) {
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebServiceFacade.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebServiceFacade.java?rev=1332193&r1=1332192&r2=1332193&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebServiceFacade.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebServiceFacade.java
Mon Apr 30 13:30:48 2012
@@ -140,7 +140,7 @@ public class UserWebServiceFacade {
String userpass, String lastname, String firstname,
String email,
String additionalname, String street, String zip,
String fax,
long states_id, String town, long language_id,
- String jNameTimeZone, Long externalUserId, String
externalUserType)
+ String jNameTimeZone, String externalUserId, String
externalUserType)
throws AxisFault {
return getUserServiceProxy().addNewUserWithExternalType(SID,
username,
userpass, lastname, firstname, email,
additionalname, street,
@@ -173,7 +173,7 @@ public class UserWebServiceFacade {
* @throws AxisFault
*/
public Long deleteUserByExternalUserIdAndType(String SID,
- Long externalUserId, String externalUserType) throws
AxisFault {
+ String externalUserId, String externalUserType) throws
AxisFault {
return
getUserServiceProxy().deleteUserByExternalUserIdAndType(SID,
externalUserId, externalUserType);
}
@@ -218,7 +218,7 @@ public class UserWebServiceFacade {
@Deprecated
public Long setUserObjectWithExternalUser(String SID, String username,
String firstname, String lastname, String
profilePictureUrl,
- String email, Long externalUserId, String
externalUserType)
+ String email, String externalUserId, String
externalUserType)
throws AxisFault {
return getUserServiceProxy().setUserObjectWithExternalUser(SID,
username, firstname, lastname,
profilePictureUrl, email,
@@ -227,7 +227,7 @@ public class UserWebServiceFacade {
public String setUserObjectAndGenerateRoomHash(String SID, String
username,
String firstname, String lastname, String
profilePictureUrl,
- String email, Long externalUserId, String
externalUserType,
+ String email, String externalUserId, String
externalUserType,
Long room_id, int becomeModeratorAsInt, int
showAudioVideoTestAsInt)
throws AxisFault {
return
getUserServiceProxy().setUserObjectAndGenerateRoomHash(SID,
@@ -238,7 +238,7 @@ public class UserWebServiceFacade {
public String setUserObjectAndGenerateRoomHashByURL(String SID,
String username, String firstname, String lastname,
- String profilePictureUrl, String email, Long
externalUserId,
+ String profilePictureUrl, String email, String
externalUserId,
String externalUserType, Long room_id, int
becomeModeratorAsInt,
int showAudioVideoTestAsInt) throws AxisFault {
return
getUserServiceProxy().setUserObjectAndGenerateRoomHashByURL(SID,
@@ -249,7 +249,7 @@ public class UserWebServiceFacade {
public String setUserObjectAndGenerateRoomHashByURLAndRecFlag(String
SID,
String username, String firstname, String lastname,
- String profilePictureUrl, String email, Long
externalUserId,
+ String profilePictureUrl, String email, String
externalUserId,
String externalUserType, Long room_id, int
becomeModeratorAsInt,
int showAudioVideoTestAsInt, int allowRecording) throws
AxisFault {
return getUserServiceProxy()
@@ -262,7 +262,7 @@ public class UserWebServiceFacade {
public String setUserObjectMainLandingZone(String SID, String username,
String firstname, String lastname, String
profilePictureUrl,
- String email, Long externalUserId, String
externalUserType)
+ String email, String externalUserId, String
externalUserType)
throws AxisFault {
return getUserServiceProxy().setUserObjectMainLandingZone(SID,
username, firstname, lastname,
profilePictureUrl, email,
@@ -271,7 +271,7 @@ public class UserWebServiceFacade {
public String setUserAndNickName(String SID, String username,
String firstname, String lastname, String
profilePictureUrl,
- String email, Long externalUserId, String
externalUserType,
+ String email, String externalUserId, String
externalUserType,
Long room_id, int becomeModeratorAsInt,
int showAudioVideoTestAsInt, int
showNickNameDialogAsInt)
throws AxisFault {
@@ -283,7 +283,7 @@ public class UserWebServiceFacade {
public String setUserObjectAndGenerateRecordingHashByURL(String SID,
String username, String firstname, String lastname,
- Long externalUserId, String externalUserType, Long
recording_id)
+ String externalUserId, String externalUserType, Long
recording_id)
throws AxisFault {
return getUserServiceProxy()
.setUserObjectAndGenerateRecordingHashByURL(SID, username,
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1332193&r1=1332192&r2=1332193&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
Mon Apr 30 13:30:48 2012
@@ -708,8 +708,8 @@ public class BackupImportController exte
us.setExternalUserType("");
}
if
(itemUsers.element("externalUserId") != null) {
-
us.setExternalUserId(importLongType(unformatString(itemUsers
-
.element("externalUserId").getText())));
+
us.setExternalUserId(unformatString(itemUsers
+
.element("externalUserId").getText()));
} else {
us.setExternalUserId(null);
}
