Index: lams_build/build.xml
===================================================================
diff -u -rd89181efec67506914f57c2449036c85cf01094c -red14466b91efb04c1968ec30e16da139f4324303
--- lams_build/build.xml	(.../build.xml)	(revision d89181efec67506914f57c2449036c85cf01094c)
+++ lams_build/build.xml	(.../build.xml)	(revision ed14466b91efb04c1968ec30e16da139f4324303)
@@ -345,6 +345,11 @@
 				<include name="mysql*.xml" />
 				<include name="local-service.xml" />
 			</fileset>
+	        <filterset>
+	            <filter token="db.name" value="${db.name}"/>
+                <filter token="db.username" value="${db.username}"/>
+                <filter token="db.password" value="${db.password}"/>
+	        </filterset>
 		</copy>
 		<copy overwrite="yes" todir="${jboss.ear.deploy}/jbossweb-tomcat55.sar/META-INF">
 			<fileset dir="${conf.jboss}/tomcat">
Index: lams_build/conf/unix/jboss/service/mysql-ds.xml
===================================================================
diff -u -rd5e8d7001b9fb1f67ee7216ac92ea3d9012165dd -red14466b91efb04c1968ec30e16da139f4324303
--- lams_build/conf/unix/jboss/service/mysql-ds.xml	(.../mysql-ds.xml)	(revision d5e8d7001b9fb1f67ee7216ac92ea3d9012165dd)
+++ lams_build/conf/unix/jboss/service/mysql-ds.xml	(.../mysql-ds.xml)	(revision ed14466b91efb04c1968ec30e16da139f4324303)
@@ -9,16 +9,16 @@
   <!-- lams-ds datasource for use by LAMS Core and Services -->
   <local-tx-datasource>
     <jndi-name>jdbc/lams-ds</jndi-name>
-    <connection-url>jdbc:mysql://localhost:3306/lams</connection-url>
+    <connection-url>jdbc:mysql://localhost:3306/@db.name@</connection-url>
     <driver-class>com.mysql.jdbc.Driver</driver-class>
     <!-- Tell MySQL Connector to use UTF-8 character encoding, -->
     <!-- and convert MySQL zero times to null -->
     <connection-property name="characterEncoding">utf8</connection-property>
     <connection-property name="zeroDateTimeBehavior">convertToNull</connection-property>
     <!-- Set transaction isolation level to match db -->
     <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
-    <user-name>lams</user-name>
-    <password>lamsdemo</password>
+    <user-name>@db.username@</user-name>
+    <password>@db.password@</password>
     <!-- Set minimum adn maximum size of pool -->
     <max-pool-size>32</max-pool-size>
     <min-pool-size>0</min-pool-size>
@@ -29,16 +29,16 @@
   <!-- tool-ds datasource for use by Tools -->
   <local-tx-datasource>
     <jndi-name>jdbc/tool-ds</jndi-name>
-    <connection-url>jdbc:mysql://localhost:3306/lams</connection-url>
+    <connection-url>jdbc:mysql://localhost:3306/@db.name@</connection-url>
     <driver-class>com.mysql.jdbc.Driver</driver-class>
     <!-- Tell MySQL Connector to use UTF-8 character encoding, -->
     <!-- and convert MySQL zero times to null -->
     <connection-property name="characterEncoding">utf8</connection-property>
     <connection-property name="zeroDateTimeBehavior">convertToNull</connection-property>
     <!-- Set transaction isolation level to match db -->
     <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
-    <user-name>lams</user-name>
-    <password>lamsdemo</password>
+    <user-name>@db.username@</user-name>
+    <password>@db.password@</password>
     <!-- Set minimum adn maximum size of pool -->
     <max-pool-size>32</max-pool-size>
     <min-pool-size>0</min-pool-size>
@@ -49,12 +49,12 @@
   <!-- quartz-ds datasource for use by Quartz -->
   <local-tx-datasource>
     <jndi-name>jdbc/quartz-ds</jndi-name>
-    <connection-url>jdbc:mysql://localhost:3306/lams</connection-url>
+    <connection-url>jdbc:mysql://localhost:3306/@db.name@</connection-url>
     <driver-class>com.mysql.jdbc.Driver</driver-class>
     <!-- Set transaction isolation level to match db -->
     <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
