Index: lams_central/build.xml
===================================================================
diff -u -r4e07c4b8d6b760bae980030b3a6c74c450e7f4c1 -rd56929f06ad90a63082d514e6521adc175f3de27
--- lams_central/build.xml	(.../build.xml)	(revision 4e07c4b8d6b760bae980030b3a6c74c450e7f4c1)
+++ lams_central/build.xml	(.../build.xml)	(revision d56929f06ad90a63082d514e6521adc175f3de27)
@@ -1,430 +1,116 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
-<project name="LAMS Central" basedir="." default="usage">
+<project name="LAMS Central" basedir="." default="print-usage">
+	
+	<import file="../lams_build/build_base.xml"/> 
 
-	<!-- import properties from the specified file -->
-	<property file="build.properties"/>
-	<property file="../lams_build/common.properties"/>
+	<!-- Additional properties -->
 	<property file="../lams_build/shared.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>
-
-	<target name="usage">
-		<echo message=""/>
-		<echo message="${project} build file"/>
-		<echo message="------------------------------------------------------"/>
-		<echo message=""/>
-		<echo message="Among the available targets are:"/>
-		<echo message=""/>
-		<echo message="build-war  --> Make war archive for deployment"/>
-		<echo message="build-jar  --> Make jar archive for deployment"/>
-		<echo message="clean-build  --> Make war archive for deployment"/>
-		<echo message=""/>
-	</target>
-
-	<target name="init">
-	</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>
-
+	<available file="../${lams_planner}/build.xml" property="planner.available" />
 	
-	<!-- ================================================================ -->
-	<!-- Preparations									                  -->
-	<!-- ================================================================ -->
-	<target name="preparedirs">
-		<mkdir dir="${build}"/>
-		<mkdir dir="${build.lib}"/>
-		<mkdir dir="${build.classes.java}"/>
-		<mkdir dir="${build.classes.test}"/>
-		<mkdir dir="${build.web}"/>				
-	</target>
+	<condition property="isRAMS">
+		<equals arg1="${conf.application}" arg2="rams" />
+	</condition>
 
-
-	<target name="clean" depends="preparedirs" description="removes all class files">
-		<delete>
-			<fileset dir="${build.classes.java}"/>
-			<fileset dir="${build.classes.test}"/>
-			<fileset dir="${build.lib}"/>
-		</delete>
-		<mkdir dir="${build.classes.java}"/>	
-		<mkdir dir="${build.classes.test}"/>	
-		<mkdir dir="${build.lib}"/>
-	</target>
-
 	
-	<!-- ================================================================ -->
-	<!-- Preparations									                  -->
-	<!-- ================================================================ -->
-	<target name="compile" depends="clean" description="compile java sources">
- 	   <!--<property name="cp" refid="project.classpath"/>
-	   <echo message="Classpath is ${cp}"/> -->
-		<javac srcdir="${src.java.dir}" compiler="modern"
-	         	 	destdir="${build.classes.java}" deprecation="on" debug="on">
-			<classpath>
-				<path refid="project.classpath"/>
-			</classpath>
-		</javac>
-		<!-- Spring files -->
-		<copy overwrite="yes" todir="${build.classes.java}/org/lamsfoundation/lams/">
-				<fileset dir="${src.java.dir}/org/lamsfoundation/lams/">
-						<include name="**/*.xml"/>
-						<include name="**/*.properties"/>
-				</fileset>
-		</copy>
-		<!-- Autopatch -->
-		<copy overwrite="yes" todir="${build.classes.java}/">
-					<fileset dir="${src.java.dir}/">
-							<include name="migration.properties"/>
-					</fileset>
-		</copy>
-	</target>
-
-	<target name="compile.test" depends="compile">
-		<javac destdir="${build.classes.test}" compiler="modern">
-			<src path="${src.test.dir}"/>
-			<classpath>
-				<path refid="project.classpath"/>
-			</classpath>
-		</javac>
-	</target>
-	
-	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<!-- Make the war archive  for deployment             -->
-	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-
-	<target name="test-application">
-		  <condition property="isLAMS">
-		  	<equals arg1="${conf.application}" arg2="lams" />
-		  </condition>
-		  <condition property="isRAMS">
-		  	<equals arg1="${conf.application}" arg2="rams" />
-		  </condition>
-		  <echo>isLAMS ${isLAMS}</echo>
-		  <echo>isRAMS ${isRAMS}</echo>
-	</target>
-
-	<target name="update-logo-for-RAMS" depends="test-application" if="isRAMS" description="Overwrite the LAMS logo with the RAMS logo">
-		<echo>Setting login logo to RAMS</echo>
-		<copy overwrite="yes" todir="${build.lib}/${product}.war/images/css/">
-			<fileset dir="${build.lib}/${product}.war/images/ramsthemecss/">
-				<include name="rams_login.gif"/>
-			</fileset>
-		</copy>
-		<move overwrite="yes" tofile="${build.lib}/${product}.war/images/css/lams_login.gif"
-			file="${build.lib}/${product}.war/images/css/rams_login.gif" verbose="true"/>
-	</target>
-
-	<target name="build-war" depends="webdoclet,build-jar,jsp-plaincopy,jsp-precompile" description="creates war file">
-		<!-- Copy favicone file from conf to assembly -->
-		<copy overwrite="yes" todir="${build.war.assembly}">
+	<!-- Below are Tool specifc targets and targets overriding ones from the imported base file. -->
+	<target name="_copy-war-resources" depends="_copy-language">
+		<!-- Internal target: Adds additional web content to Central -->
+		<echo>${ant.project.name}: Copying favicon from conf to assembly</echo>
+		<copy todir="${build.war.assembly}">
 			<fileset dir="${conf.dir}/favicon/${conf.application}">
 				<include name="**/*.ico"/>
 			</fileset>
 		</copy>
 		
