Index: lams_common/build.xml
===================================================================
diff -u -rb4845f7d399ba30abae7fe66f3cc6446e079f3c6 -r71d1ff69d56ec38b525fab3a282fa29c1d163e5a
--- lams_common/build.xml	(.../build.xml)	(revision b4845f7d399ba30abae7fe66f3cc6446e079f3c6)
+++ lams_common/build.xml	(.../build.xml)	(revision 71d1ff69d56ec38b525fab3a282fa29c1d163e5a)
@@ -282,8 +282,18 @@
 	<!-- =================================================================== -->
 	<!-- Clean and rebuild the database. Also cleans out content repository  -->
 	<!-- =================================================================== -->
-	<target name="rebuild-db"
+	<target name="rebuild-db" depends="preparedirs"
 		description="rebuild LAMS 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}" />
+			</fileset>
+	        <filterset>
+	            <filter token="datetimestamp" value="${DSTAMP}${TSTAMP}"/>
+	        </filterset>
+		</copy>
+
 		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
 				password="${db.password}" encoding="${db.encoding}">
 			<classpath>
@@ -296,14 +306,13 @@
 			<transaction src="${db.scripts}/create_integration_tables.sql"/>
 			<transaction src="${db.scripts}/insert_users.sql"/> 
 			<transaction src="${db.scripts}/insert_types_data.sql"/>
+			<transaction src="${build}/${lamsconf.table.sql}"/>
 			<!-- Create Quartz table --> 
 	    	<transaction src="${db.scripts}/create_quartz_table.sql"/>
 			<!-- Create tables for Core Notebook Service -->
 			<transaction src="${db.scripts}/create_notebook_tables.sql"/>
-			
-			<!-- Test the scripts for translations
-            <transaction src="${db.scripts}/shaun/all.sql"/>
-            -->
+			<!-- Test the scripts for translations -->
+            <!-- <transaction src="${db.scripts}/shaun/all.sql"/> -->
 		</sql>
 		
 		<delete dir="${contentrepository.directory}"/>