Index: lams_monitoring/build.xml
===================================================================
diff -u -re7dc815a304adc5f771f5a556de6d19263d965ad -rd56929f06ad90a63082d514e6521adc175f3de27
--- lams_monitoring/build.xml	(.../build.xml)	(revision e7dc815a304adc5f771f5a556de6d19263d965ad)
+++ lams_monitoring/build.xml	(.../build.xml)	(revision d56929f06ad90a63082d514e6521adc175f3de27)
@@ -1,177 +1,52 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
-<!-- -->
-
-<project name="lams_monitoring" default="usage" basedir="." >
+<project name="LAMS Monitoring" 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" />
-
-	<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" />
-		<fileset dir="${basedir}/lib">
-			<include name="**/*.jar"/>
-		</fileset>
-		<!-- 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="${name} build file"/>
-		<echo message="------------------------------------------------------"/>
-		<echo message=""/>
-		<echo message="Among the available targets are:"/>
-		<echo message=""/>
-		<echo message="build-jar    --> create jar" />
-		<echo message="build-war    --> create jar and war" />
-		<echo message="test-report  --> run tests" />
-		<echo message=""/>
-
-	</target>
-	<target name="init">
-        <available property="xdoclet-jars-installed" file="lib/xdoclet/xdoclet-${xdoclet.version}.jar"/>
-    </target>
-
+	<import file="../lams_build/build_base.xml"/> 
 	
+	
 	<!-- ================================================================ -->
-	<!-- Preparations									                  -->
+	<!-- Print information								                  -->
 	<!-- ================================================================ -->
-	<target name="clean" description="removes all class files">
-		<delete dir="${build.classes.java}"/>
-		<delete dir="${build.classes.test}"/>
-		<delete dir="${build.lib}"/>
+	
+	<target name="print-usage">
+		<echo>
+		${ant.project.name} build file
+		------------------------------------------------------
 		
-		<mkdir dir="${build}"/>
-		<mkdir dir="${build.classes.java}"/>
-		<mkdir dir="${build.classes.test}"/>
-		<mkdir dir="${build.lib}"/>
+		Available targets are:
+			
+		print-usage             --> Display this information
+		copy-tags               --> Copies custom JSP tags from Central
+		deploy-jar              --> Deploys JAR to EAR
+		deploy-war              --> Deploys WAR to EAR
+		copy-to-lams-lib      --> Copies JAR to lams-build for other projects to use
+		explode-war             --> Unpacks WAR in EAR
+		explode-war-synchronize --> Updates web content in exploded WAR
+		explode-war-delete      --> Removes exploded WAR
+		test-report             --> Runs JUnit tests and generates report
+		</echo>	
 	</target>
-
-	<target name="compile.java" 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}">
-  			<fileset dir="${src.java.dir}">
-  				<include name="*.hbm.xml"/>
-  			</fileset>
-  		</copy>		
-		<copy overwrite="yes" todir="${build.classes.java}">
-			<fileset dir="${src.java.dir}">
-  				<include name="**/*.properties"/>
-				<include name="**/*.xml"/>
-			</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.java}">
-			<fileset dir="${src.test.dir}">
-				<include name="*.xml"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<!-- ================================================================ -->
-	<!-- Make jar archive for deployment        		    	          -->
-	<!-- ================================================================ -->
-	<target name="build-jar" depends="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="${build.classes.test}">
-			</fileset>			
-		</jar>
-		<copy overwrite="yes" todir="${build.lib}/language/${monitoring.path}">
-			<fileset dir="${conf.language.dir}">
-				<include name="**/*.properties"/>
-				<include name="**/*.txt"/>
-			</fileset>
-		</copy>
-	</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>
-
    <!-- =================================================================== -->
-   <!-- Fails if XDoclet 1.2.x is not on classpath                          -->
+   <!-- Tests                                   							-->
    <!-- =================================================================== -->
-   <target name="fail-if-no-xdoclet-1.2" 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="${database.driver.file}" 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 ${database.driver.file}
-      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 database.driver.file property
-      in the ${basedir}/config/database/xxx.xml file accordingly.
-      </fail>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- generate a Clover html report                                       -->
-   <!-- =================================================================== -->
-   <target name="clover">
-      <property name="cp" refid="lib.class.path"/>
+	
+	<!-- Tests for this project require lams-tool-survey.jar to be in classpath.
+	     As tests are not in use now, the JAR was removed from this project:
+	     it should be taken straight from Survey Tool anyway
+	     and not copied to lams_monitoring/lib every time.
+	-->
+	
+	
+	
+	<!-- There is no Clover available in standard Eclipse distribution.
+		 This tasks seems obsolete but left for future reference
+		 
+   <target name="clover-report" description="Generates Clover report">
+      <property name="cp" refid="libs.classpath"/>
       <property name="cp2" value="${cp};${ant.home}/lib/clover.jar"/>
+   	<echo message="${cp2}" />
       <java 
          classname="com.cortexeb.tools.clover.reporters.html.HtmlReporter" 
          fork="no"
@@ -180,236 +55,6 @@
          <arg line="-o ${build.dir}/clover -i C:/temp/clover/demo_coverage.db -t 'Middlegen coverage'"/>
       </java>
    </target>
-
-   <!-- =================================================================== -->
-   <!-- Run xdoclet for hibernate                                           -->
-   <!-- =================================================================== -->
-	<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="**/*Servlet.java" />
-            <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>
-	
-	   <!-- =================================================================== -->
-	   <!-- Run junit tests														-->
-	   <!-- =================================================================== -->
-	<target name="test" depends="compile.test"> 
-		<delete failonerror="false">
-			<fileset dir="${build.report}"/>
-		</delete>
-		<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="**/TestMonitoringService.java" />
-<!--					<include name="**/TestGateAction.java" />  -->
-					<!-- does not work <include name="**/TestMonitoringAction.java" /> -->
-				</fileset>
-			</batchtest>
-			<classpath>
-				<pathelement location="${build.classes.java}" />
-				<pathelement location="${build.classes.test}" />
-				<pathelement location="${conf.hibernate.mapping.dir}" />
-				<pathelement location="${conf.web.dir}" />
-				<pathelement location="lib/lams/lams-tool-survey.jar" />
-				<path refid="project.classpath" />
-			</classpath>
-		</junit>
-	</target>
-
-	<target name="test-report" depends="test" description="Run the tests - requires the survey tables to exist">
-		<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>
-
-
-	<!-- used for development only - should always use deploy-tool when building for release -->
-	<target name="deploy-war" depends="build-war">
-		<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/monitoring">
-			<fileset dir="${conf.language.dir}">
-				<include name="**/*.properties"/>
-				<include name="**/*.txt"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<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/org/lamsfoundation/lams/monitoring">
-			<fileset dir="${conf.language.dir}">
-				<include name="**/*.properties"/>
-				<include name="**/*.txt"/>
-			</fileset>
-		</copy>
-	</target>
-	
-	<!-- explode-war : for convenience during development.  Explodes lams-monitoring.war in the lams.ear folder -->
-	<target name="explode-war" depends="" description="explode 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 war -->
-		<unjar src="${jboss.deploy}/temp-${product}.war" dest="${jboss.deploy}/${product}.war" />
-		<!-- delete temp war file -->
-		<delete>
-			<fileset dir="${jboss.deploy}">
-				<include name="temp-${product}.war" />
-			</fileset>
-		</delete>
-	</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"/>
-				<exclude name="WEB-INF/classes/**"/>
-			</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