Index: lams_common/build.xml
===================================================================
diff -u -rbdf66e21388f7f5bf777b250b788ba9c23c8f8bc -rb463a05bbf22f9ae4ed2382974ea2f79d8b4709f
--- lams_common/build.xml	(.../build.xml)	(revision bdf66e21388f7f5bf777b250b788ba9c23c8f8bc)
+++ lams_common/build.xml	(.../build.xml)	(revision b463a05bbf22f9ae4ed2382974ea2f79d8b4709f)
@@ -5,20 +5,21 @@
 Ant build file. 
 -->
 <!DOCTYPE project [
-	<!ENTITY properties SYSTEM "file:./properties.xml">
+	<!ENTITY properties SYSTEM "file:./pr{conoperties.xml">
 ]>
 
 <project name="LAMS" basedir="." default="usage">
 
 	<!-- import properties from the specified file -->
-	&properties;
+	<property file="build.properties"/>
+	<property file="../lams_build/common.properties"/>
 	
 	<path id="all-libs">
-		<fileset dir="${lib}">
+		<fileset dir="${sharedlib}">
 			<include name="**/*.jar"/>
 		</fileset>
 		<fileset dir="${j2eelibs}">
-				<include name="**/*.jar"/>
+			<include name="**/*.jar"/>
 		</fileset>
 	</path>
 	
@@ -68,14 +69,14 @@
 	</target>
 
 	<target name="check-driver-present">
-		<available file="${database.driver.file}" type="file" property="driver.present"/>
+		<available file="${db.driver.jar}" type="file" 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}
+	      doesn't exist. You have to download this driver separately and put it in ${db.driver.jar}
 	      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
+	      If you name the driver jar file differently, please update the database.driver.jar property
 	      in the ${basedir}/config/database/xxx.xml file accordingly.
 	     </fail>
 	</target>
@@ -99,18 +100,18 @@
 		<middlegen-learningdesign
          appname="learningdesign"
          prefsdir="${middlegen}"
-         gui="${gui}"
-         databaseurl="${database.url}"
-         driver="${database.driver}"
-         username="${database.userid}"
-         password="${database.password}"
-         schema="${database.schema}"
-         catalog="${database.catalog}"
+         gui="${middlegen.gui}"
+         databaseurl="${db.url}"
+         driver="${db.driver}"
+         username="${db.username}"
+         password="${db.password}"
+         schema="${db.schema}"
+         catalog="${db.catalog}"
          includeViews="false"
         >
 
 			<hibernate 
-			destination="${hbm}"
+			destination="${conf.hibernate.mapping.dir}"
 			package="${package.learningdesign.name}"
             genXDocletTags="true"
             javaTypeMapper="middlegen.plugins.hibernate.HibernateJavaTypeMapper"
@@ -136,7 +137,7 @@
          classname="net.sf.hibernate.tool.hbm2java.Hbm2JavaTask"
          classpathref="all-libs"
       />
-		<hbm2java-learningdesign output="${src.java}">
+		<hbm2java-learningdesign output="${src.java.dir}">
 			<fileset dir="${hbm}/${package.learningdesign}">
 				<include name="*.hbm.xml"/>
 			</fileset>
@@ -150,57 +151,49 @@
 	<!-- ================================================================ -->
 	<!-- Preparations									                  -->
 	<!-- ================================================================ -->
-	<target name="makeconfdir-windows">
-		<delete quiet="true">
-			<fileset dir="${lamsconf.windows}"/>
-		</delete>
-		<mkdir dir="${lamsconf.windows}"/>
-	</target>
-	
 	<target name="preparedirs">
 		<mkdir dir="${build}"/>
-		<mkdir dir="${build.classes}"/>
-		<mkdir dir="${build.test}"/>
+		<mkdir dir="${build.classes.java}"/>
+		<mkdir dir="${build.classes.test}"/>
 		<mkdir dir="${build.lib}"/>
 	</target>
 
-
 	<target name="clean" depends="preparedirs" description="removes all class files">
 		<delete>
-			<fileset dir="${build.classes}"/>
+			<fileset dir="${build.classes.java}"/>
 			<fileset dir="${build.lib}"/>
 		</delete>
-		<mkdir dir="${build.classes}"/>
+		<mkdir dir="${build.classes.java}"/>
 		<mkdir dir="${build.lib}"/>
 	</target>
 
 	<target name="compile" depends="clean" description="compile java sources">
-		<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}"/>
+				<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>
-				<pathelement location="${build.classes}"/>
+				<pathelement location="${build.classes.java}"/>
 				<path refid="project.classpath"/>
 			</classpath>
 		</javac>
-		<copy overwrite="yes" todir="${build.test}">
-			<fileset dir="${src.test.java}">
+		<copy overwrite="yes" todir="${build.classes.test}">
+			<fileset dir="${src.test.dir}">
 				<include name="**/*.xml"/>
 				<include name="**/*.zip"/>
 				<include name="**/*.properties"/>
@@ -229,8 +222,8 @@
 	<target name="lams-jar" depends="compile,compile.test,copyContext" description="creates jar file">
 		<delete file="${build.lib}/${product}.jar"/>
 		<jar jarfile="${build.lib}/${product}.jar">
