Index: lams_tool_dimdim/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r170b17877aa97624cf7f894c01e431a1e479487c -r44423a18e35bc8f376acfa3f3a8e81f600c4027f
--- lams_tool_dimdim/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 170b17877aa97624cf7f894c01e431a1e479487c)
+++ lams_tool_dimdim/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 44423a18e35bc8f376acfa3f3a8e81f600c4027f)
@@ -29,6 +29,7 @@
button.summary =Summary
button.editActivity =Edit Activity
button.statistics =Statistics
+button.close = Close
label.authoring.basic.title =Title
@@ -59,6 +60,7 @@
message.warnLockOnFinish =Note: After you click on "Next Activity" and you come back to this Notebook, you won't be able to continue adding notes.
message.activityLocked =The instructor has set this activity not to allow notes after you have finished it. As you are returning to this Notebook, you are able to see your notes but not allowed to add more.
message.no.reflection.available = Notebook not available
+message.endMeeting = The meeting room is now closed. You can continue with your sequence.
heading.totalLearners =Number of Learners
heading.totalLearnersInGroup =Total Number of Learners in Group
Index: lams_tool_dimdim/conf/xdoclet/struts-actions.xml
===================================================================
diff -u
--- lams_tool_dimdim/conf/xdoclet/struts-actions.xml (revision 0)
+++ lams_tool_dimdim/conf/xdoclet/struts-actions.xml (revision 44423a18e35bc8f376acfa3f3a8e81f600c4027f)
@@ -0,0 +1,3 @@
+
\ No newline at end of file
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
===================================================================
diff -u -r718613f72e0fc64be2db39de3c6c3682852d815b -r44423a18e35bc8f376acfa3f3a8e81f600c4027f
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java (.../DimdimService.java) (revision 718613f72e0fc64be2db39de3c6c3682852d815b)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java (.../DimdimService.java) (revision 44423a18e35bc8f376acfa3f3a8e81f600c4027f)
@@ -480,7 +480,7 @@
return serverURL.getValue() + connectURL;
}
- public String getDimdimStartConferenceURL(UserDTO userDTO, String meetingKey) throws Exception {
+ public String getDimdimStartConferenceURL(UserDTO userDTO, String meetingKey, String returnURL) throws Exception {
// Get Dimdim server url
DimdimConfig serverURL = getConfigEntry(Constants.CONFIG_SERVER_URL);
@@ -495,8 +495,9 @@
+ URLEncoder.encode(userDTO.getEmail(), "UTF8") + "&displayName="
+ URLEncoder.encode(userDTO.getFirstName() + " " + userDTO.getLastName(), "UTF8") + "&confKey="
+ URLEncoder.encode(meetingKey, "UTF8") + "&lobby=false" + "&networkProfile=3" + "&meetingHours=99"
- + "&maxAttendeeMikes=0" + "&returnUrl=asdf" + "&presenterAV=av" + "&privateChatEnabled=true"
- + "&publicChatEnabled=true" + "&screenShareEnabled=true" + "&whiteboardEnabled=true");
+ + "&maxAttendeeMikes=0" + "&returnUrl=" + URLEncoder.encode(returnURL, "UTF8") + "&presenterAV=av"
+ + "&privateChatEnabled=true" + "&publicChatEnabled=true" + "&screenShareEnabled=true"
+ + "&whiteboardEnabled=true");
String connectURL = sendDimdimRequest(url);
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java
===================================================================
diff -u -rb7cae3b9ce92b3c084df9258e703fcf2d75fbd33 -r44423a18e35bc8f376acfa3f3a8e81f600c4027f
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java (.../IDimdimService.java) (revision b7cae3b9ce92b3c084df9258e703fcf2d75fbd33)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java (.../IDimdimService.java) (revision 44423a18e35bc8f376acfa3f3a8e81f600c4027f)
@@ -177,7 +177,7 @@
* @return
* @throws Exception
*/
- String getDimdimStartConferenceURL(UserDTO userDTO, String meetingKey) throws Exception;
+ String getDimdimStartConferenceURL(UserDTO userDTO, String meetingKey, String returnURL) throws Exception;
/**
*
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimUtil.java
===================================================================
diff -u -rd6d2a4921fc7dcdcf19f722ff0a4d6b28a15fbb6 -r44423a18e35bc8f376acfa3f3a8e81f600c4027f
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimUtil.java (.../DimdimUtil.java) (revision d6d2a4921fc7dcdcf19f722ff0a4d6b28a15fbb6)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimUtil.java (.../DimdimUtil.java) (revision 44423a18e35bc8f376acfa3f3a8e81f600c4027f)
@@ -26,9 +26,29 @@
import java.util.Random;
+import javax.servlet.http.HttpServletRequest;
+
public class DimdimUtil {
public static String generateMeetingKey() {
return new Long(System.currentTimeMillis()).toString() + "-" + (new Random().nextInt());
}
+
+ public static String generateReturnURL(HttpServletRequest request) {
+ String protocol = request.getProtocol();
+ if (protocol.startsWith("HTTPS")) {
+ protocol = "https://";
+ } else {
+ protocol = "http://";
+ }
+
+ String path = protocol + request.getServerName() + ":" + request.getServerPort() + request.getContextPath();
+ if (!path.endsWith("/")) {
+ path = path + "/";
+ }
+
+ path += "endMeeting.do";
+
+ return path;
+ }
}
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java
===================================================================
diff -u -rc1df2d1107c29f503e8a9bc1be287f3ac27973ab -r44423a18e35bc8f376acfa3f3a8e81f600c4027f
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision c1df2d1107c29f503e8a9bc1be287f3ac27973ab)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 44423a18e35bc8f376acfa3f3a8e81f600c4027f)
@@ -65,7 +65,6 @@
* @struts.action path="/authoring" name="authoringForm" parameter="dispatch" scope="request" validate="false"
*
* @struts.action-forward name="success" path="tiles:/authoring/main"
- * @struts.action-forward name="message_page" path="tiles:/generic/message"
*/
public class AuthoringAction extends DispatchAction {
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
===================================================================
diff -u -r17f365b6e67b7e64cbad79ec5000a309a3bd929d -r44423a18e35bc8f376acfa3f3a8e81f600c4027f
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java (.../LearningAction.java) (revision 17f365b6e67b7e64cbad79ec5000a309a3bd929d)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java (.../LearningAction.java) (revision 44423a18e35bc8f376acfa3f3a8e81f600c4027f)
@@ -154,7 +154,8 @@
String connectURL = "";
if (mode.isAuthor()) {
String meetingKey = DimdimUtil.generateMeetingKey();
- connectURL = dimdimService.getDimdimStartConferenceURL(lamsUserDTO, meetingKey);
+ String returnURL = DimdimUtil.generateReturnURL(request);
+ connectURL = dimdimService.getDimdimStartConferenceURL(lamsUserDTO, meetingKey, returnURL);
} else {
if (dimdimSession.getMeetingKey() != null) {
connectURL = dimdimService.getDimdimJoinConferenceURL(lamsUserDTO, dimdimSession.getMeetingKey());
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java
===================================================================
diff -u -rb7cae3b9ce92b3c084df9258e703fcf2d75fbd33 -r44423a18e35bc8f376acfa3f3a8e81f600c4027f
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision b7cae3b9ce92b3c084df9258e703fcf2d75fbd33)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 44423a18e35bc8f376acfa3f3a8e81f600c4027f)
@@ -136,8 +136,11 @@
session.setMeetingKey(meetingKey);
dimdimService.saveOrUpdateDimdimSession(session);
- String startConferenceURL = dimdimService.getDimdimStartConferenceURL(lamsUserDTO, session.getMeetingKey());
+ String returnURL = DimdimUtil.generateReturnURL(request);
+ String startConferenceURL = dimdimService.getDimdimStartConferenceURL(lamsUserDTO, session.getMeetingKey(),
+ returnURL);
+
response.sendRedirect(startConferenceURL);
return null;
Index: lams_tool_dimdim/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r7c68a5b7c9e928e763d087d92d8dd17170f2cb67 -r44423a18e35bc8f376acfa3f3a8e81f600c4027f
--- lams_tool_dimdim/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision 7c68a5b7c9e928e763d087d92d8dd17170f2cb67)
+++ lams_tool_dimdim/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision 44423a18e35bc8f376acfa3f3a8e81f600c4027f)
@@ -44,14 +44,6 @@
-
-
-
-
-
-
-
-
@@ -111,4 +103,10 @@
+
+
+
+
+
+
Index: lams_tool_dimdim/web/pages/dimdim/end_meeting.jsp
===================================================================
diff -u
--- lams_tool_dimdim/web/pages/dimdim/end_meeting.jsp (revision 0)
+++ lams_tool_dimdim/web/pages/dimdim/end_meeting.jsp (revision 44423a18e35bc8f376acfa3f3a8e81f600c4027f)
@@ -0,0 +1,15 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+
\ No newline at end of file