Index: lams_central/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/build.properties,v
diff -u -r1.4 -r1.5
--- lams_central/build.properties	31 Aug 2005 05:29:13 -0000	1.4
+++ lams_central/build.properties	1 Nov 2005 01:29:36 -0000	1.5
@@ -22,37 +22,3 @@
 product=lams-central
 version=1.1
 
-# xdoclet properties
-xdoclet.version=1.2.3
-	
-# path properties
-web=${basedir}/web
-webinf=${web}/WEB-INF
-webinf.struts=${webinf}/struts
-
-jboss.home=D:/jboss-4.0.2
-jboss.deploy=${jboss.home}/server/default/deploy
-
-src=${basedir}/src
-src.java=${basedir}/src/java
-src.test.java=${basedir}/test/java
-test=${basedir}/test
-test.java=${basedir}/test/java
-
-build=${basedir}/build
-build.lib=${build}/lib
-	
-sharedlib=../lams_build/lib
-j2eelibs=C:/Program Files/MyEclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4
-
-build=${basedir}/build
-build.classes=${build}/classes
-build.classes.java=${build.classes}/java
-build.lib=${build}/lib
-build.report=${build}/report
-build.test=${build}/test
-build.web=${build}/web
-	
-conf.dir=${basedir}/conf
-conf.xdoclet=${conf.dir}/xdoclet
-sessiontimeout=120
Index: lams_central/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/build.xml,v
diff -u -r1.19 -r1.20
--- lams_central/build.xml	13 Oct 2005 03:12:00 -0000	1.19
+++ lams_central/build.xml	1 Nov 2005 01:29:36 -0000	1.20
@@ -24,19 +24,17 @@
 
 	<!-- import properties from the specified file -->
 	<property file="build.properties"/>
+	<property file="../lams_build/common.properties"/>
 
 	<path id="all-libs">
 		<fileset dir="${sharedlib}">
 			<include name="**/*.jar"/>
 		</fileset>
-		<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 -->
@@ -62,6 +60,8 @@
 
 	<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>
 
 	
@@ -71,18 +71,20 @@
 	<target name="preparedirs">
 		<mkdir dir="${build}"/>
 		<mkdir dir="${build.lib}"/>
-		<mkdir dir="${build.classes}"/>
-		<mkdir dir="${build.test}"/>
+		<mkdir dir="${build.classes.java}"/>
+		<mkdir dir="${build.classes.test}"/>
 		<mkdir dir="${build.web}"/>				
 	</target>
 
 
 	<target name="clean" depends="preparedirs" description="removes all class files">
 		<delete>
-			<fileset dir="${build.classes}"/>
+			<fileset dir="${build.classes.java}"/>
+			<fileset dir="${build.classes.test}"/>
+			<fileset dir="${build.lib}"/>
 		</delete>
-		<mkdir dir="${build.classes}"/>	
-		<delete dir="${build.lib}"/>
+		<mkdir dir="${build.classes.java}"/>	
+		<mkdir dir="${build.classes.test}"/>	
 		<mkdir dir="${build.lib}"/>
 	</target>
 
@@ -93,25 +95,24 @@
 	<target name="compile" depends="clean" description="compile java sources">
  	   <!--<property name="cp" refid="project.classpath"/>
 	   <echo message="Classpath is ${cp}"/> -->
-		<javac srcdir="${src.java}" compiler="modern"
-	         	 	destdir="${build.classes}" deprecation="on" debug="on">
+		<javac srcdir="${src.java.dir}" compiler="modern"
+	         	 	destdir="${build.classes.java}" deprecation="on" debug="on">
 			<classpath>
-				<!--pathelement location="${build.classes.java}"/-->
 				<path refid="project.classpath"/>
 			</classpath>
 		</javac>
 		<!-- Spring files -->
-		<copy overwrite="yes" todir="${build.classes}/org/lamsfoundation/lams/">
-				<fileset dir="${src.java}/org/lamsfoundation/lams/">
+		<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>
 	</target>
 
 	<target name="compile.test" depends="compile">
-		<javac destdir="${build.test}" compiler="modern">
-			<src path="${src.test.java}"/>
+		<javac destdir="${build.classes.test}" compiler="modern">
+			<src path="${src.test.dir}"/>
 			<classpath>
 				<path refid="project.classpath"/>
 			</classpath>
@@ -120,7 +121,7 @@
 	
 	<target name="copyContext">
 		<copy overwrite="yes" todir="${build.web}">
-			<fileset dir="${web}">
+			<fileset dir="${conf.web.dir}">
 				<include name="**/*.xml"/>
 				<include name="**/*.tld"/>
 			</fileset>
@@ -132,10 +133,10 @@
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
 	<target name="build-war" depends="webdoclet,build-jar" description="creates war file">
 		<delete file="${build.lib}/${product}.war"/>