-			<fileset dir="${build.classes}"/>
-			<fileset dir="${hbm}"/>
+			<fileset dir="${build.classes.java}"/>
+			<fileset dir="${conf.hibernate.mapping.dir}"/>
 			<fileset dir="${build.web}"/>
 		</jar>
 	</target>
@@ -267,45 +260,45 @@
 	<!-- =================================================================== -->
 	<!-- Deploy the project on windows                                       -->
 	<!-- =================================================================== -->
-	<target name="deploy-lams-windows" depends="lams-jar,lams-war">
+	<target name="deploy-lams-jar" depends="lams-jar">
 		<delete quiet="true">
-			<fileset dir="${jboss.deploy.windows}/tmp"/>
-			<fileset dir="${jboss.deploy.windows}/work"/>
+			<fileset dir="${jboss.deploy}/tmp"/>
+			<fileset dir="${jboss.deploy}/work"/>
 		</delete>
 		<copy file="${build.lib}/${product}.jar"
-				todir="${jboss.deploy.windows}"/>
+				todir="${jboss.deploy}"/>
 		<copy file="${build.lib}/${product}.war"
-				todir="${jboss.deploy.windows}"/>
+				todir="${jboss.deploy}"/>
 	</target>
 
 	<!-- =================================================================== -->
 	<!-- Clean and rebuild the database. Also cleans out content repository  -->
 	<!-- =================================================================== -->
 	<target name="rebuild-db"
 		description="rebuild LAMS database and clean out content repository. Mysql has to be running first">
-		<sql driver="${database.driver}" url="${database.url}" userid="${database.userid}"
-				password="${database.password}">
+		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
+				password="${db.password}">
 			<classpath>
-				<pathelement location="${database.driver.file}"/>
+				<pathelement location="${db.driver.jar}"/>
 			</classpath>
-			<transaction src="${sql}/drop_lams_11_tables.sql"/>
-			<transaction src="${sql}/create_lams_11_tables.sql"/>
-			<transaction src="${sql}/insert_types_data.sql"/>
+			<transaction src="${db.scripts}/drop_lams_11_tables.sql"/>
+			<transaction src="${db.scripts}/create_lams_11_tables.sql"/>
+			<transaction src="${db.scripts}/insert_types_data.sql"/>
 		</sql>
-		<delete quiet="true" dir ="${contentrepository.location}"/>
+		<delete dir="${contentrepository.location}"/>
 	</target>
 
 	<!-- =================================================================== -->
 	<!-- Insert test data to lams database                                   -->
 	<!-- =================================================================== -->
 	<target name="insert-test-data" depends="rebuild-db"
 		description="insert test data to lams database">
-		<sql driver="${database.driver}" url="${database.url}" userid="${database.userid}"
-				password="${database.password}">
+		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
+				password="${db.password}">
 			<classpath>
-				<pathelement location="${database.driver.file}"/>
+				<pathelement location="${db.driver.jar}"/>
 			</classpath>
-			<transaction src="${sql}/insert_test_data.sql"/>
+			<transaction src="${db.scripts}/insert_test_data.sql"/>
 		</sql>
 	</target>
 	<!-- =================================================================== -->
@@ -321,26 +314,21 @@
          by clicking "Add External JARS" and locating the junit.jar.         -->
 	<target name="test" depends="compile.test,insert-test-data"> 
 		<mkdir dir="${build.report}"/>
-		<copy file="${webinf}/web.xml" todir="${testwebinf}" overwrite="true"/>		
-		<copy file="${webinf}/struts/struts-config.xml" todir="${testwebinf}" overwrite="true"/>			
-		<copy file="${webinf}/tiles/tiles-defs.xml" todir="${testwebinf}/tiles" overwrite="true"/>			
 		<junit printsummary="yes" haltonerror="no" haltonfailure="no"
 			   fork="yes">
 			<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"/>
 					<exclude name="**/Test*All.java"/>
 					<exclude name="**/TestInitLesson.java"/>
 				</fileset>
 			</batchtest>
 			<classpath>
-				<pathelement location="${build.classes}"/>
-				<pathelement location="${build.test}"/>
-				<pathelement location="${hbm}"/>
-				<pathelement location="${web}"/>
-				<pathelement location="${testweb}"/>
+				<pathelement location="${build.classes.java}"/>
+				<pathelement location="${build.classes.test}"/>
+				<pathelement location="${conf.hibernate.mapping.dir}"/>
 				<path refid="project.classpath"/>
 			</classpath>
 		</junit>
@@ -365,20 +353,20 @@
 
 		<target name="webdoclet" depends="preparedirs">
 			<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
-		         <fileset dir="${src.java}">
+		         <fileset dir="${src.java.dir}">
 		            <include name="**/*Action.java" />
 		         </fileset>
 
 		         <deploymentdescriptor 
 		         				servletspec="2.3" 
 		         				destdir="${webinf}"
-					         	mergedir="${conf.xdoclet}"
+					         	mergedir="${conf.xdoclet.dir}"
 		         				sessiontimeout="${sessiontimeout}"/>
 				
 		         <strutsconfigxml 
 		         				destdir="${webinf.struts}"
 		         				version="1.2" 
-		         				mergedir="${conf.xdoclet}"/>
+		         				mergedir="${conf.xdoclet.dir}"/>
 		     </webdoclet>
 		</target>
 </project>