Index: lams_tool_lamc/build.xml
===================================================================
diff -u -rdd15f96df8be3df52c2db90d04fc5db961ac088b -rd56929f06ad90a63082d514e6521adc175f3de27
--- lams_tool_lamc/build.xml	(.../build.xml)	(revision dd15f96df8be3df52c2db90d04fc5db961ac088b)
+++ lams_tool_lamc/build.xml	(.../build.xml)	(revision d56929f06ad90a63082d514e6521adc175f3de27)
@@ -1,618 +1,48 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
-<project name="lams_tool_lamc11" basedir="." default="usage">
-
-	<!-- import properties from the specified file -->
-	<property file="build.properties"/>
-	<property file="../lams_build/common.properties"/>
-	<property file="../lams_build/${osPropertiesName}.properties" />
-		
-	<path id="all-libs">
-			<fileset dir="${sharedlib}">
-				<include name="**/*.jar"/>
-			</fileset>
-			<fileset dir="${j2eelibs}">
-					<include name="**/*.jar"/>
-			</fileset>
-	</path>
-		
-	<path id="project.classpath">
-		<path refid="all-libs"/>
-		<!-- Java CLASSPATH should be added as the last item -->
-		<!-- This property is supposed to be set in eclipse  -->
-		<pathelement location="${java.class.path}"/>
-	</path>
+<project name="LAMS Tool Multiple Choice" basedir="."> 
+	<import file="../lams_build/build_tools_base.xml"/>
 	
-	<target name="usage">
-			<echo message=""/>
-			<echo message="${project} build file"/>
-			<echo message="------------------------------------------------------"/>
-			<echo message=""/>
-			<echo message="Among the available targets are:"/>
-			<echo message=""/>
-	</target>
-	
-	<target name="init">
-			<available property="xdoclet-jars-installed" file="${sharedlib}/xdoclet/xdoclet-${xdoclet.version}.jar"/>
-	</target>
-	<!-- =================================================================== -->
-	<!-- Fails if XDoclet 1.2.x is not on classpath                          -->
-	<!-- =================================================================== -->
-	<target name="fail-if-no-xdoclet-1.2.x" unless="xdoclet-jars-installed">
-		<fail>
-	      You must download several jar files before you can build Middlegen.
-	      Execute the "download-deps" target. Then try to build again.
-
-	      If you are behind a proxy, you should define the properties
-	      http.proxyHost and http.proxyPort. Example:
-		      
-	      ant -Dhttp.proxyHost=foo.com -Dhttp.proxyPort=8080
-		      
-	      It's also possible to download the jars manually.
-	     </fail>
-		</target>
-
-		<target name="check-driver-present">
-			<available file="${db.driver.dir}" type="dir" property="driver.present"/>
-		</target>
-		<target name="panic-if-driver-not-present" unless="driver.present">
-			<fail>
-		      The JDBC driver you have specified by including one of the files in ${basedir}/config/database
-		      doesn't exist. You have to download this driver separately and put it in ${db.driver.dir}
-		      Please make sure you're using a version that is equal or superior to the one we looked for.
-		      If you name the driver jar file differently, please update the db.driver.dir property
-		      in the ${basedir}/config/database/xxx.xml file accordingly.
-		     </fail>
-	   </target>
-	<!-- =================================================================== -->
-	<!-- Run Middlegen For LearningDesign                                                       -->
-	<!-- =================================================================== -->
-		<target name="middlegen" description="Run Middlegen For MCQ Tool" unless="middlegen.skip" depends="init,fail-if-no-xdoclet-1.2.x,check-driver-present,panic-if-driver-not-present">
-			<taskdef name="middlegen" classname="middlegen.MiddlegenTask" classpathref="all-libs" />
-			
-			<middlegen appname="lams_tool_lamc11" 
-					   prefsdir="${conf.middlegen.dir}"
-					   gui="${middlegen.gui}"
-					   databaseurl="${db.url.build}"
-					   driver="${db.driver}"
-					   username="${db.username}"
-					   password="${db.password}"
-					   includeViews="false"
-			>
-
-				<hibernate destination="${conf.hibernate.mapping.dir}"
-						   package="${lamc11.package}" 
-						   genXDocletTags="true"
-						   javaTypeMapper="middlegen.plugins.hibernate.HibernateJavaTypeMapper"
-				/>
-				
-				<table name="tl_lasbmt11_content"/>
-				<table name="tl_lasbmt11_report"/>
-				<table name="tl_lasbmt11_session"/>
-				<table name="tl_lasbmt11_submission_details"/>
-			</middlegen>
-
-		</target>
-
-		<!-- =================================================================== -->
-		<!-- Run hbm2java for learningdesign                                                       -->
-		<!-- =================================================================== -->
-		<target name="hbm2java" description="Generate .java from .hbm files.">
-			<taskdef  name="hbm2java"
-	         classname="net.sf.hibernate.tool.hbm2java.Hbm2JavaTask"
-	         classpathref="all-libs"
-	      />
+	<!-- This does not seem to work at all, but leave it for future reference -->
+	<target name="test-report" depends="_compile-test, _build-hbm"
+		    description="Tool custom test suite."> 
+		<copy file="${conf.webinf.dir}/web.xml" todir="${testwebinf}" overwrite="true"/>		
+		<copy file="${conf.webinf.dir}/struts-config.xml" todir="${testwebinf}" overwrite="true"/>			
+		<copy file="${conf.webinf.dir}/tiles-defs.xml" todir="${testwebinf}" overwrite="true"/>			
+		<copy overwrite="yes" todir="${build.classes.test}/org/lamsfoundation/lams/tool/mc/">
+						<fileset dir="${src.test.dir}/org/lamsfoundation/lams/tool/mc/">
+								<include name="*.xml"/>
+								<include name="*.properties"/>
+			   				    <exclude name="web.xml"/>
+						</fileset>
+		</copy>						
 		
