Index: lams_build/conf/unix/jboss/service/mysql-ds.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/unix/jboss/service/mysql-ds.xml,v
diff -u -r1.6 -r1.6.6.1
--- lams_build/conf/unix/jboss/service/mysql-ds.xml	14 May 2008 02:12:32 -0000	1.6
+++ lams_build/conf/unix/jboss/service/mysql-ds.xml	5 May 2009 05:55:26 -0000	1.6.6.1
@@ -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/@db.name@</connection-url>
+    <connection-url>jdbc:mysql://@MYSQL_HOST@:@MYSQL_PORT@/@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>@db.username@</user-name>
-    <password>@db.password@</password>
+    <user-name>@DB_USER@</user-name>
+    <password>@DB_PASS@</password>
     <!-- Set minimum adn maximum size of pool -->
     <max-pool-size>64</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/@db.name@</connection-url>
+    <connection-url>jdbc:mysql://@MYSQL_HOST@:@MYSQL_PORT@/@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>@db.username@</user-name>
-    <password>@db.password@</password>
+    <user-name>@DB_USER@</user-name>
+    <password>@DB_PASS@</password>
     <!-- Set minimum adn maximum size of pool -->
     <max-pool-size>64</max-pool-size>
     <min-pool-size>0</min-pool-size>
@@ -49,13 +49,13 @@
   <!-- quartz-ds datasource for use by Quartz -->
   <local-tx-datasource>
     <jndi-name>jdbc/quartz-ds</jndi-name>
-    <connection-url>jdbc:mysql://localhost:3306/@db.name@</connection-url>
+    <connection-url>jdbc:mysql://@MYSQL_HOST@:@MYSQL_PORT@/@DB_NAME@</connection-url>
     <driver-class>com.mysql.jdbc.Driver</driver-class>
     <connection-property name="characterEncoding">utf8</connection-property>
     <!-- Set transaction isolation level to match db -->
     <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
-    <user-name>@db.username@</user-name>
-    <password>@db.password@</password>
+    <user-name>@DB_USER@</user-name>
+    <password>@DB_PASS@</password>
     <!-- Set minimum adn maximum size of pool -->
     <max-pool-size>64</max-pool-size>
     <min-pool-size>0</min-pool-size>