Index: lams_central/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/build.xml,v
diff -u -r1.60.2.11 -r1.60.2.12
--- lams_central/build.xml	27 Apr 2016 13:39:03 -0000	1.60.2.11
+++ lams_central/build.xml	4 May 2016 07:44:09 -0000	1.60.2.12
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/build.xml,v
diff -u -r1.34.2.1 -r1.34.2.2
--- lams_learning/build.xml	29 Jan 2016 08:41:39 -0000	1.34.2.1
+++ lams_learning/build.xml	4 May 2016 07:44:12 -0000	1.34.2.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/build.xml,v
diff -u -r1.34.2.1 -r1.34.2.2
--- lams_tool_chat/build.xml	22 Jan 2016 10:50:25 -0000	1.34.2.1
+++ lams_tool_chat/build.xml	4 May 2016 07:44:07 -0000	1.34.2.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/build.xml,v
diff -u -r1.2.4.1 -r1.2.4.2
--- lams_tool_scratchie/build.xml	14 Apr 2016 12:19:51 -0000	1.2.4.1
+++ lams_tool_scratchie/build.xml	4 May 2016 07:44:11 -0000	1.2.4.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/build.xml,v
diff -u -r1.22.2.1 -r1.22.2.2
--- lams_tool_scribe/build.xml	12 Apr 2016 12:04:02 -0000	1.22.2.1
+++ lams_tool_scribe/build.xml	4 May 2016 07:44:10 -0000	1.22.2.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_www/build.xml,v
diff -u -r1.12.2.4 -r1.12.2.5
--- lams_www/build.xml	28 Jan 2015 14:49:11 -0000	1.12.2.4
+++ lams_www/build.xml	4 May 2016 07:44:08 -0000	1.12.2.5
@@ -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 1.22.2.1 refers to a dead (removed) revision in file `lams_www/conf/lams/news.html'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.13.2.1 refers to a dead (removed) revision in file `lams_www/web/news.html'.
Fisheye: No comparison available.  Pass `N' to diff?