-    <user-name>lams</user-name>
-    <password>lamsdemo</password>
+    <user-name>@db.username@</user-name>
+    <password>@db.password@</password>
     <!-- Set minimum adn maximum size of pool -->
     <max-pool-size>32</max-pool-size>
     <min-pool-size>0</min-pool-size>
Index: lams_build/conf/windows/jboss/service/mysql-ds.xml
===================================================================
diff -u -rd5e8d7001b9fb1f67ee7216ac92ea3d9012165dd -red14466b91efb04c1968ec30e16da139f4324303
--- lams_build/conf/windows/jboss/service/mysql-ds.xml	(.../mysql-ds.xml)	(revision d5e8d7001b9fb1f67ee7216ac92ea3d9012165dd)
+++ lams_build/conf/windows/jboss/service/mysql-ds.xml	(.../mysql-ds.xml)	(revision ed14466b91efb04c1968ec30e16da139f4324303)
@@ -9,16 +9,16 @@
   <!-- lams-ds datasource for use by LAMS Core and Services -->
   <local-tx-datasource>
     <jndi-name>jdbc/lams-ds</jndi-name>
-    <connection-url>jdbc:mysql://localhost:3306/lams</connection-url>
+    <connection-url>jdbc:mysql://localhost:3306/@db.name@</connection-url>
     <driver-class>com.mysql.jdbc.Driver</driver-class>
     <!-- Tell MySQL Connector to use UTF-8 character encoding, -->
     <!-- and convert MySQL zero times to null -->
     <connection-property name="characterEncoding">utf8</connection-property>
     <connection-property name="zeroDateTimeBehavior">convertToNull</connection-property>
     <!-- Set transaction isolation level to match db -->
     <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
-    <user-name>lams</user-name>
-    <password>lamsdemo</password>
+    <user-name>@db.username@</user-name>
+    <password>@db.password@</password>
     <!-- Set minimum adn maximum size of pool -->
     <max-pool-size>32</max-pool-size>
     <min-pool-size>0</min-pool-size>
@@ -29,16 +29,16 @@
   <!-- tool-ds datasource for use by Tools -->
   <local-tx-datasource>
     <jndi-name>jdbc/tool-ds</jndi-name>
-    <connection-url>jdbc:mysql://localhost:3306/lams</connection-url>
+    <connection-url>jdbc:mysql://localhost:3306/@db.name@</connection-url>
     <driver-class>com.mysql.jdbc.Driver</driver-class>
     <!-- Tell MySQL Connector to use UTF-8 character encoding, -->
     <!-- and convert MySQL zero times to null -->
     <connection-property name="characterEncoding">utf8</connection-property>
     <connection-property name="zeroDateTimeBehavior">convertToNull</connection-property>
     <!-- Set transaction isolation level to match db -->
     <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
-    <user-name>lams</user-name>
-    <password>lamsdemo</password>
+    <user-name>@db.username@</user-name>
+    <password>@db.password@</password>
     <!-- Set minimum adn maximum size of pool -->
     <max-pool-size>32</max-pool-size>
     <min-pool-size>0</min-pool-size>
@@ -49,16 +49,17 @@
   <!-- quartz-ds datasource for use by Quartz -->
   <local-tx-datasource>
     <jndi-name>jdbc/quartz-ds</jndi-name>
-    <connection-url>jdbc:mysql://localhost:3306/lams</connection-url>
+    <connection-url>jdbc:mysql://localhost:3306/@db.name@</connection-url>
     <driver-class>com.mysql.jdbc.Driver</driver-class>
     <!-- Set transaction isolation level to match db -->
     <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
-    <user-name>lams</user-name>
-    <password>lamsdemo</password>
+    <user-name>@db.username@</user-name>
+    <password>@db.password@</password>
     <!-- Set minimum adn maximum size of pool -->
     <max-pool-size>32</max-pool-size>
     <min-pool-size>0</min-pool-size>
     <!-- Connections not used after 5 minutes will be closed and removed -->
     <idle-timeout-minutes>5</idle-timeout-minutes>
   </local-tx-datasource>
+    
 </datasources>