Index: lams_tool_lamc/build.xml
===================================================================
diff -u -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a -ra17da6285a66f305ec5fc110f879378bfa9e3b29
--- lams_tool_lamc/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
+++ lams_tool_lamc/build.xml	(.../build.xml)	(revision a17da6285a66f305ec5fc110f879378bfa9e3b29)
@@ -22,6 +22,10 @@
 		<!-- This property is supposed to be set in eclipse  -->
 		<pathelement location="${java.class.path}"/>
 	</path>
+	<path id="schemaexport.classpath">
+		<path refid="project.classpath"/>
+		<pathelement location="${build.classes.java}"/>
+	</path>
 	
 	<target name="usage">
 			<echo message=""/>
@@ -115,7 +119,7 @@
 		<!-- ================================================================ -->
 		
 		<target name="clean" description="removes all class files">
-			<delete dir="${build}"/>
+			<delete dir="${build}" quiet="false"/>
 			<mkdir dir="${build}"/>
 			<mkdir dir="${build.classes.java}"/>
 			<mkdir dir="${build.classes.test}"/>
@@ -215,44 +219,14 @@
 	   <!-- Make the WAR archive for deployment				 -->
 	   <!-- ================================================ -->	
 		
-	   <target name="lams-lamc11-war" depends="lams-lamc11-jar" description="creates war file">
+	   <target name="lams-lamc11-war" depends="lams-lamc11-jar,jsp-plaincopy,jsp-precompile" description="creates war file">
 	   		<delete file="${build.lib}/${product}.war"/>	
-	   		<war warfile="${build.lib}/${product}.war" manifest="${conf.dir}/war/META-INF/MANIFEST.MF"
-	   			 webxml="${conf.webinf.dir}/web.xml">
-	   			
-	   			<webinf dir="${conf.webinf.dir}">
-	   				<include name=".xml"/>
-	   				<include name="**/*.*"/>
-	   				<exclude name="web.xml"/>
-	   			</webinf>
-
-	   			<!-- <classes dir="${build.classes.java}"/>	 -->
-	   			
-	   			<fileset dir="${conf.web.dir}">
-						<include name="*"/>
-						<include name="authoring/*"/>
-						<include name="common/*"/>
-						<include name="includes/*"/>
-						<include name="layout/*"/>							
-						<include name="learning/**"/>
-						<include name="export/*"/>
-						<include name="css/*"/>	   					   				
-						<include name="includes/*"/>	   					   				
-		   				<include name="monitoring/*"/>
-	   					<include name="images/**"/>
-		   				<include name="css/**"/>
+			<war warfile="${build.lib}/${product}.war" 
+	  				webxml="${build.war}/WEB-INF/web.xml" manifest="${conf.dir}/war/META-INF/MANIFEST.MF">
+				<fileset dir="${build.war.assembly}">
+					<include name="**" />
 				</fileset>
-				<!--
-	   			<fileset dir="${conf.includes.dir}">
-						<include name="*"/>
-				</fileset>
-	   			<fileset dir="${conf.template.dir}">
-						<include name="*"/>
-				</fileset>
-				-->
-
-	   	   </war>
-	   	
+			</war>
 	   </target>
 	
 		<!-- =================================================================== -->
@@ -539,4 +513,114 @@
 		</delete>
 	</target>
 	
