Index: lams_tool_scratchie/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/.classpath,v
diff -u -r1.6.2.11 -r1.6.2.12
--- lams_tool_scratchie/.classpath	25 Nov 2014 10:47:15 -0000	1.6.2.11
+++ lams_tool_scratchie/.classpath	14 Apr 2016 12:19:51 -0000	1.6.2.12
@@ -23,5 +23,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_gradebook"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/websocket"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_tool_scratchie/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/build.xml,v
diff -u -r1.2 -r1.2.4.1
--- lams_tool_scratchie/build.xml	28 Aug 2012 15:22:19 -0000	1.2
+++ lams_tool_scratchie/build.xml	14 Apr 2016 12:19:51 -0000	1.2.4.1
@@ -2,5 +2,23 @@
 
 <project name="LAMS Tool Scratchie" basedir="."> 
 	<import file="../lams_build/build_tools_base.xml"/>
-
+	
+	<target name="_build-war" depends="_compile-java, _copy-websocket, build_base._build-war" />
+	
+	<!-- Add the websocket 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 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.
+	-->
+	<target name="_copy-websocket">
+		<echo>${ant.project.name}: Copying additional Java classes to WAR</echo>
+		<copy todir="${basedir}/build/war/assembly/WEB-INF/classes"
+			  file="${basedir}/build/classes/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.class"
+			  verbose="true"
+		/>
+	</target>
 </project>
\ No newline at end of file
Index: lams_tool_scratchie/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/xdoclet/struts-actions.xml,v
diff -u -r1.20.2.4 -r1.20.2.5
--- lams_tool_scratchie/conf/xdoclet/struts-actions.xml	8 Apr 2016 16:38:25 -0000	1.20.2.4
+++ lams_tool_scratchie/conf/xdoclet/struts-actions.xml	14 Apr 2016 12:19:51 -0000	1.20.2.5
@@ -167,19 +167,6 @@
 			<forward name="defineLater" path="/pages/learning/definelater.jsp" />
 			<forward name="submissionDeadline" path="/pages/learning/submissionDeadline.jsp" />			
 		</action>
