Index: lams_monitoring/build.xml
===================================================================
diff -u -r3b0bc22e75b15e3d673075041cd713b4bb78f789 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
--- lams_monitoring/build.xml	(.../build.xml)	(revision 3b0bc22e75b15e3d673075041cd713b4bb78f789)
+++ lams_monitoring/build.xml	(.../build.xml)	(revision 2fb270efd025291a9a2d45b04ad1b13aad40f170)
@@ -15,8 +15,13 @@
 	<path id="all-libs">
 		<fileset dir="${lib.dir}">
 			<include name="**/*.jar"/>
-			<exclude name="**/gnujaxp.jar"/>
 		</fileset>
+		<fileset dir="${sharedlib}">
+			<include name="**/*.jar"/>
+		</fileset>
+		<fileset dir="${j2eelibs}">
+				<include name="**/*.jar"/>
+		</fileset>
 	</path>
 	
 	<path id="project.classpath">
@@ -33,9 +38,9 @@
 		<echo message=""/>
 		<echo message="Among the available targets are:"/>
 		<echo message=""/>
-		<echo message="build    --> build all; don't create JARs"/>
-		<echo message="alljars  --> create all JAR files"/>
-		<echo message="tests    --> run tests"/>
+		<echo message="build-jar    --> create jar" />
+		<echo message="build-war    --> create jar and war" />
+		<echo message="test-report  --> run tests" />
 		<echo message=""/>
 
 	</target>
@@ -71,13 +76,14 @@
 			</classpath>
 		</javac>
   		<copy overwrite="yes" todir="${build.classes.java}">
-  			<fileset dir="${src.dir.test}">
+  			<fileset dir="${src.dir.java}">
   				<include name="*.hbm.xml"/>
   			</fileset>
   		</copy>		
-		<copy overwrite="yes" todir="${build.classes.java}/${monitoring.path}">
-			<fileset dir="${src.dir.test}/${monitoring.path}">
-				<include name="*.xml"/>
+		<copy overwrite="yes" todir="${build.classes.java}">
+			<fileset dir="${src.dir.java}">
+  				<include name="**/*.properties"/>
+				<include name="**/*.xml"/>
 			</fileset>
 		</copy>
 	</target>
@@ -90,14 +96,32 @@
 				<path refid="project.classpath"/>
 			</classpath>
 		</javac>
+		<copy overwrite="yes" todir="${build.classes.java}">
+			<fileset dir="${src.dir.test}">
+				<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>
+	</target>
+
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
 	<!-- Make the war archive  for deployment             -->
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<target name="build-war" depends="compile.java,webdoclet" description="creates war file">
+	<target name="build-war" depends="build-jar,webdoclet" description="creates war file">
 		<delete file="${build.lib}/${product}.war"/>
-		<war warfile="${build.lib}/${product}.war" 
+		<war warfile="${build.lib}/${product}.war" manifest="${conf.dir}/war/META-INF/MANIFEST.MF" 
   				webxml="${conf.webinf.dir}/web.xml">
 			<webinf dir="${conf.webinf.dir}">
 				<include name="*.xml"/>
@@ -181,6 +205,40 @@
 				mergedir="${conf.xdoclet.dir}" version="1.2" />	
        </webdoclet>
    </target>
-
 	
+	   <!-- =================================================================== -->
+	   <!-- Run junit tests														-->
+	   <!-- =================================================================== -->
+	<target name="test" depends="compile.test">
+		<mkdir dir="${build.report}" />
+		<junit printsummary="yes" haltonerror="no" haltonfailure="yes"
+			fork="yes">
+			<formatter type="plain" usefile="false" />
+			<formatter type="xml" />
+			<batchtest todir="${build.report}">
+				<fileset dir="${src.dir.test}">
+					<include name="**/Test*.java" />
+					<exclude name="**/*Action.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}" />
+				<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>
+
 </project>