Index: lams_central/build.xml
===================================================================
diff -u -r4187ab247c90254b64c8c96bf3d1fdde6e1688c2 -r3665dab7c4bd5cd4584c4348a7960722bede3d9a
--- lams_central/build.xml	(.../build.xml)	(revision 4187ab247c90254b64c8c96bf3d1fdde6e1688c2)
+++ lams_central/build.xml	(.../build.xml)	(revision 3665dab7c4bd5cd4584c4348a7960722bede3d9a)
@@ -17,7 +17,7 @@
 	
 	<target name="_copy-war-resources">
 		<!-- Internal target: Adds additional web content to WAR -->
-		<echo>${ant.project.name}: Copying favicon from conf to assembly</echo>
+		<echo>${ant.project.name}: Copying favicon</echo>
 		<copy todir="${basedir}/build/war">
 			<fileset dir="${conf.dir}/favicon/lams">
 				<include name="**/*.ico"/>
Index: lams_learning/build.xml
===================================================================
diff -u -r9c603f82a3332d5e2e5b290bcc550f263c09a8f8 -r3665dab7c4bd5cd4584c4348a7960722bede3d9a
--- lams_learning/build.xml	(.../build.xml)	(revision 9c603f82a3332d5e2e5b290bcc550f263c09a8f8)
+++ lams_learning/build.xml	(.../build.xml)	(revision 3665dab7c4bd5cd4584c4348a7960722bede3d9a)
@@ -17,7 +17,7 @@
 	-->
 	<target name="_copy-websocket">
 		<echo>${ant.project.name}: Copying additional Java classes to WAR</echo>
-		<copy todir="${basedir}/build/war/assembly/WEB-INF/classes"
+		<copy todir="${basedir}/build/war/WEB-INF/classes"
 			  file="${basedir}/build/classes/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.class"
 			  verbose="true"
 		/>
Index: lams_tool_chat/build.xml
===================================================================
diff -u -rab2b6923490ce38dc647ea66d6768966fbc40cfd -r3665dab7c4bd5cd4584c4348a7960722bede3d9a
--- lams_tool_chat/build.xml	(.../build.xml)	(revision ab2b6923490ce38dc647ea66d6768966fbc40cfd)
+++ lams_tool_chat/build.xml	(.../build.xml)	(revision 3665dab7c4bd5cd4584c4348a7960722bede3d9a)
@@ -17,7 +17,7 @@
 	-->
 	<target name="_copy-websocket">
 		<echo>${ant.project.name}: Copying additional Java classes to WAR</echo>
-		<copy todir="${basedir}/build/war/assembly/WEB-INF/classes"
+		<copy todir="${basedir}/build/war/WEB-INF/classes"
 			  file="${basedir}/build/classes/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.class"
 			  verbose="true"
 		/>
Index: lams_tool_scratchie/build.xml
===================================================================
diff -u -r63ff5aaa19e3fb53810266ade4fc2e9433c09d44 -r3665dab7c4bd5cd4584c4348a7960722bede3d9a
--- lams_tool_scratchie/build.xml	(.../build.xml)	(revision 63ff5aaa19e3fb53810266ade4fc2e9433c09d44)
+++ lams_tool_scratchie/build.xml	(.../build.xml)	(revision 3665dab7c4bd5cd4584c4348a7960722bede3d9a)
@@ -16,7 +16,7 @@
 	-->
 	<target name="_copy-websocket">
 		<echo>${ant.project.name}: Copying additional Java classes to WAR</echo>
-		<copy todir="${basedir}/build/war/assembly/WEB-INF/classes"
+		<copy todir="${basedir}/build/war/WEB-INF/classes"
 			  file="${basedir}/build/classes/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.class"
 			  verbose="true"
 		/>
