Index: lams_build/lib/lams/lams-learning.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams-learning.jar,v
diff -u -r1.51.2.4 -r1.51.2.5
Binary files differ
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040066.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/build.xml,v
diff -u -r1.34.2.2 -r1.34.2.3
--- lams_learning/build.xml	4 May 2016 07:44:12 -0000	1.34.2.2
+++ lams_learning/build.xml	10 Aug 2016 18:36:37 -0000	1.34.2.3
@@ -6,11 +6,11 @@
 
 	<target name="_build-war" depends="_compile-java, _copy-websocket, build_base._build-war" />
 	
-	<!-- Add the websocket class to WEB-INF/classes.
+	<!-- Add the websockets class to WEB-INF/classes.
 		 This can not be a target in build_base because the way Ant reads properties and dependecies
 		 would make it too complex or make it repeat some tasks.
 		 
-		 The file servers only as an advice for WF to set up the websocket server.
+		 The files serve only as an advice for WF to set up the websocket server.
 		 The actual implementation is taken from the JAR.
 		 Not having it in WAR will make WF ignore its annotations,
 		 not having it in JAR will cause a ClassLoader error.
@@ -21,5 +21,9 @@
 			  file="${basedir}/build/classes/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.class"
 			  verbose="true"
 		/>
+		<copy todir="${basedir}/build/war/WEB-INF/classes"
+			  file="${basedir}/build/classes/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.class"
+			  verbose="true"
+		/>
 	</target>
 </project>
\ No newline at end of file
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/command/Command.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_learning/src/java/org/lamsfoundation/lams/learning/command/Command.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java,v
diff -u -r1.34.2.2 -r1.34.2.3
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	11 May 2016 07:07:36 -0000	1.34.2.2
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	10 Aug 2016 18:36:37 -0000	1.34.2.3
@@ -21,9 +21,12 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.learning.service;
 
+import java.util.Date;
+import java.util.List;
+
+import org.lamsfoundation.lams.learning.command.Command;
 import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.tool.ToolOutput;
 
@@ -53,4 +56,8 @@
     ActivityPositionDTO getActivityPosition(Long activityId);
 
     ActivityPositionDTO getActivityPositionByToolSessionId(Long toolSessionId);
+
+    void createCommandForLearner(Long lessonId, String userName, String jsonCommand);
+
+    List<Command> getCommandsForLesson(Long lessonId, Date laterThan);
 }
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java,v
diff -u -r1.112.2.11 -r1.112.2.12
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	21 Jun 2016 10:25:33 -0000	1.112.2.11
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	10 Aug 2016 18:36:37 -0000	1.112.2.12
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.learning.service;
 
 import java.sql.Timestamp;
@@ -38,6 +37,7 @@
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
+import org.lamsfoundation.lams.learning.command.Command;
 import org.lamsfoundation.lams.learning.progress.ProgressBuilder;
 import org.lamsfoundation.lams.learning.progress.ProgressEngine;
 import org.lamsfoundation.lams.learning.progress.ProgressException;
@@ -383,7 +383,7 @@
     public LearnerProgress getProgressById(Long progressId) {
 	return learnerProgressDAO.getLearnerProgress(progressId);
     }
-    
+
     @Override
     public Integer getProgressArchiveMaxAttemptID(Integer userId, Long lessonId) {
 	return learnerProgressDAO.getLearnerProgressArchiveMaxAttemptID(userId, lessonId);
@@ -1398,6 +1398,19 @@
     }
 
     @Override
+    public void createCommandForLearner(Long lessonId, String userName, String jsonCommand) {
+	Command command = new Command(lessonId, userName, jsonCommand);
+	activityDAO.insert(command);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<Command> getCommandsForLesson(Long lessonId, Date laterThan) {
+	String query = "FROM Command WHERE lessonId=? AND createDate >= ?";
+	return activityDAO.find(query, new Object[] { lessonId, laterThan });
+    }
+
+    @Override
     public ActivityPositionDTO getActivityPositionByToolSessionId(Long toolSessionId) {
 	ToolSession toolSession = lamsCoreToolService.getToolSessionById(toolSessionId);
 	return toolSession == null ? null : getActivityPosition(toolSession.getToolActivity().getActivityId());
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v
diff -u -r1.118.2.44 -r1.118.2.45
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	8 Aug 2016 16:57:26 -0000	1.118.2.44
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	10 Aug 2016 18:34:06 -0000	1.118.2.45
@@ -55,6 +55,7 @@
 import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.authoring.ObjectExtractor;
 import org.lamsfoundation.lams.authoring.service.IAuthoringService;
+import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.BranchingActivity;
 import org.lamsfoundation.lams.learningdesign.ChosenBranchingActivity;
@@ -131,6 +132,8 @@
 
     private static IUserManagementService userManagementService;
 
+    private static ILearnerService learnerService;
+
     private Integer getUserId() {
 	HttpSession ss = SessionManager.getSession();
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
@@ -590,9 +593,10 @@
      * @return An ActionForward
      * @throws IOException
      * @throws ServletException
+     * @throws JSONException
      */
     public ActionForward forceComplete(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
+	    HttpServletResponse response) throws IOException, ServletException, JSONException {
 	getAuditService();
 	// get parameters
 	Long activityId = null;
@@ -631,6 +635,12 @@
 	String auditMessage = getMonitoringService().getMessageService().getMessage(messageKey, args);
 	MonitoringAction.auditService.log(MonitoringConstants.MONITORING_MODULE_NAME, auditMessage + " " + message);
 
+	JSONObject jsonCommand = new JSONObject();
+	jsonCommand.put("message", "Teacher moved you to another activity.");
+	jsonCommand.put("redirectURL", "/lams/learning/learner.do?method=joinLesson&lessonID=" + lessonId);
+	User learner = (User) getUserManagementService().findById(User.class, learnerId);
+	getLearnerService().createCommandForLearner(lessonId, learner.getLogin(), jsonCommand.toString());
+
 	PrintWriter writer = response.getWriter();
 	writer.println(message);
 	return null;
@@ -1385,6 +1395,15 @@
 	return MonitoringAction.userManagementService;
     }
 
+    private ILearnerService getLearnerService() {
+	if (MonitoringAction.learnerService == null) {
+	    WebApplicationContext ctx = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext());
+	    MonitoringAction.learnerService = (ILearnerService) ctx.getBean("learnerService");
+	}
+	return MonitoringAction.learnerService;
+    }
+
     /**
      * Set whether or not the presence available button is available in learner. Expects parameters lessonID and
      * presenceAvailable.
Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.13 -r1.1.2.14
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	10 Aug 2016 11:09:07 -0000	1.1.2.13
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	10 Aug 2016 18:33:12 -0000	1.1.2.14
@@ -93,7 +93,9 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+				
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +198,24 @@
 									} 
 								});
 							}
+
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							//when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>