+	<!-- Runs if jsp.precompile setting is set in lams_build/common.properties -->
+	<target name="jsp-precompile" if="jsp.precompile">
+		<!-- Work on a copy of web files, not originals-->
+		<echo>Copying web files</echo>
+		<delete dir="${build.war}" quiet="false"/>
+	 	<copy overwrite="yes" todir="${build.war}">
+			<fileset dir="${conf.web.dir}">
+				<include name="**"/>
+				<exclude name="WEB-INF/classes"/>
+			</fileset>
+	 	</copy>
+		
+		<!-- Define JSP compiler -->
+		<path id="jsp.precompile.classpath">
+			<path refid="schemaexport.classpath"/>
+			<fileset dir="${jboss.home}/lib">
+				<include name="jboss-common-core.jar" />
+				<include name="jboss-logging-spi.jar" />
+			</fileset>
+			<fileset dir="${jboss.ear.deployers}/jbossweb.deployer">
+				<include name="*.jar" />
+			</fileset>
+	        <fileset dir="${jboss.ear.deploy}/jbossweb.sar">
+	            <include name="jbossweb.jar" />
+	        </fileset>
+		</path>
+		<taskdef classname="org.apache.jasper.JspC" name="jasper2" classpathref="jsp.precompile.classpath" />
+		
+		<!-- Generate Java files and put servlet mappings in web.xml file -->
+		<echo>Generating Java source from JSP pages</echo>
+		<jasper2 uriroot="${build.war}"
+			webXmlFragment="${build.war}/WEB-INF/generated_web.xml"
+			outputDir="${build.war}/WEB-INF/src"
+			package="${jsp.java.src.package}"
+			addWebXmlMappings="true" validateXml="false" failOnError="true"
+		/>
+		
+		<!-- Compile main Java source as some JSPs refer to it
+		Uncomment if you get "class not found" errors when precompiling JSPs
+		<antcall target="compile-java"/>
+		-->
+		
+		<!-- Compile Java files generated from JSPs -->
+		<echo>Compiling JSP classes</echo>
+		
+		<!-- Make src folder if it does not exist i.e. no JSPs were compiled in previous step -->
+		<mkdir dir="${build.war}/WEB-INF/src"/>
+		<mkdir dir="${build.war}/WEB-INF/classes"/>
+	    <javac destdir="${build.war}/WEB-INF/classes"
+	           optimize="on"
+	           debug="off" failonerror="true"
+	           srcdir="${build.war}/WEB-INF/src" 
+		  	   excludes="**/*.smap"
+	    	   classpathref="jsp.precompile.classpath">
+	      <include name="**" />
+	      <exclude name="tags/**" />
+	    </javac>
+		
+		<!-- Prepare files for WAR, exclude plain JSP and tags -->
+		<echo>Copying web resources</echo>
+		<copy todir="${build.war.assembly}">	
+			<fileset dir="${build.war}">
+				<include name="images/**"/>
+				<include name="includes/**"/>
+				<include name="WEB-INF/classes/**"/>
+				<include name="WEB-INF/struts/**"/>
+				<include name="WEB-INF/*.xml"/>
+				<exclude name="WEB-INF/web.xml"/>
+				<exclude name="**/*.jsp"/>
+				<exclude name="**/*.tag"/>
+				<exclude name="**/*.tld"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+		</copy>
+		
+	 	<copy todir="${build.war.assembly}/WEB-INF/lib" flatten="true" failonerror="false">
+			<fileset dir="${basedir}/lib">
+				<include name="**/*"/>
+			</fileset>
+	 	</copy>
+	</target>
+					
+	<!-- Runs if jsp.precompile setting is NOT set in lams_build/common.properties 
+		 JSPs will be compiled at runtime, which is default behaviour allowing hotdeploy -->
+	<target name="jsp-plaincopy" unless="jsp.precompile">
+		<delete dir="${build.war}" quiet="false"/>
+		
+		<echo>Copying web resources</echo>
+	 	<copy todir="${build.war}">
+			<fileset dir="${conf.web.dir}">
+				<include name="WEB-INF/web.xml"/>
+			</fileset>
+	 	</copy>
+		
+	 	<copy todir="${build.war.assembly}">
+			<fileset dir="${conf.web.dir}">
+				<include name="**"/>
+				<exclude name="WEB-INF/web.xml"/>
+				<exclude name="WEB-INF/classes"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+	 	</copy>
+		
+	 	<copy todir="${build.war.assembly}/WEB-INF/lib" flatten="true" failonerror="false">
+			<fileset dir="${basedir}/lib">
+				<include name="**/*"/>
+			</fileset>
+	 	</copy>
+	</target>
+	
 </project>
\ No newline at end of file