-		<action path="/learning/refreshQuestionList"
-			type="org.lamsfoundation.lams.tool.scratchie.web.action.LearningAction"
-			parameter="refreshQuestionList" >
-			<forward name="success" path="/pages/learning/questionlist.jsp" />		
-		</action>
-		<action path="/learning/checkLeaderSubmittedNotebook"
-			type="org.lamsfoundation.lams.tool.scratchie.web.action.LearningAction"
-			parameter="checkLeaderSubmittedNotebook" >
-		</action>
-		<action path="/learning/isAnswerCorrect"
-			type="org.lamsfoundation.lams.tool.scratchie.web.action.LearningAction"
-			parameter="isAnswerCorrect" >
-		</action>
 		<action path="/learning/recordItemScratched"
 			type="org.lamsfoundation.lams.tool.scratchie.web.action.LearningAction"
 			parameter="recordItemScratched" >
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java,v
diff -u -r1.44.2.10 -r1.44.2.11
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	8 Apr 2016 16:38:25 -0000	1.44.2.10
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	14 Apr 2016 12:19:52 -0000	1.44.2.11
@@ -88,19 +88,13 @@
     @Override
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response)
-		    throws IOException, ServletException, JSONException, ScratchieApplicationException {
+	    throws IOException, ServletException, JSONException, ScratchieApplicationException {
 
 	String param = mapping.getParameter();
 	// -----------------------Scratchie Learner function ---------------------------
 	if (param.equals("start")) {
 	    return start(mapping, form, request, response);
 	}
-	if (param.equals("refreshQuestionList")) {
-	    return refreshQuestionList(mapping, form, request, response);
-	}
-	if (param.equals("checkLeaderSubmittedNotebook")) {
-	    return checkLeaderSubmittedNotebook(mapping, form, request, response);
-	}
 	if (param.equals("recordItemScratched")) {
 	    return recordItemScratched(mapping, form, request, response);
 	}
@@ -343,36 +337,6 @@
     }
 
     /**
-     * Refresh
-     * 
-     * @throws ScratchieApplicationException
-     */
-    private ActionForward refreshQuestionList(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws ScratchieApplicationException {
-	initializeScratchieService();
-	String sessionMapID = request.getParameter(ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap<String, Object> sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-
-	Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
-	ScratchieSession toolSession = LearningAction.service.getScratchieSessionBySessionId(toolSessionId);
-
-	// set scratched flag for display purpose
-	Collection<ScratchieItem> items = LearningAction.service.getItemsWithIndicatedScratches(toolSessionId);
-	sessionMap.put(ScratchieConstants.ATTR_ITEM_LIST, items);
-
-	// refresh leadership status
-	ScratchieUser user = this.getCurrentUser(toolSessionId);
-	boolean isUserLeader = toolSession.isUserGroupLeader(user.getUid());
-	sessionMap.put(ScratchieConstants.ATTR_IS_USER_LEADER, isUserLeader);
-
-	// refresh ScratchingFinished status
-	sessionMap.put(ScratchieConstants.ATTR_IS_SCRATCHING_FINISHED, toolSession.isScratchingFinished());
-
-	return mapping.findForward(ScratchieConstants.SUCCESS);
-    }
-
-    /**
      * Return whether leader still needs submit notebook.
      */
     private ActionForward checkLeaderSubmittedNotebook(ActionMapping mapping, ActionForm form,
@@ -477,9 +441,11 @@
      * @param response
      * @return
      * @throws ScratchieApplicationException
+     * @throws IOException
+     * @throws JSONException
      */
     private ActionForward showResults(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws ScratchieApplicationException {
+	    HttpServletResponse response) throws ScratchieApplicationException, JSONException, IOException {
 	initializeScratchieService();
 	// get back SessionMap
 	String sessionMapID = request.getParameter(ScratchieConstants.ATTR_SESSION_MAP_ID);
@@ -498,6 +464,8 @@
 	// see Next Activity button
 	if (toolSession.isUserGroupLeader(userUid) && !toolSession.isScratchingFinished()) {
 	    LearningAction.service.setScratchingFinished(toolSessionId);
+
+	    LearningWebsocketServer.sendCloseRequest(toolSessionId);
 	}
 
 	// get updated score from ScratchieSession
@@ -509,7 +477,8 @@
 	// display other groups' BurningQuestions
 	if (isBurningQuestionsEnabled) {
 	    Scratchie scratchie = toolSession.getScratchie();
-	    List<BurningQuestionItemDTO> burningQuestionItemDtos = LearningAction.service.getBurningQuestionDtos(scratchie, toolSessionId);
+	    List<BurningQuestionItemDTO> burningQuestionItemDtos = LearningAction.service
+		    .getBurningQuestionDtos(scratchie, toolSessionId);
 	    request.setAttribute(ScratchieConstants.ATTR_BURNING_QUESTION_ITEM_DTOS, burningQuestionItemDtos);
 	}
 
@@ -539,15 +508,16 @@
 
 	return mapping.findForward(ScratchieConstants.SUCCESS);
     }
-    
+
     /**
-     * @throws ServletException 
-     * @throws ScratchieApplicationException 
+     * @throws ServletException
+     * @throws ScratchieApplicationException
      */
     private synchronized ActionForward like(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, IOException, ServletException, ScratchieApplicationException {
+	    HttpServletResponse response)
+	    throws JSONException, IOException, ServletException, ScratchieApplicationException {
 	initializeScratchieService();
-	
+
 	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(sessionMapID);
@@ -570,15 +540,16 @@
 	response.getWriter().print(JSONObject);
 	return null;
     }
-    
+
     /**
-     * @throws ServletException 
-     * @throws ScratchieApplicationException 
+     * @throws ServletException
+     * @throws ScratchieApplicationException
      */
     private synchronized ActionForward removeLike(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, IOException, ServletException, ScratchieApplicationException {
+	    HttpServletResponse response)
+	    throws JSONException, IOException, ServletException, ScratchieApplicationException {
 	initializeScratchieService();
-	
+
 	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(sessionMapID);
@@ -713,11 +684,11 @@
 	ActionRedirect redirect;
 	if (scratchie.isReflectOnActivity() && !isNotebookSubmitted) {
 	    redirect = new ActionRedirect(mapping.findForwardConfig("newReflection"));
-	// show results page
+	    // show results page
 	} else {
 	    redirect = new ActionRedirect(mapping.findForwardConfig("showResults"));
 	}
-	
+
 	redirect.addParameter(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	return redirect;
     }
@@ -804,7 +775,7 @@
 	    LearningAction.service.updateEntry(entry);
 	}
 	sessionMap.put(ScratchieConstants.ATTR_REFLECTION_ENTRY, entryText);
-	
+
 	ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("showResults"));
 	redirect.addParameter(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	return redirect;
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/learning.jsp,v
diff -u -r1.18.2.5 -r1.18.2.6
--- lams_tool_scratchie/web/pages/learning/learning.jsp	7 Mar 2016 23:22:53 -0000	1.18.2.5
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	14 Apr 2016 12:19:51 -0000	1.18.2.6
@@ -35,12 +35,21 @@
 }
 </style>
 
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript">
+		function scratchImage(itemUid, answerUid, isCorrect) {
+			// first show animation, then put static image
+			var imageSuffix = isCorrect ? 'correct' : 'wrong';
+    		$('#image-' + itemUid + '-' + answerUid).load(function(){
+    			var image = $(this).off("load");
+    			// show static image after animation
+    			setTimeout(function(){
+    				image.attr("src", "<html:rewrite page='/includes/images/scratchie-" + imageSuffix + ".png'/>");
+    			}, 1300);
+    		}).attr("src", "<html:rewrite page='/includes/images/scratchie-" + imageSuffix + "-animation.gif'/>");
+		}
 
 		function scratchItem(itemUid, answerUid){
-			var id = '-' + itemUid + '-' + answerUid;
-			
 	        $.ajax({
 	            url: '<c:url value="/learning/recordItemScratched.do"/>',
 	            data: 'sessionMapID=${sessionMapID}&answerUid=' + answerUid,
@@ -51,19 +60,15 @@
 	            		return false;
 	            	}
 	            	
+	            	scratchImage(itemUid, answerUid, json.answerCorrect);
+	            	
 	            	if (json.answerCorrect) {
-	            		//show animation
-	            		$('#image' + id).attr("src", "<html:rewrite page='/includes/images/scratchie-correct-animation.gif'/>?reqID=" + (new Date()).getTime());
-	            		
 	            		//disable scratching
 	            		$("[id^=imageLink-" + itemUid + "]").removeAttr('onclick'); 
 	            		$("[id^=imageLink-" + itemUid + "]").css('cursor','default');
 	            		$("[id^=image-" + itemUid + "]").not("img[src*='scratchie-correct-animation.gif']").not("img[src*='scratchie-correct.gif']").fadeTo(1300, 0.3);
-
 	            	} else {
-	            		
-	            		//show animation, disable onclick
-	            		$('#image' + id).attr("src", "<html:rewrite page='/includes/images/scratchie-wrong-animation.gif'/>?reqID=" + (new Date()).getTime());
+	            		var id = '-' + itemUid + '-' + answerUid;
 	            		$('#imageLink' + id).removeAttr('onclick');
 	            		$('#imageLink' + id).css('cursor','default');
 	            	}
@@ -72,8 +77,8 @@
 		}
 
 		function finish(method){
-			var numberOfAvailableScratches = $("[id^=imageLink-][onclick]").length;
-			var	finishConfirmed = (numberOfAvailableScratches > 0) ? confirm("<fmt:message key="label.one.or.more.questions.not.completed"></fmt:message>") : true;
+			var numberOfAvailableScratches = $("[id^=imageLink-][onclick]").length,
+				finishConfirmed = (numberOfAvailableScratches > 0) ? confirm("<fmt:message key="label.one.or.more.questions.not.completed"></fmt:message>") : true;
 			
 			if (finishConfirmed) {
 				document.getElementById("finishButton").disabled = true;
@@ -83,26 +88,7 @@
 			}
 		}
 		
-		var refreshIntervalId = null;
-		if (${!isUserLeader && mode != "teacher"}) {
-			refreshIntervalId = setInterval("refreshQuestionList();",3000);// Auto-Refresh every 3 seconds
-		}
 		
-		function refreshQuestionList() {
-			var url = "<c:url value="/learning/refreshQuestionList.do"/>",
-				scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
-			$("#questionListArea").load(
-				url,
-				{
-					sessionMapID: "${sessionMapID}",
-					reqId: (new Date()).getTime()
-				},
-				function(){
-					$("html,body").scrollTop(scrollTop);
-				}
-			);
-		}
-		
     </script>
 </lams:head>
 <body class="stripes">
Index: lams_tool_scratchie/web/pages/learning/questionlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/questionlist.jsp,v
diff -u -r1.12.2.2 -r1.12.2.3
--- lams_tool_scratchie/web/pages/learning/questionlist.jsp	7 Mar 2016 23:22:53 -0000	1.12.2.2
+++ lams_tool_scratchie/web/pages/learning/questionlist.jsp	14 Apr 2016 12:19:51 -0000	1.12.2.3
@@ -15,45 +15,40 @@
 
 <!-- isUserLeader=${sessionMap.isUserLeader} -->
 
-<script type="text/javascript">
-
-	//stop refreshing non-leaders in case scratching is finished
-	if (${isScratchingFinished} && (refreshIntervalId != null)) {
-		clearInterval(refreshIntervalId);
-	}
-	
-	//hide finish button if isWaitingForLeaderToSubmitNotebook
+<c:if test="${not sessionMap.isUserLeader}">
+	<script type="text/javascript">
 	$(document).ready(function(){
-		if (${!isUserLeader && isWaitingForLeaderToSubmitNotebook}) {
+		// hide Finish button for non-leaders until leader finishes
+		if (${!isUserLeader && !isScratchingFinished}) {
 			$("#finishButton").hide();
 		}
 	});
 	
-	//query for leader status (only in case there is notebook at the end of activity and leader hasn't answered it yet)
-	var checkLeaderIntervalId = null;
-	if (${!isUserLeader && isScratchingFinished && isWaitingForLeaderToSubmitNotebook && mode != "teacher"}) {
-		checkLeaderIntervalId = setInterval("checkLeaderSubmittedNotebook();",2000);// ask for leader status every 20 seconds
-	}
 	
-	//check Leader Submitted Notebook and if true show finishButton
-	function checkLeaderSubmittedNotebook() {
-        $.ajax({
-            url: '<c:url value="/learning/checkLeaderSubmittedNotebook.do"/>',
-            data: 'sessionMapID=${sessionMapID}',
-            dataType: 'json',
-            type: 'post',
-            success: function (json) {
-            	if (!json.isWaitingForLeaderToSubmitNotebook) {
-            		if (checkLeaderIntervalId != null) {
-            			clearInterval(checkLeaderIntervalId);
-            		}
-					
-					$("#finishButton").show();
-            	}
-            }
-       	});
-	}
-</script>
+	//init the connection with server using server URL but with different protocol
+	var websocket = new WebSocket('<lams:WebAppURL />'.replace('http', 'ws') 
+					+ 'learningWebsocket?toolSessionID=' + ${toolSessionID});
+	
+	// run when the server pushes new reports and vote statistics
+	websocket.onmessage = function(e) {
+		// create JSON object
+		var input = JSON.parse(e.data);
+		
+		if (input.close) {
+			// leader finished the activity
+			$('#finishButton').show();
+			return;
+		}
+		
+		$.each(input, function(itemUid, answers) {
+			$.each(answers, function(answerUid, isCorrect){
+				// only updates come via websockets
+				scratchImage(itemUid, answerUid, isCorrect);
+			});
+		});
+	};
+	</script>
+</c:if>
 
 <c:forEach var="item" items="${sessionMap.itemList}" varStatus="status">
 	<div class="lead">
@@ -68,14 +63,16 @@
 			<tr id="tr${answer.uid}">
 				<td style="width: 40px;"><c:choose>
 						<c:when test="${answer.scratched && answer.correct}">
-							<img src="<html:rewrite page='/includes/images/scratchie-correct.png'/>" class="scartchie-image">
+							<img src="<html:rewrite page='/includes/images/scratchie-correct.png'/>" class="scartchie-image"
+								 id="image-${item.uid}-${answer.uid}">
 						</c:when>
 						<c:when test="${answer.scratched && !answer.correct}">
-							<img src="<html:rewrite page='/includes/images/scratchie-wrong.png'/>" id="image-${item.uid}-${answer.uid}"
-								class="scartchie-image">
+							<img src="<html:rewrite page='/includes/images/scratchie-wrong.png'/>" class="scartchie-image"
+								 id="image-${item.uid}-${answer.uid}">
 						</c:when>
 						<c:when test="${sessionMap.userFinished || item.unraveled || !isUserLeader || (mode == 'teacher')}">
-							<img src="<html:rewrite page='/includes/images/answer-${status.index + 1}.png'/>" class="scartchie-image">
+							<img src="<html:rewrite page='/includes/images/answer-${status.index + 1}.png'/>" class="scartchie-image"
+								 id="image-${item.uid}-${answer.uid}">
 						</c:when>
 						<c:otherwise>
 							<a href="#nogo" onclick="scratchItem(${item.uid}, ${answer.uid}); return false;"
@@ -140,13 +137,12 @@
 					<fmt:message key="label.continue" />
 				</html:button>
 			</c:when>
-			<c:when
-				test="${isUserLeader && (!sessionMap.isBurningQuestionsEnabled || !sessionMap.reflectOn) || !isUserLeader && isScratchingFinished}">
+			<c:otherwise>
 				<html:button property="finishButton" styleId="finishButton" onclick="return finish('showResults')"
 					styleClass="btn btn-default">
 					<fmt:message key="label.submit" />
 				</html:button>
-			</c:when>
+			</c:otherwise>
 		</c:choose>
 	</div>
 </c:if>
\ No newline at end of file