Index: lams_tool_sbmt/build.xml
===================================================================
diff -u -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a -rabdf9946aeebf29e02201d85263e022cb3bec7b4
--- lams_tool_sbmt/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
+++ lams_tool_sbmt/build.xml	(.../build.xml)	(revision abdf9946aeebf29e02201d85263e022cb3bec7b4)
@@ -243,30 +243,14 @@
 	   <!-- Make the WAR archive for deployment				 -->
 	   <!-- ================================================ -->	
 		
-	   <target name="build-war" depends="webdoclet,build-jar" description="creates war file">
+	   <target name="build-war" depends="webdoclet,build-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"/>
-	   				<exclude name="classes/**"/>
-	   				
-	   			</webinf>
-	   			<!-- front end programs like HTML, JSP, CSS etc. -->
-	   			<fileset dir="${conf.web.dir}">
-						<include name="**/*.jsp"/>
-						<include name="**/*.html"/>
-						<include name="**/*.swf"/>
-	   					<include name="**/*.gif"/>
-						<include name="includes/**"/>
-	   					<include name="author_page/**"/>
+			<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>
-	   			
-	   	   </war>
-	   	
+			</war>
 	   </target>
 	
 	   <target name="copy-tags" depends="" description="copy the lams.tld and the lams tags">
@@ -558,14 +542,123 @@
 		<fail message="Tests failed. Check log and/or reports" if="test.failed"/>
 	</target>
 	
-	   <!-- =================================  -->
-	   <!--       target: convert UTF-8 language files to Java properties files using native2ascii -->
-	   <!-- ================================= -->
-	    <target name="native2ascii" 
-	    	description="convert UTF-8 language files to Java properties files using native2ascii">
-			<native2ascii encoding="UTF-8" src="${conf.language.dir}" dest="${conf.language.dir}"
-			   includes="*.txt" ext=".properties"/>
-	    </target>
+   <!-- =================================  -->
+   <!--       target: convert UTF-8 language files to Java properties files using native2ascii -->
+   <!-- ================================= -->
+    <target name="native2ascii" 
+    	description="convert UTF-8 language files to Java properties files using native2ascii">
+		<native2ascii encoding="UTF-8" src="${conf.language.dir}" dest="${conf.language.dir}"
+		   includes="*.txt" ext=".properties"/>
+    </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