Index: lams_common/build.xml
===================================================================
diff -u -r71ff446b60d26d2101ef0dd76df844e87358a012 -r4b196cccfe15e110611808070d9387e0bb35a8d9
--- lams_common/build.xml	(.../build.xml)	(revision 71ff446b60d26d2101ef0dd76df844e87358a012)
+++ lams_common/build.xml	(.../build.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -5,217 +5,128 @@
 Ant build file. 
 -->
 <!DOCTYPE project [
-    <!ENTITY database SYSTEM "file:./conf/middlegen/mysql.xml">
+	<!ENTITY properties SYSTEM "file:./properties.xml">
 ]>
 
+<project name="LAMS" basedir="." default="usage">
 
-<project name="Middlegen Hibernate" default="all" basedir=".">
-	
-   <property name="name" value="learningdesign"/>	
-   <property name="script_file" value="create_lams_11_tables"/>
-	
-   <property name="middlegen.dir" value="${basedir}/conf/middlegen"/>	
-	
-   <property name="gui"                            value="true"/>
-   <property name="unique.name"                    value="${name}"/>
-   <property name="lib.dir"                        value="${basedir}/lib"/>	
-   <property name="script.dir"                     value="${basedir}/db/sql"/>   
-   <property name="src.dir"                        value="${basedir}/src"/>
-   <property name="java.src.dir"                   value="${src.dir}/java/com/lamsinternational/lams"/>
-   <property name="java.src.learningdesign.dir"  value="${java.src.dir}/learningdesign"/>  	
-   <property name="web.src.dir"                    value="${basedir}/web/WEB-INF"/>
-   <property name="conf.dir"                      value="${basedir}/conf"/>
-   <property name="hibernate.dir"				  value="${conf.dir}/hibernate"/>	
-   <property name="mappings.dir"                 value="${hibernate.dir}/mappings"/>
-   <property name="learningdesign.dir"			  value="${mappings.dir}/learningdesign"/>	
-    	
-   &database;
-   
-   <!-- define the datasource.jndi.name in case the imported ejb file doesn't -->
-   <property name="datasource.jndi.name"           value="${name}/datasource"/>
+	<!-- import properties from the specified file -->
+	&properties;
 
-   <path id="lib.class.path">
-      <pathelement path="${database.driver.classpath}"/>
-      <fileset dir="${lib.dir}">
-         <include name="**/*.jar"/>
-      </fileset>
-   </path>
+	<path id="all-libs">
+		<fileset dir="${lib.dir}">
+			<include name="**/*.jar"/>
+		</fileset>
+	</path>
 
-   <target name="init">
-      <available property="xdoclet1.2+" classname="xdoclet.modules.hibernate.HibernateDocletTask" classpathref="lib.class.path"/>
-   </target>
+	<target name="usage">
+		<echo message=""/>
+		<echo message="${project.name} build file"/>
+		<echo message="------------------------------------------------------"/>
+		<echo message=""/>
+		<echo message="Among the available targets are:"/>
+		<echo message=""/>
+		<echo message="middlegen-learningdesign    --> Run middlegen for learningdesign tables"/>
+		<echo message="hbm2java-learningdesign  --> Run hbm2java for learningdesign mapping files"/>
+		<echo message=""/>
+	</target>
 
-   <!-- =================================================================== -->
-   <!-- Fails if XDoclet 1.2.x is not on classpath                          -->
-   <!-- =================================================================== -->
-   <target name="fail-if-no-xdoclet-1.2" unless="xdoclet1.2+">
-      <fail>
-      You must download several jar files before you can build Middlegen.
-      </fail>
-   </target>
+	<target name="init">
+		<available property="xdoclet-jars-installed" file="lib/xdoclet/xdoclet-${xdoclet.version}.jar"/>
+	</target>
 
-   <!-- =================================================================== -->
-   <!-- Create tables                                                       -->
-   <!-- =================================================================== -->
-   <target 
-      name="create-tables" 
-      depends="init,fail-if-no-xdoclet-1.2,check-driver-present,panic-if-driver-not-present" 
-      description="Create tables"
-   >
-      <echo>Creating tables using URL ${database.url}</echo>
-      <sql
-         classpath="${database.driver.classpath}"
-         driver="${database.driver}"
-         url="${database.url}"
-         userid="${database.userid}"
-         password="${database.password}"
-         src="${database.script.file}"
-         print="true"
-         output="result.txt"
-      />
-   </target>
-   <target name="check-driver-present">
-      <available file="${database.driver.file}" 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 ${middlegen.dir}
-      doesn't exist. You have to download this driver separately and put it in ${database.driver.file}
-      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
-      in the ${middlegen.dir}/xxx.xml file accordingly.
-      </fail>
-   </target>
+	<!-- =================================================================== -->
+	<!-- Fails if XDoclet 1.2.x is not on classpath                          -->
+	<!-- =================================================================== -->
+	<target name="fail-if-no-xdoclet-1.2.x" unless="xdoclet-jars-installed">
+		<fail>
+	      You must download several jar files before you can build Middlegen.
+	      Execute the "download-deps" target. Then try to build again.
 
-   <!-- =================================================================== -->
-   <!-- Run Middlegen                                                       -->
-   <!-- =================================================================== -->
-   <target 
-      name="middlegen" 
-      description="Run Middlegen" 
+	      If you are behind a proxy, you should define the properties
+	      http.proxyHost and http.proxyPort. Example:
+	      
+	      ant -Dhttp.proxyHost=foo.com -Dhttp.proxyPort=8080
+	      
+	      It's also possible to download the jars manually.
+	     </fail>
+	</target>
+
+	<target name="check-driver-present">
+		<available file="${database.driver.file}" 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}
+	      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
+	      in the ${basedir}/config/database/xxx.xml file accordingly.
+	     </fail>
+	</target>
+
+
+	<!-- =================================================================== -->
+	<!-- Run Middlegen For LearningDesign                                                       -->
+	<!-- =================================================================== -->
+	<target 
+      name="middlegen-learningdesign" 
+      description="Run Middlegen For LearningDesign" 
       unless="middlegen.skip"
