Index: lams_monitoring/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/build.xml,v
diff -u -r1.13 -r1.14
--- lams_monitoring/build.xml	24 Oct 2005 05:46:02 -0000	1.13
+++ lams_monitoring/build.xml	1 Nov 2005 01:30:22 -0000	1.14
@@ -2,29 +2,21 @@
 
 <!-- -->
 
-
 <project name="lams_monitoring" default="usage" basedir="." >
 	
-   <property                                       file="build.properties"/>
+	<!-- import properties from the specified file -->
+	<property file="build.properties"/>
 	<property file="../lams_build/common.properties"/>
 
-
-   
-   <!-- define the datasource.jndi.name in case the imported ejb file doesn't -->
-   <property name="datasource.jndi.name"           value="${name}/datasource"/>
-
 	<path id="all-libs">
-		<fileset dir="${lib.dir}">
-			<include name="**/*.jar"/>
-		</fileset>
 		<fileset dir="${sharedlib}">
 			<include name="**/*.jar"/>
 		</fileset>
 		<fileset dir="${j2eelibs}">
-				<include name="**/*.jar"/>
+			<include name="**/*.jar"/>
 		</fileset>
 	</path>
-	
+   
 	<path id="project.classpath">
 		<path refid="all-libs" />
 		<!-- Java CLASSPATH should be added as the last item -->
@@ -70,19 +62,19 @@
 	</target>
 
 	<target name="compile.java" depends="clean" description="compile java sources">
-		<javac srcdir="${src.dir.java}" compiler="modern"
+		<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.dir.java}">
+  			<fileset dir="${src.java.dir}">
   				<include name="*.hbm.xml"/>
   			</fileset>
   		</copy>		
 		<copy overwrite="yes" todir="${build.classes.java}">
-			<fileset dir="${src.dir.java}">
+			<fileset dir="${src.java.dir}">
   				<include name="**/*.properties"/>
 				<include name="**/*.xml"/>
 			</fileset>
@@ -91,14 +83,14 @@
 	
 	<target name="compile.test" depends="compile.java">
 		<javac destdir="${build.classes.test}" compiler="modern">
-			<src path="${src.dir.test}"/>
+			<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.dir.test}">
+			<fileset dir="${src.test.dir}">
 				<include name="*.xml"/>
 			</fileset>
 		</copy>
@@ -196,7 +188,7 @@
 	<target name="webdoclet" depends="preparedirs">
 		<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
 
-         <fileset dir="${src.dir.java}">
+         <fileset dir="${src.java.dir}">
             <include name="**/*Action.java" />
             <include name="**/*Form.java" />
          </fileset>
@@ -224,7 +216,7 @@
 			<formatter type="plain" usefile="false" />
 			<formatter type="xml" />
 			<batchtest todir="${build.report}">
-				<fileset dir="${src.dir.test}">
+				<fileset dir="${src.test.dir}">
 					<include name="**/TestMonitoringService.java" />
 					<include name="**/TestGateAction.java" /> 
 					<!-- does not work <include name="**/TestMonitoringAction.java" /> -->