Author: eschwert
Date: Thu May 3 21:29:54 2012
New Revision: 1333633
URL: http://svn.apache.org/viewvc?rev=1333633&view=rev
Log:
OPENMEETINGS-82 changed data type of externalUserId
Modified:
incubator/openmeetings/branches/confluence-plugin/src/main/java/com/openmeetings/confluence/plugins/gateway/OmGateway.java
incubator/openmeetings/branches/confluence-plugin/src/main/java/com/openmeetings/confluence/plugins/servlet/RoomsServlet.java
incubator/openmeetings/branches/confluence-plugin/target/openmeetingsconfluence-1.0-SNAPSHOT.jar
Modified:
incubator/openmeetings/branches/confluence-plugin/src/main/java/com/openmeetings/confluence/plugins/gateway/OmGateway.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/branches/confluence-plugin/src/main/java/com/openmeetings/confluence/plugins/gateway/OmGateway.java?rev=1333633&r1=1333632&r2=1333633&view=diff
==============================================================================
---
incubator/openmeetings/branches/confluence-plugin/src/main/java/com/openmeetings/confluence/plugins/gateway/OmGateway.java
(original)
+++
incubator/openmeetings/branches/confluence-plugin/src/main/java/com/openmeetings/confluence/plugins/gateway/OmGateway.java
Thu May 3 21:29:54 2012
@@ -151,7 +151,7 @@ public class OmGateway {
}
public String setUserObjectAndGenerateRoomHash (String username ,
String firstname ,
- String lastname , String profilePictureUrl , String
email , Long externalUserId ,
+ String lastname , String profilePictureUrl , String
email , String externalUserId ,
String externalUserType , Long room_id , int
becomeModeratorAsInt , int showAudioVideoTestAsInt )
throws Exception
{
Modified:
incubator/openmeetings/branches/confluence-plugin/src/main/java/com/openmeetings/confluence/plugins/servlet/RoomsServlet.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/branches/confluence-plugin/src/main/java/com/openmeetings/confluence/plugins/servlet/RoomsServlet.java?rev=1333633&r1=1333632&r2=1333633&view=diff
==============================================================================
---
incubator/openmeetings/branches/confluence-plugin/src/main/java/com/openmeetings/confluence/plugins/servlet/RoomsServlet.java
(original)
+++
incubator/openmeetings/branches/confluence-plugin/src/main/java/com/openmeetings/confluence/plugins/servlet/RoomsServlet.java
Thu May 3 21:29:54 2012
@@ -130,7 +130,7 @@ public final class RoomsServlet extends
String username = "";
String firsname = "";
- Long userId = 0L;
+ String userId = "";
String email = "";
int becomeModeratorAsInt = 1;
int showAudioVideoTestAsInt = 1;
@@ -142,14 +142,14 @@ public final class RoomsServlet extends
if(currentUser == null){
firsname = "anonymous";
email = "";
- userId = new Date().getTime();
+ userId = new Long(new
Date().getTime()).toString();
username = "anonymous";
becomeModeratorAsInt = 0;
showAudioVideoTestAsInt = 1;
}else{
firsname = currentUser.getDisplayName();
email =
currentUser.getEmailAddress();
- userId = new Date().getTime();
+ userId =
currentUser.getName();//new Date().getTime();
username =
currentUser.getName();
becomeModeratorAsInt = 1;
showAudioVideoTestAsInt = 1;
Modified:
incubator/openmeetings/branches/confluence-plugin/target/openmeetingsconfluence-1.0-SNAPSHOT.jar
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/branches/confluence-plugin/target/openmeetingsconfluence-1.0-SNAPSHOT.jar?rev=1333633&r1=1333632&r2=1333633&view=diff
==============================================================================
Binary files - no diff available.