-		<copy overwrite="yes" file="${web}/css/aqua.css" tofile="${web}/css/default.css"/>
+		<copy overwrite="yes" file="${conf.web.dir}/css/aqua.css" tofile="${conf.web.dir}/css/default.css"/>
 		<war warfile="${build.lib}/${product}.war" manifest="${conf.dir}/war/META-INF/MANIFEST.MF"
-  				webxml="${webinf}/web.xml">
-			<webinf dir="${webinf}">
+  				webxml="${conf.webinf.dir}/web.xml">
+			<webinf dir="${conf.webinf.dir}">
 				<include name="*.xml"/>
 				<include name="*.tld"/>
 				<include name="*.properties"/>
@@ -144,8 +145,8 @@
 				<include name="tiles/**"/>
 				<exclude name="web.xml"/>
 			</webinf>
-			<classes dir="${build.classes}"/>				
-			<fileset dir="${web}">
+			<classes dir="${build.classes.java}"/>				
+			<fileset dir="${conf.web.dir}">
 				<include name="*"/>
 				<include name="css/*"/>
 				<include name="includes/**"/>
@@ -164,8 +165,8 @@
 	<target name="build-jar" depends="compile,copyContext" 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}"/>
-			<fileset dir="${build.test}"/>
+			<fileset dir="${build.classes.java}"/>
+			<fileset dir="${build.classes.test}"/>
 			<fileset dir="${build.web}"/>
 		</jar>
 	</target>
@@ -180,13 +181,13 @@
 				<formatter type="plain" usefile="false"/>
 				<formatter type="xml"/>
 				<batchtest todir="${build.report}">
-					<fileset dir="${src.test.java}">
+					<fileset dir="${src.test.dir}">
 						<include name="**/Test*.java"/>
 					</fileset>
 				</batchtest>			
 				<classpath>
-					<pathelement location="${build.classes}"/>
-					<pathelement location="${build.test}"/>
+					<pathelement location="${build.classes.java}"/>
+					<pathelement location="${build.classes.test}"/>
 					<pathelement location="${build.web}"/>
 					<path refid="project.classpath"/>
 				</classpath>			
@@ -212,7 +213,7 @@
 
 	<target name="webdoclet" depends="preparedirs">
 		<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
-	         <fileset dir="${src.java}">
+	         <fileset dir="${src.java.dir}">
 	            <include name="**/*Servlet.java" />
 	            <include name="**/*Action.java" />
 	            <include name="**/*ActionForm.java" />
@@ -221,14 +222,14 @@
 
 	         <deploymentdescriptor 
 	         				servletspec="2.3" 
-	         				destdir="${webinf}"
-				         	mergedir="${conf.xdoclet}"
+	         				destdir="${conf.webinf.dir}"
+				         	mergedir="${conf.xdoclet.dir}"
 	         				sessiontimeout="${sessiontimeout}"/>
 			
 	         <strutsconfigxml 
-	         				destdir="${webinf.struts}"
+	         				destdir="${conf.struts.dir}"
 	         				version="1.2" 
-	         				mergedir="${conf.xdoclet}"/>
+	         				mergedir="${conf.xdoclet.dir}"/>
 			 
 			 <jsptaglib jspversion="1.1"
 						taglibversion="1.0"
@@ -237,8 +238,8 @@
 					 	description="LAMS custom tags"
 			 			filename="lams.tld"
 					 	validatexml="true"
-						destdir="${webinf}"
-        				mergedir="${conf.xdoclet}"/>
+						destdir="${conf.webinf.dir}"
+        				mergedir="${conf.xdoclet.dir}"/>
 	     </webdoclet>
 	</target>
 		
Index: lams_learning/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/build.properties,v
diff -u -r1.5 -r1.6
--- lams_learning/build.properties	3 Jun 2005 03:35:08 -0000	1.5
+++ lams_learning/build.properties	1 Nov 2005 01:29:57 -0000	1.6
@@ -1,4 +1,4 @@
-# Ant properties for building the lams survey tool
+# Ant properties for building the learning module
 
 #name of this project
 name=lams_learning
@@ -9,38 +9,6 @@
 lib.dir=${basedir}/lib
 #lib.dir=${basedir}/web/WEB-INF/lib
 
-# Source directory under the current root
-src.dir=${basedir}/src
-src.dir.java=${src.dir}/java
-src.dir.test=${basedir}/test/java
-
-# Build directory
-build=${basedir}/build
-build.classes.java=${build}/classes/java
-build.classes.test=${build}/classes/test
-build.lib=${build}/lib
-build.report=${build}/report
-
-sharedlib=../lams_build/lib
-j2eelibs=C:/Program Files/MyEclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4
-
-#configuration files
-conf.dir=${basedir}/conf
-conf.web.dir=${basedir}/web
-conf.webinf.dir=${conf.web.dir}/WEB-INF
-conf.struts.dir=${conf.web.dir}/WEB-INF/struts
-conf.xdoclet.dir=${conf.dir}/xdoclet
-
 #learning package definition
 learning.package=org.lamsfoundation.lams.learning
 learning.path=org/lamsfoundation/lams/learning
