Index: lams_www/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_www/build.xml,v
diff -u -r1.8 -r1.9
--- lams_www/build.xml	27 Mar 2012 14:16:35 -0000	1.8
+++ lams_www/build.xml	30 Jul 2012 18:45:11 -0000	1.9
@@ -1,224 +1,105 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
-<project name="LAMS WWW (Upload)" basedir="." default="usage">
+<project name="LAMS WWW (Upload)" basedir="." default="print-usage">
 
-	<!-- import properties from the specified file -->
-	<property file="build.properties"/>
-	<property file="../lams_build/common.properties"/>
-	<property file="../lams_build/${osPropertiesName}.properties" />
+	<import file="../lams_build/build_base.xml"/> 
 
-	<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>
-	<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="Among the available targets are:"/>
-		<echo message=""/>
-		<echo message="build-war  --> 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>
-
-	
 	<!-- ================================================================ -->
-	<!-- Preparations									                  -->
+	<!-- Print information								                  -->
 	<!-- ================================================================ -->
-	<target name="preparedirs">
-		<mkdir dir="${build}"/>
-		<mkdir dir="${build.web}"/>				
-		<mkdir dir="${build.lib}"/>				
-	</target>
+		
+	<target name="print-usage">
+		<echo>
+		LAMS WWW build file
+		------------------------------------------------------
 
-	<target name="clean" depends="preparedirs" description="removes all class files">
-		<delete dir="${build}" quiet="false"/>
-		<mkdir dir="${build}"/>
-		<mkdir dir="${build.web}"/>	
-		<mkdir dir="${build.lib}"/>	
+		Available targets are:
+			
+		copy-tags                --> Copies custom JSP tags from Central	
+		_build-war               --> Internal target: Generates WAR
+		</echo>
 	</target>
-
 	
 	<!-- ================================================================ -->
-	<!-- Preparations									                  -->
+	<!-- Build archives        		    	          					  -->
 	<!-- ================================================================ -->
-	<target name="copyContext">
-		<copy overwrite="yes" todir="${build.web}">
-			<fileset dir="${conf.web.dir}">
-				<include name="**/*.xml"/>
-				<include name="**/*.tld"/>
-				<include name="**/*.tag"/>
-			</fileset>
-		</copy>
-	</target>
 	
-	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<!-- Make the war archive  for deployment             -->
-	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<target name="build-war" depends="clean,copyContext,jsp-plaincopy,jsp-precompile" description="creates war file">
+	<target name="_build-war" depends="_clean-dirs, _jsp-plaincopy, _jsp-precompile">
+		<!-- Internal target: Creates WAR file. -->
+		<echo>${ant.project.name}: Copying additional resources</echo>
 		<copy todir="${build.war.assembly}/images" overwrite="yes">
 			<fileset dir="${conf.dir}/${conf.application}">
 				<include name="*.swf" />
 			</fileset>
 		</copy>
+		
 		<copy todir="${build.war.assembly}" overwrite="yes">
 			<fileset dir="${conf.dir}/${conf.application}">
 				<include name="news.html" />
 			</fileset>
 		</copy>
 
-		<delete file="${build.lib}/${product}.war"/>
+		<echo>${ant.project.name}: Building WAR</echo>
 		<war warfile="${build.lib}/${product}.war" 
-  				webxml="${build.war}/WEB-INF/web.xml" manifest="${conf.dir}/war/META-INF/MANIFEST.MF">
+  			 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>
 	
+	<!-- =================================================================== -->
+	<!-- Product deployment			                                         -->
+	<!-- =================================================================== -->
+	
+	<target name="deploy-jar" depends="_target-not-available" description="Deploys JAR." />
 
-	<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="deploy-war" depends="_target-not-available" description="Deploys WAR." />
+
+	<!-- =================================================================== -->
+	<!-- Explode WAR                                        				 -->
+	<!-- =================================================================== -->
 	
-	<!-- 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>
+	<target name="explode-war" depends="_target-not-available"
+	        description="Explodes deployed WAR to folder." />
+	
+	
+	<target name="explode-war-synchronize" depends="_target-not-available" 
+		    description="Copies web files into exploded WAR folder." />
+	
+	
+	<target name="explode-war-delete" depends="_target-not-available" 
+		    description="Deletes exploded WAR folder." />
+	
+	<!-- =================================================================== -->
+	<!-- Tests                                                     	 -->
+	<!-- =================================================================== -->
+	
+	<target name="test-report" depends="_target-not-available" 
+		    description="Runs JUnit tests and generates report." />
 		
-		<!-- 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" />
+	<!-- =================================================================== -->
+	<!-- JSP precompilation                                   				 -->
+	<!-- =================================================================== -->
+	
+	<target name="_jsp-configcopy">
+		<!-- Internal target: Copies configuration files for WAR. -->
+		<echo>${ant.project.name}: Coping configuration files</echo>
+	 	<copy todir="${build.war}/WEB-INF" overwrite="true">
+			<fileset dir="${conf.webinf.dir}">
+				<include name="*.xml"/>
 			</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 set in lams_build/common.properties -->
+	<target name="_jsp-precompile" if="jsp.precompile"
+		    depends="_jsp-configcopy, build_base._jsp-precompile" />
+	
 	<!-- 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>
-
+	<target name="_jsp-plaincopy" unless="jsp.precompile"
+	        depends="_jsp-configcopy, build_base._jsp-plaincopy" />
+</project>
\ No newline at end of file