Index: lams_learning/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/build.xml,v
diff -u -r1.34 -r1.34.2.1
--- lams_learning/build.xml	12 Dec 2012 13:50:42 -0000	1.34
+++ lams_learning/build.xml	29 Jan 2016 08:41:39 -0000	1.34.2.1
@@ -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