Index: lams_common/properties.xml
===================================================================
diff -u -r7ee5d2ab8deb8557eca2876cbe690df2e9ec08cc -r2120d8411665d27e6093d15f870f453cae43e437
--- lams_common/properties.xml	(.../properties.xml)	(revision 7ee5d2ab8deb8557eca2876cbe690df2e9ec08cc)
+++ lams_common/properties.xml	(.../properties.xml)	(revision 2120d8411665d27e6093d15f870f453cae43e437)
@@ -5,44 +5,40 @@
    	<!-- =================================================================== -->
 	
 	<!-- progect-wide properties -->
-	<property name="project.name"                  value="LAMS"/>
-	<property name="product.name"                  value="lams"/>
+	<property name="project"                  value="LAMS"/>
+	<property name="product"                  value="lams"/>
 	<property name="version"                       value="1.1"/>
 
 	<!-- xdoclet properties-->	
 	<property name="xdoclet.version"               value="1.2.2"/>
 	
 	<!-- path properties -->
-	<property name="lib.dir"                       value="${basedir}/lib"/>
-	<property name="src.dir"                       value="${basedir}/src"/>
-	<property name="src.java.dir"                  value="${basedir}/src/java"/>
-	<property name="conf.dir"                      value="${basedir}/conf"/>
-	<property name="conf.jboss.dir"                value="${conf.dir}/jboss"/>
-	<property name="hbm.dir"                       value="${conf.dir}/hibernate/mappings"/>
+	<property name="lib"                       value="${basedir}/lib"/>
+	<property name="src"                       value="${basedir}/src"/>
+	<property name="src.java"                  value="${basedir}/src/java"/>
+	<property name="conf"                      value="${basedir}/conf"/>
+	<property name="conf.jboss"                value="${conf}/jboss"/>
+	<property name="hbm"                       value="${conf}/hibernate/mappings"/>
 
 	<property name="web"                           value="${basedir}/web"/>
 	<property name="webinf"                        value="${web}/WEB-INF"/>
 	
-	<property name="jboss-home"                    value="D:/jboss-3.2.6"/>
+	<property name="jbosshome"                    value="D:/jboss-3.2.6"/>
 	
 	<property name="build"                         value="${basedir}/build"/>
 	<property name="build.classes"                 value="${build}/classes"/>
-	<property name="build.dist"                    value="${build}/dist"/>
 	<property name="build.lib"                     value="${build}/lib"/>
-	<property name="build.lib.ext"                 value="${build}/lib/ext"/>
-	<property name="build.web"                     value="${build}/web"/>
 	
-	<property name="package.dir"                   value="com/lamsinternational/lams"/>
-	<property name="package.learningdesign.dir"    value="${package.dir}/learningdesign"/>
-	<property name="package.usermanagement.dir"    value="${package.dir}/usermanagement"/>
+	<property name="package"                   value="com/lamsinternational/lams"/>
+	<property name="package.learningdesign"    value="${package}/learningdesign"/>
+	<property name="package.usermanagement"    value="${package}/usermanagement"/>
 	
 	<property name="package.name"                  value="com.lamsinternational.lams"/>
-	<property name="package.learningdesign.name"   value="${package.name}.learningdesign"/>
-	<property name="package.usermanagement.name"   value="${package.name}.usermanagement"/>
+	<property name="package.learningdesign.name"   value="${package}.learningdesign"/>
+	<property name="package.usermanagement.name"   value="${package}.usermanagement"/>
 	
 	<!--  database related properties -->
-	<property name="database.script.file"          value="${script.dir}/${script_file}.sql"/>
-	<property name="database.driver.file"          value="${lib.dir}/mysql/mysql-connector-java-3.0.16-ga-bin.jar"/>   
+	<property name="database.driver.file"          value="${lib}/mysql/mysql-connector-java-3.0.16-ga-bin.jar"/>   
 	<property name="database.driver.classpath"     value="${database.driver.file}"/>
 	<property name="database.driver"               value="org.gjt.mm.mysql.Driver"/>
 	<property name="database.url"                  value="jdbc:mysql://localhost/lams"/>
@@ -52,5 +48,5 @@
 	<property name="database.catalog"              value=""/>
 
 	<!-- middlegen properties -->
-	<property name="middlegen.dir"                 value="${conf.dir}/middlegen"/>
+	<property name="middlegen"                 value="${conf}/middlegen"/>
 	<property name="gui"                           value="true"/>	
\ No newline at end of file