-		  <hbm2java output="${src.java.dir}">
-				<fileset dir="${conf.hibernate.mapping.dir}/${lamc11.path}">
-					<include name="*.hbm.xml"/>
+		<junit printsummary="yes"
+		       haltonerror="no"
+			   haltonfailure="no"
+			   fork="yes">
+			<formatter type="plain" usefile="false"/>
+			<formatter type="xml"/>
+			<batchtest todir="${build.report}">
+				<fileset dir="${src.test.dir}">
+					<include name="**/TestMcContent.java"/>
 				</fileset>
-			</hbm2java>
-		</target>
-	
-		<!-- ================================================================ -->
-		<!-- Preparations									                  -->
-		<!-- ================================================================ -->
+			</batchtest>
+			<classpath>
+				<pathelement location="${build.classes.test}"/>
+				<pathelement location="${testweb}"/>
+				<path refid="logging.classpath"/>	
+				<path refid="project.classes.classpath" />
+			</classpath>
+		</junit>
 		
-		<target name="clean" description="removes all class files">
-			<delete dir="${build}" quiet="false"/>
-			<mkdir dir="${build}"/>
-			<mkdir dir="${build.classes.java}"/>
-			<mkdir dir="${build.classes.test}"/>
-			<mkdir dir="${build.report}"/>
-			<mkdir dir="${build.lib}"/>
-			<mkdir dir="${build.deploy}"/>
-		</target>
-
-		<target name="compile" depends="clean" description="compile java sources">
-			<javac srcdir="${src.java.dir}" compiler="modern"
-		         	 	destdir="${build.classes.java}" deprecation="on" debug="on">
-				<classpath>					
-					<path refid="project.classpath"/>
-				</classpath>
-				</javac>
-				<copy overwrite="yes" todir="${build.classes.java}/org/lamsfoundation/lams/tool/mc/">
-								<fileset dir="${src.java.dir}/org/lamsfoundation/lams/tool/mc/">
-										<include name="*.xml"/>
-										<include name="*.properties"/>
-					   				    <exclude name="web.xml"/>
-										<!-- Autopatch -->
-										<include name="dbupdates/autopatchContext.xml"/>
-										<include name="dbupdates/*.sql"/>
-								</fileset>
-				</copy>						
-		</target>
-
-		<target name="compile.test" depends="compile">
-			<javac srcdir="${src.test.dir}" destdir="${build.classes.test}" compiler="modern">
-				<classpath>
-					<pathelement location="${build.classes.java}"/>
-					<path refid="project.classpath"/>
-				</classpath>
-			</javac>
-		</target>
-		
-		<target name="copyContext" description="copies the applicationContext.xml files to the web directory">
-			<copy overwrite="yes" todir="${build.web}">
-				<fileset dir="${conf.web.dir}">
-					<include name="**/*.xml"/>
-					<include name="**/*.tld"/>
-					<include name="**/*.jsp"/>
-					<include name="**/*.properties"/>
-				</fileset>
-				</copy>
-		<!--
-			<copy overwrite="yes" todir="${build.web.includes}">	
-					<fileset dir="${conf.includes.dir}">
-						<include name="**/*.jsp"/>
-					</fileset>
-				</copy>
-				<copy overwrite="yes" todir="${build.web.template}">	
-					<fileset dir="${conf.template.dir}">
-						<include name="**/*.jsp"/>
-					</fileset>
-				</copy>
-		-->
-		</target>
-	
-		<!-- ================================================================ -->
-		<!-- Make jar archive for deployment        		    	          -->
-		<!-- ================================================================ -->
-		<target name="lams-lamc11-jar" depends="compile,compile.test,copyContext" description="creates jar file">
-			<delete file="${build.lib}/${product}.jar"/>
-			<jar jarfile="${build.lib}/${product}.jar" manifest="${conf.dir}/jar/META-INF/MANIFEST.MF">
-				<fileset dir="${build.classes.java}"/>
-				<fileset dir="${conf.hibernate.mapping.dir}"/>
-			</jar>
-		</target>
-	
-	   <!-- =================================================================== -->
-	   <!-- Run xdoclet			                                                -->
-	   <!-- =================================================================== -->
-	   	<taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask">
-		    <classpath refid="all-libs"/>
-		</taskdef>
-		
-		<target name="webdoclet" depends="clean">
-			<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
-
-	         <fileset dir="${src.java.dir}">
-	            <include name="**/*Action.java" />
-	            <include name="**/*Form.java" />
-	         </fileset>
-
-	         <deploymentdescriptor servletspec="2.3" destdir="${conf.webinf.dir}"
-				mergedir="${conf.xdoclet.dir}" sessiontimeout="${sessiontimeout}"/>
-				
-	      <!--   <strutsconfigxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.2" /> -->
-	      </webdoclet>
-	   </target>
-	
-	   <!-- ================================================ -->
-	   <!-- Make the WAR archive for deployment				 -->
-	   <!-- ================================================ -->	
-		
-	   <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" 
-	  				webxml="${build.war}/WEB-INF/web.xml" manifest="${conf.dir}/war/META-INF/MANIFEST.MF">
-				<fileset dir="${build.war.assembly}">
-					<include name="**" />
-				</fileset>
-			</war>
-	   </target>
-	
-		<!-- =================================================================== -->
-		<!-- Deploy the jar only                                                 -->
-		<!-- =================================================================== -->
-			<target name="deploy-jar" depends="lams-lamc11-jar" description="Deploy the MCQ tool jar file">
-			<delete quiet="true">
-				<fileset dir="${jboss.deploy}/tmp"/>
-				<fileset dir="${jboss.deploy}/work"/>
-			</delete>
-			<copy file="${build.lib}/${product}.jar"
-					todir="${jboss.deploy}"/> 
-		</target>
-
-		<!-- =================================================================== -->
-		<!-- Deploy the jar and war                               -->
-		<!-- =================================================================== -->
-			<target name="deploy-war" depends="lams-lamc11-war" description="Deploy the MCQ tool war file and jar file">
-			<delete quiet="true">
-				<fileset dir="${jboss.deploy}/tmp"/>
-				<fileset dir="${jboss.deploy}/work"/>
-			</delete>
-			<copy file="${build.lib}/${product}.jar"
-					todir="${jboss.deploy}"/> 
-			<copy file="${build.lib}/${product}.war"
-					todir="${jboss.deploy}"/> 
-		</target>
-	
-		<!-- =================================================================== -->
-		<!-- Clean and rebuild the database. 									 -->
-		<!-- =================================================================== -->
-		<target name="rebuild-db"
-			description="rebuild MCQ tables">
-			<sql driver="${db.driver}" url="${db.url.build}" userid="${db.username}"
-					password="${db.password}"  encoding="${db.encoding}">
-				<classpath>
-					<fileset dir="${db.driver.dir}" includes="*.jar"/> 
-				</classpath>
-				<transaction src="${db.scripts}/drop_lams_tool_mc.sql"/>
-				<transaction src="${db.scripts}/create_lams_tool_mc.sql"/>
-				<transaction src="${db.scripts}/insert_tool_mc_data.sql"/>
-			</sql>
-		</target>
-
-		<!-- =================================================================== -->
-		<!-- Clean tool database. 									 -->
-		<!-- =================================================================== -->
-		<target name="clean-tool-db"
-			description="rebuild Mc tables">
-			<sql driver="${db.driver}" url="${db.url.build}" userid="${db.username}"
-					password="${db.password}"  encoding="${db.encoding}">
-				<classpath>
-					<fileset dir="${db.driver.dir}" includes="*.jar"/> 
-				</classpath>
-				<transaction src="${db.scripts}/drop_lams_tool_mc.sql"/>
-			</sql>
-		</target>
-
-	
-		<!-- =================================================================== -->
-		<!-- Generate the deploy package                                         -->
-		<!-- =================================================================== -->
-		<target name="create-deploy-package" depends="lams-lamc11-war" 
-			description="Generate the deployment package.">
-
-			<path id="deploy.lib.classpath">
-				<fileset dir="${deploy.tool.dir}">
-					<include name="lib/*.jar" />
-				</fileset>
-				<fileset dir="${sharedlib}">
-					<include name="**/*.jar" />
-				</fileset>
-			</path>
-				  
-			<mkdir dir="${build.deploy}"/>
-			
-			<mkdir dir="${build.deploy}/sql"/> 
-			<mkdir dir="${build.deploy}/language"/>
-			 
-			<copy overwrite="yes" todir="${build.deploy}/sql">
-				<fileset dir="${db.scripts}/">
-					<include name="drop_lams_tool_mc.sql"/>
-					<include name="create_lams_tool_mc.sql"/>
-					<include name="activity_insert.sql"/>
-					<include name="library_insert.sql"/>
-				</fileset>
-			</copy>
-			
-			<copy overwrite="yes" todir="${build.deploy}/sql">
-				<fileset dir="${db.scripts}/">
-					<include name="tool_insert.sql" />
-				</fileset>	
-				<filterset>
-					<filter token="tool_version" value="${tool.version}" />
-				</filterset>
-			</copy>
-			
-			<copy overwrite="yes" todir="${build.deploy}/sql">
-				<fileset dir="${db.scripts}/">
-					<include name="db_version_insert.sql" />
-				</fileset>	
-				<filterset>
-					<filter token="tool_version" value="${tool.version}" />
-					<filter token="signature" value="${signature}" />
-				</filterset>
-			</copy>
-			
-			<copy overwrite="yes" todir="${build.deploy}/sql/updatescripts" failonerror="false">
-				<fileset dir="${db.scripts}/updatescripts/">
-					<include name="*.sql" />
-				</fileset>
-			</copy>
-
-			<copy overwrite="yes" todir="${build.deploy}/">
-				<fileset dir="${deploy.tool.dir}">
-					<include name="*.*"/>
-				</fileset>
-			</copy>
-
-			<copy overwrite="yes" todir="${build.deploy}/language">
-				<fileset dir="${conf.language.dir}">
-					<include name="*.properties"/>
-				</fileset>
-			</copy>
-			
-			<copy overwrite="true" todir="${build.deploy}">
-					<fileset dir="${build.lib}">
-						<include name="*.jar"/>
-						<include name="*.war"/>
-					</fileset>
-			</copy>
-
-			<taskdef name="generateDeployProperties" 
-				classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
-			    <classpath refid="deploy.lib.classpath"/>
-			</taskdef>
-
-			<generateDeployProperties depends="compile" 
-				mode="development" 
-				outputPath="${build.deploy}"
-				generateForInstallers="${generate.for.installers}"
-				dbPassword="${db.password}"
-				dbUsername="${db.username}"
-				dbDriverUrl="${db.url.build}"
-				dbDriverClass="com.mysql.jdbc.Driver"
-				deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
-				toolJarFileName="${product}.jar"
-				toolSignature="${signature}"
-				toolVersion="${tool.version}"
-				hideTool="${hideTool}"
-				minServerVersionNumber="${min.server.version.number}"
-				toolUpdateScriptPath="${build.deploy}/sql/updatescripts/updateTo${tool.version}.sql"
-				toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_mc.sql" 
-				toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_mc.sql" 
-				toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql" 
-				toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql" 
-				toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql" 
-				toolDBVersionScriptPath="${build.deploy}/sql/db_version_insert.sql"
-				toolApplicationContextPath="/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml"
-				lamsEarPath="${jboss.deploy}"
-				toolContext="${toolContext}"
-				toolWebUri="${product}.war"
-				languageFilesPackage="org.lamsfoundation.lams.tool.mc">
-
-				<!-- language files go as a fileset. Not nice but can't work out how to embed them in a tag. -->
-				<fileset dir="${build.deploy}/language">
-					<include name="**/*.properties"/>
-					<include name="**/*.txt"/>
-				</fileset>
-					
-			</generateDeployProperties>
-		</target>
-	
-		<target name="run-deploy-package" description="Run the deploy tool.">
-					<path id="deploy.classpath">
-						<fileset dir="${deploy.tool.dir}/lib">
-							<include name="*.jar" />
-						</fileset>
-						<fileset dir="${sharedlib}">
-							<include name="**/*.jar" />
-						</fileset>
-					</path>
-
-			<echo>Deploying the MCQ tool</echo>
-	
-			<java
-				classname="org.lamsfoundation.lams.tool.deploy.Deploy"
-				classpathref="deploy.classpath"
-				fork="true">
-					<arg file="${build.deploy}/deploy.xml"/>
-					<arg value="True"/> 
-			</java>
-						
-		</target>
-	
-		<target name="deploy-tool" depends="create-deploy-package, run-deploy-package" 
-	   		description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
-		</target>
-	
-			<target name="test-report" depends="compile.test"> 
-				<mkdir dir="${build.report}"/>
-				<copy file="${conf.webinf.dir}/web.xml" todir="${testwebinf}" overwrite="true"/>		
-				<copy file="${conf.webinf.dir}/struts/struts-config.xml" todir="${testwebinf}" overwrite="true"/>			
-				<copy file="${conf.webinf.dir}/tiles/tiles-defs.xml" todir="${testwebinf}/tiles" overwrite="true"/>			
-				<copy overwrite="yes" todir="${build.classes.test}/org/lamsfoundation/lams/tool/mc/">
-								<fileset dir="${src.test.dir}/org/lamsfoundation/lams/tool/mc/">
-										<include name="*.xml"/>
-										<include name="*.properties"/>
-					   				    <exclude name="web.xml"/>
-								</fileset>
-				</copy>						
-				<junit printsummary="yes" haltonerror="no" haltonfailure="no"
-					   fork="yes">
-					<formatter type="plain" usefile="false"/>
-					<formatter type="xml"/>
-					<batchtest todir="${build.report}">
-						<fileset dir="${src.test.dir}">
-							<include name="**/TestMcContent.java"/>
-
-						</fileset>
-					</batchtest>
-					<classpath>
-						<pathelement location="${build.classes.java}"/>
-						<pathelement location="${build.classes.test}"/>
-						<pathelement location="${hbm}"/>
-						<pathelement location="${web}"/>
-						<pathelement location="${webinf.spring}"/>
-						<pathelement location="${testweb}"/>
-						<path refid="project.classpath"/>
-					</classpath>
-				</junit>
-				
-				<junitreport todir="${build.report}"> 
-					<fileset dir="${build.report}">
-						<include name="TEST-*.xml"/>
-					</fileset>
-					<report todir="${build.report}/html"/> 
-				</junitreport>
-
-			</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: synchronize-jsp              
-	         ================================= -->
-	    <target name="synchronize-deploy" description="copy non-java file into deploy folder">
-	        <copy verbose="yes" todir="${jboss.deploy}/${product}.war">
-	        	<fileset dir="${conf.web.dir}">
-	        		<include name="**/*.*"/>
-	        	</fileset>
-	        </copy>
-	    </target>
-
-	   <target name="copy-tags" depends="" description="copy the lams.tld and the lams tags">
-	   		<copy todir="${conf.webinf.dir}" overwrite="yes" file="${tag.web.dir}/lams.tld" />	
-			<copy todir="${conf.webinf.dir}/tags" overwrite="yes">
-				<fileset dir="${tag.web.dir}/tags">
-					<include name="*.tag" />
-				</fileset>
-			</copy>
-	   </target>
-	
-	<target name="explode-tool" depends="" description="explode tool jar and war package to a war folder">
-		<!-- rename war file to avoid name conflict -->
-		<move tofile="${jboss.deploy}/temp-${product}.war" file="${jboss.deploy}/${product}.war" />
-		<!-- explode the ear -->
-		<!-- Don't explode jar file, becuase classes in jar will conflict with those same classes files in war -->
-		<!--<unjar src="${jboss.deploy}/${product}.jar" dest="${jboss.deploy}/${product}.war" />-->
-		<unjar src="${jboss.deploy}/temp-${product}.war" dest="${jboss.deploy}/${product}.war" />
-		<!-- delete war and jar files -->
-		<delete>
-			<fileset dir="${jboss.deploy}">
-				<include name="temp-${product}.war" />
-				<!--<include name="${product}.jar"/>-->
+		<junitreport todir="${build.report}"> 
+			<fileset dir="${build.report}">
+				<include name="TEST-*.xml"/>
 			</fileset>
-		</delete>
+			<report todir="${build.report}/html"/> 
+		</junitreport>
+
 	</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="project.classpath"/>
-			<pathelement location="${build.classes.java}"/>
-			<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="**"/>
-				<exclude name="WEB-INF/src/"/>
-				<exclude name="WEB-INF/web.xml"/>
-				<exclude name="**/*.java"/>
-				<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