-      depends="init,fail-if-no-xdoclet-1.2,check-driver-present,panic-if-driver-not-present"
-   >
-   	  <mkdir dir="${learningdesign.dir}"/>
-   	
-      <taskdef
-         name="middlegen"
+      depends="init,fail-if-no-xdoclet-1.2.x,check-driver-present,panic-if-driver-not-present"
+    >
+		<taskdef
+         name="middlegen-learningdesign"
          classname="middlegen.MiddlegenTask"
-         classpathref="lib.class.path"
-      />
+         classpathref="all-libs"
+        />
 
-      <middlegen
-         appname="${name}"
+		<middlegen-learningdesign
+         appname="learningdesign"
          prefsdir="${middlegen.dir}"
          gui="${gui}"
          databaseurl="${database.url}"
-         initialContextFactory="${java.naming.factory.initial}"
-         providerURL="${java.naming.provider.url}"
-         datasourceJNDIName="${datasource.jndi.name}"
          driver="${database.driver}"
          username="${database.userid}"
          password="${database.password}"
          schema="${database.schema}"
          catalog="${database.catalog}"
-      >
+         includeViews="false"
+        >
 
-         <!--
-         We can specify what tables we want Data generated for.
-         If none are specified, Data will be generated for all tables.
-         Comment out the <table> elements if you want to generate for all tables.
-         Also note that table names are CASE SENSITIVE for certain databases,
-         so on e.g. Oracle you should specify table names in upper case.
-         -->
-         <!--table generate="true" name="flights" pktable="flights_pk"/-->
+			<hibernate 
+			destination="${hbm.dir}"
+			package="${package.learningdesign.name}"
+            genXDocletTags="true"
+            javaTypeMapper="middlegen.plugins.hibernate.HibernateJavaTypeMapper"
+            />
 
-      	 <table name="lams_learning_activity"/>  	      	
-		 <table name="lams_learning_design"/>
-     	 <table name="lams_learning_library"/>      	
-         <table name="lams_learning_transition"/>		
-      	 <table name="lams_group"/>      	
-      	 <table name="lams_grouping"/>      	
+			<table name="lams_learning_activity"/>
+			<table name="lams_learning_design"/>
+			<table name="lams_learning_library"/>
+			<table name="lams_learning_transition"/>
+			<table name="lams_group"/>
+			<table name="lams_grouping"/>
 
