Index: lams_tool_assessment/build.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r998ba383ec2a06647d309f910ebefe0a33fa30a4
--- lams_tool_assessment/build.xml	(.../build.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_assessment/build.xml	(.../build.xml)	(revision 998ba383ec2a06647d309f910ebefe0a33fa30a4)
@@ -3,5 +3,23 @@
 <project name="LAMS Tool Assessment" 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/WEB-INF/classes"
+			  file="${basedir}/build/classes/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.class"
+			  verbose="true"
+		/>
+	</target>
 </project>
\ No newline at end of file