-
-#xdoclet version number
-xdoclet.version=1.2.2
-
-#web application properties
-sessiontimeout=120
-
-#Gui or not?
-gui=true
-
Index: lams_learning/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/build.xml,v
diff -u -r1.12 -r1.13
--- lams_learning/build.xml	31 Oct 2005 05:24:58 -0000	1.12
+++ lams_learning/build.xml	1 Nov 2005 01:29:57 -0000	1.13
@@ -26,14 +26,16 @@
 
 <project name="lams_learning" default="usage" basedir=".">
 
-	<property file="build.properties" />
+	<!-- import properties from the specified file -->
+	<property file="build.properties"/>
+	<property file="../lams_build/common.properties"/>
 
 	<path id="all-libs">
 		<fileset dir="${sharedlib}">
 			<include name="**/*.jar"/>
 		</fileset>
 		<fileset dir="${j2eelibs}">
-				<include name="**/*.jar"/>
+			<include name="**/*.jar"/>
 		</fileset>
 	</path>
 
@@ -91,25 +93,25 @@
 
 	<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.test}/${learning.path}">
-			<fileset dir="${src.dir.java}/${learning.path}">
+			<fileset dir="${src.java.dir}/${learning.path}">
 				<include name="*.xml" />
 			</fileset>
 		</copy>
   		<copy overwrite="yes" todir="${build.classes.java}/${learning.path}">
-  			<fileset dir="${src.dir.java}/${learning.path}">
+  			<fileset dir="${src.java.dir}/${learning.path}">
   				<include name="**/*.properties"/>
 				<include name="**/*.xml"/>
   			</fileset>
@@ -118,14 +120,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.test}">
-			<fileset dir="${src.dir.test}">
+			<fileset dir="${src.test.dir}">
 				<include name="**/*.xml"/>
 			</fileset>
 		</copy>
@@ -202,7 +204,7 @@
 			excludedtags="@version,@author,@todo" force="${generated.forced}"
 			verbose="true">
 
-			<fileset dir="${src.dir.java}">
+			<fileset dir="${src.java.dir}">
 				<include name="${survey.path}/*.java" />
 			</fileset>
 			<hibernate version="3.0" />
@@ -215,11 +217,11 @@
 		<webdoclet destdir="${generated.java}"
 			force="${xdoclet.force}">
 
-			<fileset dir="${src.dir.java}">
+			<fileset dir="${src.java.dir}">
 				<include name="**/web/action/*.java" />
 				<include name="**/web/form/*.java" />
 			</fileset>
-			<fileset dir="${src.dir.test}">
+			<fileset dir="${src.test.dir}">
 				<include name="**/web/action/*.java" />
 				<include name="**/web/form/*.java" />
 			</fileset>
@@ -279,7 +281,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="**/Test*.java" />
 					<exclude name="**/*Action.java" />
 					<exclude name="**/*Form.java" />
Index: lams_monitoring/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/build.properties,v
diff -u -r1.4 -r1.5
--- lams_monitoring/build.properties	3 Jun 2005 03:20:11 -0000	1.4
+++ lams_monitoring/build.properties	1 Nov 2005 01:30:22 -0000	1.5
@@ -5,49 +5,7 @@
 product=lams-monitoring
 version=1.1
 
-# Library directory within project. Where third party jars reside.
-lib.dir=${basedir}/lib
-
-sharedlib=../lams_build/lib
-j2eelibs=C:/Program Files/MyEclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4
-
-# Source directory under the current root
-src.dir=${basedir}/src
-src.dir.java=${src.dir}/java
-src.dir.test=${basedir}/test/java
-
-# Build directory
-build=${basedir}/build
-build.classes.java=${build}/classes/java
-build.classes.test=${build}/classes/test
-build.lib=${build}/lib
-build.report=${build}/report
-
-
-#configuration files
-conf.dir=${basedir}/conf
-conf.web.dir=${basedir}/web
-conf.webinf.dir=${conf.web.dir}/WEB-INF
-conf.xdoclet.dir=${conf.dir}/xdoclet
-conf.struts.dir=${conf.web.dir}/WEB-INF/struts
-
 #monitoring package definition
 monitoring.package=org.lamsfoundation.lams.monitoring
 monitoring.path=org/lamsfoundation/lams/monitoring
 
-#database access
-db.name=lams1
-db.driver=com.mysql.jdbc.Driver
-db.url=jdbc:mysql://localhost/${db.name}
-db.username=lams
-db.password=lamsdemo
-db.driver.jar=${lib.dir}/mysql/mysql-connector-java-3.1.7-bin.jar
-db.scripts=${basedir}/db/sql
-
-#xdoclet version number
-xdoclet.version=1.2.2
-
-#web application properties
-sessiontimeout=120
-
-
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" /> -->