Index: lams_tool_scribe/build.xml
===================================================================
diff -u -re1312708b95d2a0343c95cadbf03432d65c7657c -r3665dab7c4bd5cd4584c4348a7960722bede3d9a
--- lams_tool_scribe/build.xml	(.../build.xml)	(revision e1312708b95d2a0343c95cadbf03432d65c7657c)
+++ lams_tool_scribe/build.xml	(.../build.xml)	(revision 3665dab7c4bd5cd4584c4348a7960722bede3d9a)
@@ -17,7 +17,7 @@
 	-->
 	<target name="_copy-websocket">
 		<echo>${ant.project.name}: Copying additional Java classes to WAR</echo>
-		<copy todir="${basedir}/build/war/assembly/WEB-INF/classes"
+		<copy todir="${basedir}/build/war/WEB-INF/classes"
 			  file="${basedir}/build/classes/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.class"
 			  verbose="true"
 		/>
Index: lams_www/build.xml
===================================================================
diff -u -rd4997181b2a73dc16bdd0a69932d443fe7dbfbd7 -r3665dab7c4bd5cd4584c4348a7960722bede3d9a
--- lams_www/build.xml	(.../build.xml)	(revision d4997181b2a73dc16bdd0a69932d443fe7dbfbd7)
+++ lams_www/build.xml	(.../build.xml)	(revision 3665dab7c4bd5cd4584c4348a7960722bede3d9a)
@@ -5,43 +5,6 @@
 	<import file="../lams_build/build_base.xml"/> 
 
 	<!-- Below are Tool specifc targets and targets overriding ones from the imported base file. -->
-	<target name="_copy-war-resources">
-		<!-- Internal target: Adds additional web content to WAR -->
-		<echo>${ant.project.name}: Copying additional resources for WAR</echo>
-	 	<copy todir="${basedir}/build/war/WEB-INF">
-			<fileset dir="${conf.web.dir}/WEB-INF">
-				<include name="*.xml"/>
-			</fileset>
-	 	</copy>
-			
-		<copy todir="${basedir}/build/war/assembly/images">
-			<fileset dir="${conf.dir}/lams">
-				<include name="*.swf" />
-			</fileset>
-		</copy>
-		
-		<copy todir="${basedir}/build/war/assembly">
-			<fileset dir="${conf.dir}/lams">
-				<include name="news.html" />
-			</fileset>
-		</copy>
-	</target>
-		
-		
-	<target name="_build-war"
-			depends="_clean-dirs, _build-manifest, _copy-war-resources, _copy-jsp">
-		<!-- Internal target: Creates WAR file. -->	
-		<echo>${ant.project.name}: Building WAR</echo>
-		<war warfile="${basedir}/build/lib/${product}.war" 
-  		     webxml="${basedir}/build/war/WEB-INF/web.xml"
-			 manifest="${basedir}/build/MANIFEST.MF">
-			<fileset dir="${basedir}/build/war/assembly">
-				<include name="**" />
-			</fileset>
-		</war>
-	</target>
-	
-
 	<target name="deploy-jar" depends="_target-not-available" description="Deploys JAR." />
 	
 	
Fisheye: Tag 3665dab7c4bd5cd4584c4348a7960722bede3d9a refers to a dead (removed) revision in file `lams_www/conf/lams/news.html'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_www/web/help/troubleshoot-en_AU.pdf
===================================================================
diff -u -r3b133c36e3227bcb6211ee7e0291157458263056 -r3665dab7c4bd5cd4584c4348a7960722bede3d9a
Binary files differ
Index: lams_www/web/help/troubleshoot-no_NO.pdf
===================================================================
diff -u -r1061805eff945d679500b7a6c0f79d380206e312 -r3665dab7c4bd5cd4584c4348a7960722bede3d9a
Binary files differ
Fisheye: Tag 392a4de0b4e902975c3baf7e04593dd59f3f9c90 refers to a dead (removed) revision in file `lams_www/web/news.html'.
Fisheye: No comparison available.  Pass `N' to diff?