Index: lams_tool_pixlr/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/build.xml,v
diff -u -r1.8 -r1.9
--- lams_tool_pixlr/build.xml	27 Mar 2012 10:37:35 -0000	1.8
+++ lams_tool_pixlr/build.xml	30 Jul 2012 18:53:10 -0000	1.9
@@ -1,629 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
-<!-- 
-The DOCTYPE declaration declares the location of database-specific parts of the
-Ant build file. 
--->
-<!DOCTYPE project [
-	<!ENTITY properties SYSTEM "file:./properties.xml">
-]>
-
-<project name="lams_tool_pixlr" 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="lib">
-			<include name="**/*.jar"/>
-		</fileset>
-		-->
-		<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 Pixlr" basedir="."> 
+	<import file="../lams_build/build_tools_base.xml"/>
 	
-	<path id="schemaexport.classpath">
-		<path refid="project.classpath"/>
-		<pathelement location="${build.classes.java}"/>
-	</path>
-
-	<target name="usage">
-		<echo message="" />
-		<echo message="${project} build file" />
-		<echo message="------------------------------------------------------" />
-		<echo message="" />
-		<echo message="The available targets are:" />
-		<echo message="" />
-		<echo message="preparedirs  --> Create the build directories" />
-		<echo message="clean-build  --> Remove all the class files" />
-		<echo message="compile-java --> Compile the java source files" />
-		<echo message="compile-test --> Compile the java test source files" />
-		<echo message="clean-db     --> Drop the tool tables" />
-		<echo message="build-db     --> Drop and Create the tool tables" />
-		<echo message="create-deploy-package --> Generates the deployment package" />
-		<echo message="deploy-tool  --> Creates the database and default content and then deploys the jar and war file to lams.ear " />
-		<echo message="test-report  --> Runs the junit testcases and generates the report " />
-		<echo message="" />
-	</target>
-
-	<target name="print-classpath">
-		<echo message="java.class.path = ${java.class.path}" />
-		<property name="path.string" refid="project.classpath" />
-		<echo message="project.classpath = ${path.string}" />
-	</target>
-
-	<!-- ================================================================ -->
-	<!-- Preparations									                  -->
-	<!-- ================================================================ -->
-	<target name="preparedirs">
-		<mkdir dir="${build}" />
-		<mkdir dir="${build.classes.java}" />
-		<mkdir dir="${build.classes.test}" />
-		<mkdir dir="${build.lib}" />
-	</target>
-
-
-	<target name="clean-build" 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.lib}" />
-		<mkdir dir="${build.deploy}"/>
-	</target>
-
-	<!-- ================================================================ -->
-	<!-- Compilations								                  -->
-	<!-- ================================================================ -->
-
-	<target name="compile-java" depends="clean-build" description="compile java sources">
-		<javac srcdir="${src.java.dir}" compiler="modern" destdir="${build.classes.java}" deprecation="on" debug="on">
-			<compilerarg value="-Xlint:unchecked"/>
-			<classpath>
-				<path refid="project.classpath" />
-			</classpath>
-		</javac>
-		<copy overwrite="yes" todir="${build.classes.java}/${package}">
-			<fileset dir="${src.java.dir}/${package}">
-				<include name="*.xml" />
-				<include name="*.properties" />
-				<!-- Autopatch -->
-				<include name="dbupdates/*.sql" />
-				<include name="dbupdates/autopatchContext.xml" />
-			</fileset>
-		</copy>
-		<copy overwrite="yes" todir="${build.classes.java}/${package}/web">
-			<fileset dir="${src.java.dir}/${package}/web">
-				<include name="*.properties" />
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="compile-test" depends="compile-java">
-		<javac destdir="${build.classes.test}" compiler="modern">
-			<src path="${src.test.dir}" />
-			<classpath>
-				<pathelement location="${build.classes.java}" />
-				<path refid="project.classpath" />
-			</classpath>
-		</javac>
-		<copy overwrite="yes" todir="${build.classes.test}">
-			<fileset dir="${src.test.dir}">
-				<include name="**/*.xml" />
-				<include name="**/*.zip" />
-			</fileset>
-		</copy>
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Database Tasks                                             -->
-	<!-- =================================================================== -->
-	<target name="clean-db" description="Deletes the Tool 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_pixlr.sql" />
-		</sql>
-	</target>
-
-	<target name="build-db" depends="" description="Deletes and Creates the Tool tables and inserts default content">
-		<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}/create_lams_tool_pixlr.sql" />
-		</sql>
-	</target>
-
-	<!-- ================================================================ -->
-	<!-- Make jar archive for deployment        		    	          -->
-	<!-- ================================================================ -->
-	<target name="build-jar" depends="generate-hbm-files, compile-java" 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>
-			<fileset dir="${conf.hibernate.mapping.dir}">
-			</fileset>
-		</jar>
-	</target>
-
-	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<!-- Make the war archive  for deployment             -->
-	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<target name="build-war" depends="build-jar, webdoclet,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>
-
-	   <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>
-
-	<!-- =================================================================== -->
-	<!-- Deploy the pixlr struts jar and war                               -->
-	<!-- =================================================================== -->
-	<target name="deploy-war" depends="build-war" description="Deploy the 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}" />
-		<copy overwrite="yes" todir="${jboss.deploy}/lams-dictionary.jar/org/lamsfoundation/lams/tool/pixlr">
-		   <fileset dir="${conf.language.dir}">
-		    <include name="**/*.properties"/>
-		    <include name="**/*.txt"/>
-		   </fileset>
-		  </copy>
-	</target>
-
-
-	<!-- =================================================================== -->
-	<!-- Deploy the pixlr struts jar and war and explode                      -->
-	<!-- =================================================================== -->
-
-	<target name="deploy-and-explode-war" depends="deploy-war, explode-tool" description="composite of multiple targets">
-
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Generate hibernate xml files                             			 -->
-	<!-- =================================================================== -->
-	<target name="generate-hbm-files" description="Generate the hibernate hbm.xml files from the Java source (using XDoclet)">
-
-		<taskdef name="hibernatedoclet" classname="xdoclet.modules.hibernate.HibernateDocletTask" classpathref="all-libs" />
-
-		<echo message="Building hbm.xml files using XDoclet" />
-
-		<hibernatedoclet destdir="${conf.hibernate.mapping.dir}" excludedtags="@version,@author,@todo" force="true">
-			<fileset dir="${src.java.dir}">
-				<include name="**/*.java" />
-			</fileset>
-			<hibernate version="3.0" />
-		</hibernatedoclet>
-	</target>
-	
-	<!-- exports all the hbm mappings to the specified database -->
-	<target name="schemaexport" description="Exports all hbm.xml files in {conf.hibernate.mapping.dir}/hbm"
-		depends="clean-build,generate-hbm-files">
-	    <echo message="Run the schema export for all hbm.xml files in ${conf.hibernate.mapping.dir}/hbm"/>
-		<taskdef
-			name="schemaexport"
-			classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"
-			classpathref="schemaexport.classpath"
-			>
-		</taskdef>
-		<schemaexport
-			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
-			quiet="no"
-			text="no"
-			drop="no"
-			delimiter=";"
-			output="${db.scripts}/table-schema.sql">
-			<fileset dir="${conf.hibernate.mapping.dir}">
-				<include name="**/*.hbm.xml"/>
-			</fileset>
-		</schemaexport>	
-	</target>
-
-
-	<!-- =================================================================== -->
-	<!-- Run JUnit Tests                                                     -->
-	<!-- =================================================================== -->
-	<target name="test" depends="compile-test">
-		<mkdir dir="${build.report}" />
-		<junit printsummary="yes" haltonerror="no" haltonfailure="no" fork="yes">
-			<jvmarg value="-Xms512M" />
-			<jvmarg value="-Xmx1024M" />
-			<formatter type="plain" usefile="false" />
-			<formatter type="xml" />
-			<batchtest todir="${build.report}">
-				<fileset dir="${src.test.dir}">
-					<include name="**/Test*.java" />
-
-				</fileset>
-			</batchtest>
-			<classpath>
-				<pathelement location="${build.classes.java}" />
-				<pathelement location="${build.classes.test}" />
-				<pathelement location="${conf.hibernate.mapping.dir}" />
-				<pathelement location="${conf.dir}" />
-				<path refid="project.classpath" />
-			</classpath>
-		</junit>
-	</target>
-
-	<target name="test-report" depends="test">
-		<mkdir dir="${build.report}/html" />
-		<junitreport todir="${build.report}">
-			<fileset dir="${build.report}">
-				<include name="TEST-*.xml" />
-			</fileset>
-			<report todir="${build.report}/html" />
-		</junitreport>
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Generate struts xml files                             -->
-	<!-- =================================================================== -->
-	<target name="webdoclet" depends="preparedirs" description="Generate the struts xml files from the Java source (using XDoclet)">
-		<taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask">
-			<classpath refid="all-libs" />
-		</taskdef>
-
-		<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
-
-			<fileset dir="${src.java.dir}">
-				<include name="**/*Action.java" />
-				<include name="**/*Form.java" />
-			</fileset>
-
-			<deploymentdescriptor servletspec="2.4" distributable="false" destdir="${conf.webinf.dir}" mergedir="${conf.xdoclet.dir}" sessiontimeout="${sessiontimeout}" />
-
-			<strutsconfigxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.2" />
-		</webdoclet>
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Generate the deploy package                                         -->
-	<!-- =================================================================== -->
-	<target name="create-deploy-package" depends="build-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}" />
+	<!-- Below are Tool specifc targets and targets overriding ones from the imported base file. -->
+	<target name="deploy-tool" depends="tools_base.deploy-tool"
+		    description="Build Tool archives and run deployment. Do not run on a production environment.">
 		
