Index: lams_build/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.50.2.2 -r1.50.2.3
--- lams_build/build.xml	26 Mar 2007 05:59:43 -0000	1.50.2.2
+++ lams_build/build.xml	23 Apr 2007 01:23:04 -0000	1.50.2.3
@@ -57,7 +57,7 @@
 
 
 	<!-- build sub-projects -->
-	<target name="build-subprojects"
+	<target name="build-subprojects" 
 		description="builds sub porjects">
 		<copy overwrite="yes" todir="${shareddtd}">
 			<fileset dir="${conf.auth}">
@@ -68,8 +68,7 @@
 			inheritAll="false" />
 		<ant antfile="../${lams_contentrepository}/build.xml"
 			target="build-jar" inheritAll="false" />
-		<ant antfile="../${lams_central}/build.xml" target="build-war"
-			inheritAll="false" />
+		<ant antfile="../${lams_central}/build.xml" target="build-war" inheritAll="false"/>
 		<ant antfile="../${lams_learning}/build.xml" target="build-war" inheritAll="false"/>
 		<ant antfile="../${lams_monitoring}/build.xml"  target="build-war" inheritAll="false"/>
 		<ant antfile="../${lams_admin}/build.xml" target="build-war" inheritAll="false"/>
@@ -153,7 +152,6 @@
 			<fileset dir="..">
 				<include name="${lams_common}/${sub.build.lib}/*.jar" />
 				<include name="${lams_contentrepository}/${sub.build.lib}/*.jar" />
-				<include name="${lams_central}/${sub.build.lib}/*.war" />
 				<include name="${lams_central}/${sub.build.lib}/*.jar" />
 				<include name="${lams_monitoring}/${sub.build.lib}/*.jar"/>
 				<include name="${lams_monitoring}/${sub.build.lib}/*.war"/>
@@ -164,6 +162,12 @@
 				<include name="${lams_www}/${sub.build.lib}/*.war"/>
 			</fileset>
 		</copy> 
+		<!-- lams-central.war is already expanded -->
+		<copy todir="${assembly}/temp/" failonerror="true">
+			<fileset dir="../${lams_central}/${sub.build.lib}/">
+				<include name="lams-central.war/**/*.*" />
+			</fileset>
+		</copy>		
 		<!-- Pull out all the language files -->
 		<mkdir dir="${assembly}/temp/lams-dictionary.jar" />
 		<copy todir="${assembly}/temp/lams-dictionary.jar" failonerror="true">
@@ -182,9 +186,8 @@
 		<!-- remove temp lib -->
 <!--		<delete dir="${assembly}/temp" includeEmptyDirs="true" /> -->
 		<!-- explode the ear (Why doesn't the EAR task support exploded format?) -->
+		<!-- lams-central.war is already exploded when copied -->
 		<unjar src="${assembly.temp.ear}" dest="${assembly.lams.ear}" />
-		<move file="${assembly.lams.ear}/lams-central.war" tofile="${assembly.lams.ear}/temp.war"/>
-		<unjar src="${assembly.lams.ear}/temp.war" dest="${assembly.lams.ear}/lams-central.war"/>
 		<move file="${assembly.lams.ear}/lams-www.war" tofile="${assembly.lams.ear}/temp.war"/>
 		<unjar src="${assembly.lams.ear}/temp.war" dest="${assembly.lams.ear}/lams-www.war"/>
 		<delete file="${assembly.lams.ear}/temp.war"/>
Index: lams_build/common.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_build/common.properties,v
diff -u -r1.18.4.1 -r1.18.4.2
--- lams_build/common.properties	12 Mar 2007 04:37:25 -0000	1.18.4.1
+++ lams_build/common.properties	23 Apr 2007 01:23:04 -0000	1.18.4.2
@@ -57,6 +57,9 @@
 db.schema=
 db.catalog=
 
+# db scripts
+lamsconf.table.sql=insert_${conf.application}_${osPropertiesName}_config_data.sql
+
 #xdoclet version number
 xdoclet.version=1.2.3
 
Index: lams_build/unix.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_build/unix.properties,v
diff -u -r1.10 -r1.10.4.1
--- lams_build/unix.properties	18 Oct 2006 09:13:11 -0000	1.10
+++ lams_build/unix.properties	23 Apr 2007 01:23:04 -0000	1.10.4.1
@@ -26,7 +26,6 @@
 conf.jboss=${conf}/jboss
 conf.auth=${conf}/authentication
 
-lamsconf.table.sql=insert_unix_config_data.sql
 contentrepository.directory=/var/opt/lams/repository
 
 #JBoss deploy directory (Unix)
Index: lams_build/windows.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_build/windows.properties,v
diff -u -r1.11 -r1.11.4.1
--- lams_build/windows.properties	18 Oct 2006 09:13:11 -0000	1.11
+++ lams_build/windows.properties	23 Apr 2007 01:23:04 -0000	1.11.4.1
@@ -24,7 +24,6 @@
 conf.jboss=${conf}/jboss
 conf.auth=${conf}/authentication
 
-lamsconf.table.sql=insert_windows_config_data.sql
 contentrepository.directory=C:/lams/repository
 
 #JBoss deploy directory (Windows)
Index: lams_common/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/build.xml,v
diff -u -r1.56 -r1.56.6.1
--- lams_common/build.xml	21 Nov 2006 07:09:11 -0000	1.56
+++ lams_common/build.xml	23 Apr 2007 01:26:31 -0000	1.56.6.1
@@ -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,12 +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}/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 --> 
@@ -334,6 +336,8 @@
 		</sql>
 		
 		<delete dir="${contentrepository.directory}"/>
