Index: win_installer/updater/src/updater.nsi
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/src/updater.nsi,v
diff -u -r1.15 -r1.16
Binary files differ
Index: win_installer/updater/src/ant/update-23.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/src/ant/update-23.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/updater/src/ant/update-23.xml	30 Apr 2009 00:52:21 -0000	1.1
@@ -0,0 +1,19 @@
+<project name="update-23.xml" basedir=".">
+
+	<target name="update-mysql-ds"
+		description="Update mysql-ds.xml to have only one datasource">
+		<copy overwrite="yes" todir="${DEPLOYDIR}">
+			<fileset dir="${TEMP}/lams">
+				<include name="mysql-ds.xml" />
+			</fileset>
+			<filterset>
+				<filter token="DB_NAME" value="${DB_NAME}" />
+				<filter token="DB_USER" value="${DB_USER}" />
+				<filter token="DB_PASS" value="${DB_PASS}" />
+				<filter token="MYSQL_HOST" value="${MYSQL_HOST}" />
+				<filter token="MYSQL_PORT" value="${MYSQL_PORT}" />
+			</filterset>
+		</copy>
+	</target>
+	
+</project>
\ No newline at end of file
Index: win_installer/updater/src/ant/update-deploy-tools.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/src/ant/update-deploy-tools.xml,v
diff -u -r1.8 -r1.9
--- win_installer/updater/src/ant/update-deploy-tools.xml	29 Apr 2009 06:17:15 -0000	1.8
+++ win_installer/updater/src/ant/update-deploy-tools.xml	30 Apr 2009 00:52:21 -0000	1.9
@@ -268,13 +268,16 @@
 				<exclude name="web.xml"/>
 			</webinf>
 			<fileset dir="${jboss.deploy}/lams-monitoring.war.tmp">
+				<include name="**/**"/>
+				<!--
 				<include name="*"/>
 				<include name="css/*"/>
 				<include name="branching/*"/>
 				<include name="gate/*"/>
 				<include name="grouping/*"/>
 				<include name="images/*"/>
 				<include name="template/*"/>
+				-->
 			</fileset>
 		</war>
 		
@@ -292,6 +295,8 @@
 				<exclude name="web.xml"/>
 			</webinf>
 			<fileset dir="${jboss.deploy}/lams-learning.war.tmp">
+				<include name="**/**"/>
+				<!--
 				<include name="*"/>
 				<include name="css/*"/>
 				<include name="branching/*"/>
@@ -304,6 +309,7 @@
 				<include name="layout/*"/>
 				<include name="test/*"/>
 				<include name="includes/**"/>
+				-->
 			</fileset>
 		</war>