You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by es...@apache.org on 2012/02/27 12:08:29 UTC
svn commit: r1294105 - in
/incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin:
gateway/OmGateway.java gateway/OmRestService.java servlet/RoomsServlet.java
Author: eschwert
Date: Mon Feb 27 11:08:29 2012
New Revision: 1294105
URL: http://svn.apache.org/viewvc?rev=1294105&view=rev
Log:
OPENMEETINGS-60 Application key for OpenMeetings configuration
Modified:
incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmGateway.java
incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmRestService.java
incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/servlet/RoomsServlet.java
Modified: incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmGateway.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmGateway.java?rev=1294105&r1=1294104&r2=1294105&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmGateway.java (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmGateway.java Mon Feb 27 11:08:29 2012
@@ -55,7 +55,8 @@ public class OmGateway {
Boolean isModeratedRoom,
String name,
Long numberOfParticipent,
- Long roomType
+ Long roomType,
+ String externalRoomType
) throws Exception{
String roomId ="";
@@ -70,7 +71,7 @@ public class OmGateway {
"&isDemoRoom=false"+
"&demoTime="+
"&isModeratedRoom="+isModeratedRoom.toString()+
- "&externalRoomType=jira"+
+ "&externalRoomType="+externalRoomType+
"&allowUserQuestions="+
"&isAudioOnly="+isAudioOnly.toString()+
"&waitForRecording=false"+
Modified: incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmRestService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmRestService.java?rev=1294105&r1=1294104&r2=1294105&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmRestService.java (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmRestService.java Mon Feb 27 11:08:29 2012
@@ -70,7 +70,7 @@ public class OmRestService {
switch (statusCode) {
case 200: {
- System.out.println("Success connection");
+ //System.out.println("Success connection");
break;
}
case 400: {
Modified: incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/servlet/RoomsServlet.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/servlet/RoomsServlet.java?rev=1294105&r1=1294104&r2=1294105&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/servlet/RoomsServlet.java (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/servlet/RoomsServlet.java Mon Feb 27 11:08:29 2012
@@ -117,7 +117,8 @@ public final class RoomsServlet extends
if(omGateway.loginUser()){
String url = (String)omPluginSettings.getSomeInfo("url");
- String port = (String)omPluginSettings.getSomeInfo("port");
+ String port = (String)omPluginSettings.getSomeInfo("port");
+ String externalUserType = (String)omPluginSettings.getSomeInfo("key");
String firsname = currentUser.getDisplayName();
String email = currentUser.getEmailAddress();
@@ -134,7 +135,7 @@ public final class RoomsServlet extends
Long roomId = Long.valueOf(req.getParameter("roomId"));
String roomHash = omGateway.setUserObjectAndGenerateRoomHash(username, firsname, "", profilePictureUrl,
- email, userId, "jira", roomId,
+ email, userId, externalUserType, roomId,
becomeModeratorAsInt,
showAudioVideoTestAsInt);
@@ -277,6 +278,7 @@ public final class RoomsServlet extends
String roomName = req.getParameter("roomname");
Long numberOfParticipent = Long.valueOf(req.getParameter("numberOfParticipent"));
Long roomType = Long.valueOf(req.getParameter("roomType"));
+ String externalRoomType = (String)omPluginSettings.getSomeInfo("key");
Long roomId = 0L;
try {
@@ -288,7 +290,8 @@ public final class RoomsServlet extends
isModeratedRoom,
roomName,
numberOfParticipent,
- roomType
+ roomType,
+ externalRoomType
);
roomService.add(isAllowedRecording, isAudioOnly, isModeratedRoom, roomName, numberOfParticipent, roomType, roomId, currentUser.getName());