Index: lams_learning/build.xml
===================================================================
diff -u -re59bc835a5ec91886980d67af70c0f05a0f7ae73 -r9c603f82a3332d5e2e5b290bcc550f263c09a8f8
--- lams_learning/build.xml	(.../build.xml)	(revision e59bc835a5ec91886980d67af70c0f05a0f7ae73)
+++ lams_learning/build.xml	(.../build.xml)	(revision 9c603f82a3332d5e2e5b290bcc550f263c09a8f8)
@@ -3,5 +3,23 @@
 <project name="LAMS Learning" basedir="." default="print-usage">
 	
 	<import file="../lams_build/build_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/learning/presence/PresenceWebsocketServer.class"
+			  verbose="true"
+		/>
+	</target>
 </project>
\ No newline at end of file