Index: lams_common/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/build.xml,v
diff -u -r1.56.2.1 -r1.56.2.2
--- lams_common/build.xml	25 May 2007 05:42:06 -0000	1.56.2.1
+++ lams_common/build.xml	7 Jun 2007 01:28:41 -0000	1.56.2.2
@@ -301,14 +301,16 @@
 	<!-- Clean and rebuild the database. Also cleans out content repository  -->
 	<!-- =================================================================== -->
 	<target name="rebuild-db" depends="preparedirs"
-		description="rebuild LAMS database and clean out content repository. Mysql has to be running first">
+		description="rebuild LAMS/RAMS database and clean out content repository. Mysql has to be running first">
 		<tstamp/>
 		<copy overwrite="yes" todir="${build}">
 			<fileset dir="${db.scripts}/">
 				<include name="${lamsconf.table.sql}" />
+                <include name="create_lams_11_db.sql" />
 			</fileset>
 	        <filterset>
 	            <filter token="datetimestamp" value="${DSTAMP}${TSTAMP}"/>
+                    <filter token="dbname" value="${db.name}"/>
 	        </filterset>
 		</copy>
 
@@ -317,13 +319,12 @@
 			<classpath>
 				<pathelement location="${db.driver.jar}"/>
 			</classpath>
-			<transaction src="${db.scripts}/create_lams_11_db.sql"/>
+			<transaction src="${build}/create_lams_11_db.sql"/>
 			<transaction src="${db.scripts}/drop_lams_11_tables.sql"/>
 			<transaction src="${db.scripts}/create_lams_11_tables.sql"/>
 			<!-- Create tables for LAMS and other application's integration -->
 			<transaction src="${db.scripts}/create_integration_tables.sql"/>
-			<transaction src="${db.scripts}/create_sharedlesson_tables.sql"/>
-			<transaction src="${db.scripts}/insert_users.sql"/> 
+			<transaction src="${db.scripts}/insert_${conf.application}_users.sql"/> 
 			<transaction src="${db.scripts}/insert_types_data.sql"/>
 			<transaction src="${build}/${lamsconf.table.sql}"/>
 			<!-- Create Quartz table --> 
@@ -332,9 +333,13 @@
 			<transaction src="${db.scripts}/create_notebook_tables.sql"/>
 			<!-- Test the scripts for translations -->
             <!-- <transaction src="${db.scripts}/shaun/all.sql"/> -->
+			<!-- Create LAMS federation tables -->
+			<transaction src="${db.scripts}/create_sharedlesson_tables.sql"/>
 		</sql>
 		
 		<delete dir="${contentrepository.directory}"/>
+		
+        <delete file="${build}/create_lams_11_db.sql"/>
 	</target>
 
 	<!-- =================================================================== -->
@@ -411,7 +416,7 @@
 	</target>
 	
 	<!-- =================================================================== -->
-	<!-- Generate ConfigurationItem hibernate xml files                             	 -->
+	<!-- Generate Notebook hibernate xml files                             	 -->
 	<!-- =================================================================== -->
 	<target name="generate-config-hbm-file" description="Generate the hibernate hbm.xml files from the Java source (using XDoclet)">
 
@@ -428,21 +433,6 @@
 	</target>
 	
 	<!-- =================================================================== -->
-	<!-- Generate Federation hibernate xml files                      -->
-	<!-- =================================================================== -->
-	<target name="generate-federation-hbm-file" description="Generate the hibernate hbm.xml files from the Java source (using XDoclet)">
-			<taskdef name="hibernatedoclet" classname="xdoclet.modules.hibernate.HibernateDocletTask" classpathref="all-libs" />
-			<echo message="Building hbm.xml files using XDoclet" />
-			<hibernatedoclet destdir="${conf.hibernate.mapping.dir}" excludedtags="@version,@author,@todo" force="true" verbose="true">
-			<fileset dir="${src.java.dir}">
-				<include name="**/FederationServer.java" />
-				<include name="**/FederationLesson.java" />
-			</fileset>
-			<hibernate version="3.0" />
-		</hibernatedoclet>
-	</target>
-	
-	<!-- =================================================================== -->
 	<!-- Notebook Schema export				                             	 -->
 	<!-- =================================================================== -->
 	<path id="schemaexport.classpath">