-		<!-- Copy Flash files from conf to assembly -->
-		<copy overwrite="yes" todir="${build.war.assembly}/flashxml">
+		<echo>${ant.project.name}: Copying Flash files from conf to assembly</echo>
+		<copy todir="${build.war.assembly}/flashxml">
 			<fileset dir="${conf.dir}/flashxml/${conf.application}">
 				<include name="**/*.xml"/>
 			</fileset>
 		</copy>
 		
-		<delete dir="${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>
-		
-		<move file="${build.lib}/lams-central.war" tofile="${build.lib}/temp.war"/>
-		<unjar src="${build.lib}/temp.war" dest="${build.lib}/lams-central.war"/>
-		<antcall target="update-logo-for-RAMS"/>
+		<echo>Copying Pedagogical Planner files, if available</echo>
+		<ant antfile="../${lams_planner}/build.xml" target="_copy-to-central" />
 	</target>
-
-
-	<!-- ================================================================ -->
-	<!-- Make jar archive for deployment        		    	          -->
-	<!-- ================================================================ -->
-	<target name="build-jar" depends="compile" 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="${build.classes.test}"/>
-		</jar>
-		
-		<copy overwrite="yes" todir="${build.lib}/language/org/lamsfoundation/lams/central">
-			<fileset dir="${conf.language.dir}">
-				<include name="**/*.properties"/>
-				<include name="**/*.txt"/>
-			</fileset>
-		</copy>
-
-	</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="${build.web}"/>
-					<path refid="project.classpath"/>
-				</classpath>			
-			</junit>
+	
+	<target name="_update-logo-for-RAMS" if="isRAMS">
+		<!-- Internal target: updates logo in built WAR for RAMS project -->
+		<echo>Setting login logo to RAMS</echo>
+		<move tofile="${build.lib}/${product}.war/images/css/lams_login.gif"
+			  file="${conf.web.dir}/images/ramsthemecss/rams_login.gif" 
+		      overwrite="true" verbose="true" />
 	</target>
+	
+	
+	<target name="_build-war"
+	        depends="_build-webdoclet, _copy-war-resources, _jsp-plaincopy, _jsp-precompile">
 		
-	<target name="test-report" depends="test">
-		<mkdir dir="${build.report}/html"/> 
-		<junitreport todir="${build.report}"> 
-			<fileset dir="${build.report}">
-				<include name="TEST-*.xml"/>
+		<!-- Internal target: Builds WAR without archivisation -->
+		<echo>${ant.project.name}: Building exploded WAR</echo>
+		<copy todir="${build.lib}/${product}.war">
+			<fileset dir="${build.war.assembly}">
+				<include name="**"/>
 			</fileset>
-			<report todir="${build.report}/html"/> 
-		</junitreport>
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Run xdoclet for hibernate                                           -->
-	<!-- =================================================================== -->
-	<taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask">
-	    <classpath refid="all-libs"/>
-	</taskdef>
-
-	<target name="webdoclet" depends="preparedirs">
-		<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
-	         <fileset dir="${src.java.dir}">
-	            <include name="**/*Servlet.java" />
-	            <include name="**/*Action.java" />
-	            <include name="**/*ActionForm.java" />
-	            <include name="**/*Tag.java" />
-	         	<include name="web/planner/*.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}"
-	         				version="1.2" 
-	         				mergedir="${conf.xdoclet.dir}"/>
-			 
-			 <jsptaglib jspversion="2.0"
-						taglibversion="1.0"
-					 	shortname="lams"
-			 			displayname="LAMSTags"
-					 	description="LAMS custom tags"
-			 			filename="lams.tld"
-					 	validatexml="true"
-						destdir="${conf.webinf.dir}"
-        				mergedir="${conf.xdoclet.dir}"/>
-	     </webdoclet>
-	</target>
-		
-	<!-- deploy-war : for convenience during development. Should be deployed via the master build -->
-	<target name="deploy-war" depends="build-war">
-		<copy file="${build.lib}/${product}.jar"
-				todir="${jboss.deploy}"/>
-		
-		<delete dir="${jboss.deploy}/${product}.war"/>
-		<copy todir="${jboss.deploy}/${product}.war">
-			<fileset dir="${build.lib}/${product}.war">
-				<include name="**/*"/>
+			<fileset dir="${build.war}">
+				<include name="WEB-INF/web.xml"/>
 			</fileset>
