Index: lams_build/lib/lams/lams-learning.jar
===================================================================
diff -u -r3dbf966d900adefc34cdad501d3c392118451cd9 -re463b64cccfefc6efb39c891fb496bfed47feb4a
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040066.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040066.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040066.sql	(revision e463b64cccfefc6efb39c891fb496bfed47feb4a)
@@ -0,0 +1,18 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+-- LDEV-3765 Create a table for storing commands sent to Learners
+-- No foreign keys as maybe in the future it will be possible to send commands to a learner in any lesson
+-- or to all learners in a given lesson.
+
+CREATE TABLE lams_learning_command (
+	uid BIGINT(20) NOT NULL AUTO_INCREMENT,
+	lesson_id BIGINT(20),
+	user_name VARCHAR(191),
+	create_date DATETIME NOT NULL,
+	command_text TEXT,
+	PRIMARY KEY (uid)
+)ENGINE=InnoDB;
+
+COMMIT;
+SET AUTOCOMMIT = 1;
Index: lams_learning/build.xml
===================================================================
diff -u -r3665dab7c4bd5cd4584c4348a7960722bede3d9a -re463b64cccfefc6efb39c891fb496bfed47feb4a
--- lams_learning/build.xml	(.../build.xml)	(revision 3665dab7c4bd5cd4584c4348a7960722bede3d9a)
+++ lams_learning/build.xml	(.../build.xml)	(revision e463b64cccfefc6efb39c891fb496bfed47feb4a)
@@ -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
Index: lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/command/Command.hbm.xml
===================================================================
diff -u
--- lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/command/Command.hbm.xml	(revision 0)
+++ lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/command/Command.hbm.xml	(revision e463b64cccfefc6efb39c891fb496bfed47feb4a)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+
+    <class
+        name="org.lamsfoundation.lams.learning.command.Command"
+        table="lams_learning_command"
+    >
+
+        <id
+            name="uid"
+            column="uid"
+            type="java.lang.Long"
+        >
+            <generator class="native" />
+        </id>
+
+        <property
+            name="lessonId"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="lesson_id"
+        />
+
+        <property
+            name="userName"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="user_name"
+        />
+
+        <property
+            name="createDate"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="create_date"
+        />
+
+        <property
+            name="commandText"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="command_text"
+        />
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/command/Command.java
===================================================================
diff -u
--- lams_learning/src/java/org/lamsfoundation/lams/learning/command/Command.java	(revision 0)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/command/Command.java	(revision e463b64cccfefc6efb39c891fb496bfed47feb4a)
@@ -0,0 +1,93 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.learning.command;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ */
+public class Command implements Serializable {
+
+    private Long uid;
+
+    private Long lessonId;
+
+    private String userName;
+
+    private Date createDate;
+
+    private String commandText;
+
+    public Command() {
+    }
+
+    public Command(Long lessonId, String userName, String jsonCommand) {
+	this.lessonId = lessonId;
+	this.userName = userName;
+	this.createDate = new Date();
+	this.commandText = jsonCommand;
+    }
+
+    public Long getUid() {
+	return uid;
+    }
+
+    public void setUid(Long uid) {
+	this.uid = uid;
+    }
+
+    public Long getLessonId() {
+	return lessonId;
+    }
+
+    public void setLessonId(Long lessonId) {
+	this.lessonId = lessonId;
+    }
+
+    public String getUserName() {
+	return userName;
+    }
+
+    public void setUserName(String userName) {
+	this.userName = userName;
+    }
+
+    public Date getCreateDate() {
+	return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+	this.createDate = createDate;
+    }
+
+    public String getCommandText() {
+	return commandText;
+    }
+
+    public void setCommandText(String commandText) {
+	this.commandText = commandText;
+    }
+}
\ No newline at end of file
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
===================================================================
diff -u
--- lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java	(revision 0)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java	(revision e463b64cccfefc6efb39c891fb496bfed47feb4a)
@@ -0,0 +1,162 @@
+package org.lamsfoundation.lams.learning.command;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+
+import javax.websocket.CloseReason;
+import javax.websocket.OnClose;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.server.ServerEndpoint;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.learning.service.ILearnerService;
+import org.lamsfoundation.lams.util.hibernate.HibernateSessionManager;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * Receives, processes and sends messages and commands to Learners.
+ *
+ * @author Marcin Cieslak
+ */
+@ServerEndpoint("/commandWebsocket")
+public class CommandWebsocketServer {
+
+    private static ILearnerService learnerService;
+
+    /**
+     * A singleton which updates Learners with messages and commands.
+     */
+    private static class SendWorker extends Thread {
+	private boolean stopFlag = false;
+	// how ofter the thread runs
+	private static final long CHECK_INTERVAL = 2000;
+	// mapping lessonId -> timestamp when the check was last performed, so the thread does not run too often
+	private final Map<Long, Long> lastSendTimes = new TreeMap<Long, Long>();
+
+	@Override
+	public void run() {
+	    while (!stopFlag) {
+		try {
+		    // websocket communication bypasses standard HTTP filters, so Hibernate session needs to be initialised manually
+		    // A new session needs to be created on each thread run as the session keeps stale Hibernate data (single transaction).
+		    HibernateSessionManager.bindHibernateSessionToCurrentThread(true);
+
+		    // synchronize websockets as a new Learner entering Learner interface could modify this collection
+		    Iterator<Entry<Long, Map<String, Session>>> entryIterator = null;
+		    synchronized (CommandWebsocketServer.websockets) {
+			entryIterator = CommandWebsocketServer.websockets.entrySet().iterator();
+		    }
+
+		    Entry<Long, Map<String, Session>> entry = null;
+		    // go through lessons and update registered learners with messages
+		    do {
+			synchronized (CommandWebsocketServer.websockets) {
+			    entry = entryIterator.hasNext() ? entryIterator.next() : null;
+			}
+
+			if (entry != null) {
+			    Long lessonId = entry.getKey();
+			    Long lastSendTime = lastSendTimes.get(lessonId);
+			    if ((lastSendTime == null)
+				    || ((System.currentTimeMillis() - lastSendTime) >= SendWorker.CHECK_INTERVAL)) {
+				send(lessonId);
+			    }
+
+			    // if all learners left the lesson, remove the obsolete mapping
+			    Map<String, Session> lessonWebsockets = entry.getValue();
+			    if (lessonWebsockets.isEmpty()) {
+				synchronized (CommandWebsocketServer.websockets) {
+				    entryIterator.remove();
+				}
+				lastSendTimes.remove(lessonId);
+			    }
+			}
+		    } while (entry != null);
+
+		    Thread.sleep(SendWorker.CHECK_INTERVAL);
+		} catch (InterruptedException e) {
+		    CommandWebsocketServer.log.warn("Stopping Command Websocket Server worker thread");
+		    stopFlag = true;
+		} catch (Exception e) {
+		    // error caught, but carry on
+		    CommandWebsocketServer.log.error("Error in Command Websocket Server worker thread", e);
+		}
+	    }
+	}
+
+	/**
+	 * Feeds opened websockets with messages.
+	 */
+	private void send(Long lessonId) throws IOException {
+	    Long lastSendTime = lastSendTimes.get(lessonId);
+	    lastSendTimes.put(lessonId, System.currentTimeMillis());
+
+	    List<Command> commands = CommandWebsocketServer.getLearnerService().getCommandsForLesson(lessonId,
+		    new Date(lastSendTime));
+	    Map<String, Session> lessonWebsockets = CommandWebsocketServer.websockets.get(lessonId);
+	    for (Command command : commands) {
+		Session websocket = lessonWebsockets.get(command.getUserName());
+		if (websocket != null && websocket.isOpen()) {
+		    websocket.getBasicRemote().sendText(command.getCommandText());
+		}
+	    }
+	}
+    }
+
+    private static Logger log = Logger.getLogger(CommandWebsocketServer.class);
+
+    private static final SendWorker sendWorker = new SendWorker();
+    private static final Map<Long, Map<String, Session>> websockets = Collections
+	    .synchronizedMap(new TreeMap<Long, Map<String, Session>>());
+
+    static {
+	// run the singleton thread
+	CommandWebsocketServer.sendWorker.start();
+    }
+
+    /**
+     * Registeres the Learner for processing by SendWorker.
+     */
+    @OnOpen
+    public void registerUser(Session websocket) throws IOException {
+	Long lessonId = Long.valueOf(websocket.getRequestParameterMap().get(AttributeNames.PARAM_LESSON_ID).get(0));
+	Map<String, Session> sessionWebsockets = CommandWebsocketServer.websockets.get(lessonId);
+	if (sessionWebsockets == null) {
+	    sessionWebsockets = Collections.synchronizedMap(new TreeMap<String, Session>());
+	    CommandWebsocketServer.websockets.put(lessonId, sessionWebsockets);
+	}
+
+	String login = websocket.getUserPrincipal().getName();
+	sessionWebsockets.put(login, websocket);
+    }
+
+    /**
+     * Removes Learner websocket from the collection.
+     */
+    @OnClose
+    public void unregisterUser(Session session, CloseReason reason) {
+	Long lessonId = Long.valueOf(session.getRequestParameterMap().get(AttributeNames.PARAM_LESSON_ID).get(0));
+	Map<String, Session> lessonWebsockets = CommandWebsocketServer.websockets.get(lessonId);
+	String login = session.getUserPrincipal().getName();
+	lessonWebsockets.remove(login);
+    }
+
+    private static ILearnerService getLearnerService() {
+	if (learnerService == null) {
+	    WebApplicationContext ctx = WebApplicationContextUtils
+		    .getWebApplicationContext(SessionManager.getServletContext());
+	    learnerService = (ILearnerService) ctx.getBean("learnerService");
+	}
+	return learnerService;
+    }
+}
\ No newline at end of file
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -re463b64cccfefc6efb39c891fb496bfed47feb4a
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	(.../ILearnerService.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	(.../ILearnerService.java)	(revision e463b64cccfefc6efb39c891fb496bfed47feb4a)
@@ -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
===================================================================
diff -u -r14c33274b785517e5e3f6a7642dc7c6752a34411 -re463b64cccfefc6efb39c891fb496bfed47feb4a
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 14c33274b785517e5e3f6a7642dc7c6752a34411)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision e463b64cccfefc6efb39c891fb496bfed47feb4a)
@@ -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
===================================================================
diff -u -rcf649302ae2ccdcb1eda11b21525ab516572a7f2 -re463b64cccfefc6efb39c891fb496bfed47feb4a
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision cf649302ae2ccdcb1eda11b21525ab516572a7f2)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision e463b64cccfefc6efb39c891fb496bfed47feb4a)
@@ -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
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -re463b64cccfefc6efb39c891fb496bfed47feb4a
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision e463b64cccfefc6efb39c891fb496bfed47feb4a)
@@ -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>