-		<mkdir dir="${build.deploy}/sql" />
-		<mkdir dir="${build.deploy}/lang" />
-
-		<copy overwrite="yes" todir="${build.deploy}/sql">
-			<fileset dir="${db.scripts}/">
-				<include name="drop_lams_tool_pixlr.sql" />
-				<include name="create_lams_tool_pixlr.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" />
-				<include name="*.txt" />
-			</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/updateTo${tool.version}.sql"
-			toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_pixlr.sql" 
-			toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_pixlr.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/pixlr/pixlrApplicationContext.xml"
-			lamsEarPath="${jboss.deploy}" toolContext="${toolContext}" 
-			toolWebUri="${product}.war"
-			languageFilesPackage="org.lamsfoundation.lams.tool.pixlr">
-			
-			<!-- 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 Pixlr 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.">
-		
 		<!-- Creating the image directory for pixlr in lams-www.war -->
 		<mkdir dir="${jboss.deploy}/lams-www.war/images/pixlr" />
 		<copy  todir="${jboss.deploy}/lams-www.war/images/pixlr">
 			<fileset dir="${conf.web.dir}/images/">
 				<include name="blank.jpg" />
 			</fileset>
 		</copy>
-	
 	</target>
 
-	<target name="delete-exploded-tool-folder" description="delete old tool exploded tool folder">
-		<!-- delete old war folder tree -->
-		<delete quiet="true" includeemptydirs="true">
-			<fileset dir="${jboss.deploy}/${product}.war">
-				<include name="**" />
-			</fileset>
-		</delete>
-		<!-- if use explode tool target when jboss is running, explode may be failed and left the the temp folder. Here try to delete the temp folder -->
-		<delete quiet="true" includeemptydirs="true">
-			<fileset dir="${jboss.deploy}/temp-${product}.war">
-				<include name="**" />
-			</fileset>
-		</delete>
-	</target>
 
-	<target name="explode-tool" depends="delete-exploded-tool-folder, deploy-tool" 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"/>-->
-			</fileset>
-		</delete>
-	</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="test-report" depends="_target-not-available"
+			description="Runs JUnit tests and generates report." />
 	
-	<!-- =================================================================== -->
-		<!-- Deploy the pixlr jar                          -->
-		<!-- =================================================================== -->
-		<target name="deploy-jar" depends="build-jar" description="Deploy the 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}" />
-			<copy overwrite="yes" todir="${jboss.deploy}/lams-dictionary.jar/org/lamsfoundation/lams/tool/pixlr">
-			   <fileset dir="${conf.language.dir}">
-			    <include name="**/*.properties"/>
-			    <include name="**/*.txt"/>
-			   </fileset>
-			</copy>
-		</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>
-
+</project>
\ No newline at end of file