-		</copy>
-		
-		<copy overwrite="yes" todir="${jboss.deploy}/lams-dictionary.jar">
-			<fileset dir="${build.lib}/language">
-				<include name="**/*.properties"/>
+			<fileset dir="${conf.dir}/war">
+				<include name="META-INF/MANIFEST.MF"/>
 			</fileset>
 		</copy>
+		
+		<antcall target="_update-logo-for-RAMS" />
 	</target>
 	
-	<!-- deploy-war : for convenience during development. Should be deployed via the master build -->
-	<target name="deploy-jar" depends="build-jar">
-		<copy file="${build.lib}/${product}.jar"
-				todir="${jboss.deploy}"/>
-		<copy overwrite="yes" todir="${jboss.deploy}/lams-dictionary.jar">
-			<fileset dir="${build.lib}/language">
-				<include name="**/*.properties"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="copy-planner" if="planner_available">
-		<ant antfile="../${lams_planner}/build.xml" target="copy-to-central" />
-	</target>
 	
-	<!-- ================================= -->
-	<!--  target: synchronize-deploy          -->            
-	<!--  ================================= -->
-	<target name="synchronize-deploy" description="copy non-java file into deploy folder - war must be expanded. Do not overwrite the web.xml">
-		<copy verbose="yes" todir="${jboss.deploy}/${product}.war">
-			<fileset dir="${conf.web.dir}">
-				<include name="**/*.*" />
-				<exclude name="WEB-INF/web.xml"/>
-			</fileset>
+	<target name="deploy-war" depends="_build-war, explode-war-delete" description="Deploys WAR.">
+		<echo>Removing cached files</echo>
+		<delete quiet="true">
+			<fileset dir="${jboss.deploy}/tmp"/>
+			<fileset dir="${jboss.deploy}/work"/>
+		</delete>
+				
+		<echo>${ant.project.name}: Deploying exploded WAR</echo>
+		<copy todir="${jboss.deploy}/${product}.war">
+			<fileset dir="${build.lib}/${product}.war" />
 		</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>
 		
-		<!-- Add Pedagogical Planner, if available -->
-		<available file="../${lams_planner}/build.xml" property="planner_available" />
-		<antcall target="copy-planner" />
-		
-		<!-- 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>
+		<echo>${ant.project.name}: Copying language files</echo>
+		<copy todir="${jboss.deploy}/lams-dictionary.jar" overwrite="true">
+		   <fileset dir="${build.lib}/language" />
 		</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"/>
-		<mkdir dir="${build.war}"/>
-		
-		<!-- Add Pedagogical Planner, if available -->
-		<available file="../${lams_planner}/build.xml" property="planner_available" />
-		<antcall target="copy-planner" />
-	 	<copy todir="${build.war.assembly}">
-			<fileset dir="${build.war}">
-				<include name="**"/>
+	
+	
+	<target name="build-tag-library" description="Generates Tag Library from Java source using XDoclet.">
+		<echo>Building LAMS Tag Library using XDoclet</echo>
+		<webdoclet destDir="${conf.webinf.dir}/tlds/lams"
+			       mergeDir="${conf.xdoclet.dir}"
+			       force="${xdoclet.force}">
+			<fileset dir="${src.java.dir}">
+				<include name="**/*.java" />
+				<exclude name="**/*Skeleton.java" />
 			</fileset>
-	 	</copy>
-		
-		<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>
-		
+			
+			<jsptaglib jspversion="2.0"
+					   taglibversion="1.0"
+					   shortname="lams"
+			 		   displayname="LAMSTags"
+					   description="LAMS custom tags"
+			 		   filename="lams.tld"
+					   validatexml="true"
+			/>
+		</webdoclet>
 	</target>
-</project>
+	
+	
+	<!-- Not needed. Does not even display warning to avoid confusion -->
+	<target name="_build-hbm" />
+	
+	
+	<target name="explode-war" depends="_target-not-available" description="Explodes deployed WAR to folder." />
 
+</project>
\ No newline at end of file