Index: lams_tool_dimdim/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.11 -r1.12
--- lams_tool_dimdim/conf/language/lams/ApplicationResources.properties	2 Oct 2008 06:44:10 -0000	1.11
+++ lams_tool_dimdim/conf/language/lams/ApplicationResources.properties	7 Oct 2008 05:33:12 -0000	1.12
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/conf/xdoclet/Attic/struts-actions.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_dimdim/conf/xdoclet/struts-actions.xml	7 Oct 2008 05:33:12 -0000	1.1
@@ -0,0 +1,3 @@
+<action path="/endMeeting"
+	type="org.apache.struts.actions.ForwardAction"
+	parameter="tiles:/dimdim/end_meeting" />
\ No newline at end of file
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java,v
diff -u -r1.10 -r1.11
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java	1 Oct 2008 04:10:18 -0000	1.10
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java	7 Oct 2008 05:33:12 -0000	1.11
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/Attic/IDimdimService.java,v
diff -u -r1.7 -r1.8
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java	1 Oct 2008 03:53:24 -0000	1.7
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java	7 Oct 2008 05:33:12 -0000	1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Attic/DimdimUtil.java,v
diff -u -r1.2 -r1.3
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimUtil.java	30 Sep 2008 05:20:29 -0000	1.2
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimUtil.java	7 Oct 2008 05:33:12 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java,v
diff -u -r1.9 -r1.10
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java	2 Oct 2008 06:43:31 -0000	1.9
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java	7 Oct 2008 05:33:12 -0000	1.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java,v
diff -u -r1.11 -r1.12
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java	2 Oct 2008 00:35:00 -0000	1.11
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java	7 Oct 2008 05:33:12 -0000	1.12
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java,v
diff -u -r1.9 -r1.10
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java	1 Oct 2008 03:53:24 -0000	1.9
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java	7 Oct 2008 05:33:12 -0000	1.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_dimdim/web/WEB-INF/struts/tiles-defs.xml	1 Oct 2008 02:59:36 -0000	1.4
+++ lams_tool_dimdim/web/WEB-INF/struts/tiles-defs.xml	7 Oct 2008 05:33:12 -0000	1.5
@@ -44,14 +44,6 @@
 	</definition>
 	<!-- End: Headers -->
 
-	<definition name="tiles:/generic/message" extends="tiles:/layout:simple">
-		<put name="pageTitleKey" value="pageTitle.authoring" />
-		<put name="header" value="tiles:/header:tabbed" />
-		<put name="body" value="/common/message.jsp"></put>
-	</definition>
-	<!-- End: Generic -->
-
-
 	<!-- Begin: Authoring -->
 	<definition name="tiles:/authoring/main" extends="tiles:/layout:tabbed">
 		<put name="pageTitleKey" value="pageTitle.authoring" />
@@ -111,4 +103,10 @@
 	</definition>
 	<!-- End Admin -->
 	
+	<!-- Begin Dimdim -->
+	<definition name="tiles:/dimdim/end_meeting" extends="tiles:/layout:simple">
+		<put name="body" value="/pages/dimdim/end_meeting.jsp" />
+	</definition>
+	<!-- End Dimdim -->
+	
 </tiles-definitions>
Index: lams_tool_dimdim/web/pages/dimdim/end_meeting.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/pages/dimdim/Attic/end_meeting.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_dimdim/web/pages/dimdim/end_meeting.jsp	7 Oct 2008 05:33:12 -0000	1.1
@@ -0,0 +1,15 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<div id="content">
+	<div class="info">
+		<fmt:message key="message.endMeeting" />
+	</div>
+	
+	<br>
+	
+	<a href="#" class="button" onclick="window.close();" style="float: right">
+		<fmt:message key="button.close" /> 
+	</a>
+	
+	<br>
+</button></div>
\ No newline at end of file