-         <!--
-         If you want m:n relations, they must be specified like this.
-         Note that tables declare in multiple locations must all have
-         the same value of the generate attribute.
-         -->
-         <!--many2many>
-            <tablea generate="true" name="persons"/>
-            <jointable name="reservations" generate="false"/>
-            <tableb generate="true" name="flights"/>
-         </many2many-->
+		</middlegen-learningdesign>
 
+	</target>
 
-         <!-- Plugins - Only Hibernate Plugin has been included with this special distribution  -->
-         
-         <!--
-         If you want to generate XDoclet markup for hbm2java to include in the POJOs then
-         set genXDocletTags to true. Also, composite keys are generated as external classes which is
-         recommended. If you wish to keep them internal then set genIntergratedCompositeKeys to true.
-         Since r4 the ability to customise the selection of JavaTypes is now provided. The is a 
-         recommended type mapper provided as shown. It is optional - if not provided then Middlegen
-         itself will select the Java mapping (as it did previously).
-         These settings are optional thus if they are not define here values default to false.
-         -->
-         <hibernate
-         	destination="${learningdesign.dir}"
-            package="com.lamsinternational.lams.learningdesign"
-            genXDocletTags="true"
-            genIntergratedCompositeKeys="false"
-            javaTypeMapper="middlegen.plugins.hibernate.HibernateJavaTypeMapper"
-         />
-         
-      </middlegen>      
-   </target>
-
-	
-   <!-- =================================================================== -->
-   <!-- Compile business logic (hibernate)                                        -->
-   <!-- =================================================================== -->
-   <target name="compile-hibernate" depends="middlegen" description="Compile hibernate Business Domain Model">
-      <javac
-      	srcdir ="${script.dir}"
-      	destdir="${learningdesign.dir}"
-   		classpathref="lib.class.path"
-   	>   	
-         <include name="**/hibernate/**/*"/>
-      </javac>
-   </target>
-   
-   <!-- =================================================================== -->
-   <!-- Run hbm2java    depends="middlegen"                                 -->
-   <!-- =================================================================== -->
-   <target name="hbm2java" description="Generate .java from .hbm files.">
-      <taskdef
-         name="hbm2java"
+	<!-- =================================================================== -->
+	<!-- Run hbm2java for learningdesign                                                       -->
+	<!-- =================================================================== -->
+	<target name="hbm2java-learningdesign" description="Generate .java from .hbm files.">
+		<taskdef
+         name="hbm2java-learningdesign"
          classname="net.sf.hibernate.tool.hbm2java.Hbm2JavaTask"
-         classpathref="lib.class.path"
+         classpathref="all-libs"
       />
-		
-	<hbm2java output="${src.dir}/java">
-			<fileset dir="${learningdesign.dir}/com/lamsinternational/lams/learningdesign">
+		<hbm2java-learningdesign output="${src.java.dir}">
+			<fileset dir="${hbm.dir}/${package.learningdesign.dir}">
 				<include name="*.hbm.xml"/>
-				<!--include name="**/*.hbm.xml"/-->
 			</fileset>
-	</hbm2java>
-   </target>
-   <target name="cleanup" description="Gets rid of the package structure for hbm files">   		
-   		<copy todir="${learningdesign.dir}">
-   			<fileset dir="${learningdesign.dir}/com/lamsinternational/lams/learningdesign"></fileset>
-   		</copy>   		
-   		<delete dir="${learningdesign.dir}/com"/>
-   </target>
+		</hbm2java-learningdesign>
+	</target>
 
-   <!-- =================================================================== -->
-   <!-- Build everything                                                    -->
-   <!-- =================================================================== -->
-   <target name="all" description="Build everything" depends="compile-hibernate"/>
-
-   <!-- =================================================================== -->
-   <!-- Clean everything                                                    -->
-   <!-- =================================================================== -->
-   <target name="clean" description="Clean all generated stuff">
-      <delete dir="${conf.dir}"/>
-   </target>
 </project>
+