+		
+        <delete file="${build}/create_lams_11_db.sql"/>
 	</target>
 
 	<!-- =================================================================== -->
Index: lams_common/db/sql/create_lams_11_db.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_db.sql,v
diff -u -r1.12 -r1.12.6.1
--- lams_common/db/sql/create_lams_11_db.sql	17 Aug 2006 03:54:03 -0000	1.12
+++ lams_common/db/sql/create_lams_11_db.sql	23 Apr 2007 01:26:21 -0000	1.12.6.1
@@ -1,8 +1,8 @@
 -- CVS ID: $Id$
   
 SET FOREIGN_KEY_CHECKS=0;
-DROP DATABASE IF EXISTS lams;
-CREATE DATABASE lams DEFAULT CHARACTER SET utf8;
+DROP DATABASE IF EXISTS @dbname@;
+CREATE DATABASE @dbname@ DEFAULT CHARACTER SET utf8;
 SET FOREIGN_KEY_CHECKS=1;
 
 --USE mysql;
@@ -32,6 +32,6 @@
 	
 --FLUSH PRIVILEGES;
 
-USE lams;
+USE @dbname@;
 
 SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Fisheye: Tag 1.8.6.5 refers to a dead (removed) revision in file `lams_common/db/sql/insert_unix_config_data.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.40.2.2 refers to a dead (removed) revision in file `lams_common/db/sql/insert_users.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.12.6.5 refers to a dead (removed) revision in file `lams_common/db/sql/insert_windows_config_data.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_www/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_www/build.xml,v
diff -u -r1.3 -r1.3.2.1
--- lams_www/build.xml	31 Jan 2007 02:12:15 -0000	1.3
+++ lams_www/build.xml	23 Apr 2007 01:23:17 -0000	1.3.2.1
@@ -80,6 +80,14 @@
 	<!-- Make the war archive  for deployment             -->
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
 	<target name="build-war" depends="clean, copyContext" description="creates war file">
+   		<delete file="${conf.web.dir}/images/learner.logo.swf"/>
+			<delete file="${conf.web.dir}/images/monitor.logo.swf"/>
+		<copy todir="${conf.web.dir}/images" overwrite="yes">
+			<fileset dir="${conf.dir}/${conf.application}">
+				<include name="*.swf" />
+			</fileset>
+		</copy>
+
 		<delete file="${build.lib}/${product}.war"/>
 		<war warfile="${build.lib}/${product}.war" manifest="${conf.web.dir}/META-INF/MANIFEST.MF"
   				webxml="${conf.webinf.dir}/web.xml">
@@ -102,7 +110,8 @@
 		</war>
 	</target>
 	
-	   <target name="copy-tags" depends="" description="copy the lams.tld and the lams tags">
+
+	<target name="copy-tags" depends="" description="copy the lams.tld and the lams tags">
 	   		<copy todir="${conf.webinf.dir}" overwrite="yes" file="${tag.web.dir}/lams.tld" />	
 			<copy todir="${conf.webinf.dir}/tags" overwrite="yes">
 				<fileset dir="${tag.web.dir}/tags">