Index: win_installer/installer/templates/mysql-ds.xml
===================================================================
diff -u -r07b971e0572f2b3006481c25f48208f64578c1e5 -r6bea96a2ac932bc49e6f7dfa37b890d8dc1ce149
--- win_installer/installer/templates/mysql-ds.xml	(.../mysql-ds.xml)	(revision 07b971e0572f2b3006481c25f48208f64578c1e5)
+++ win_installer/installer/templates/mysql-ds.xml	(.../mysql-ds.xml)	(revision 6bea96a2ac932bc49e6f7dfa37b890d8dc1ce149)
@@ -9,57 +9,34 @@
   <!-- lams-ds datasource for use by LAMS Core and Services -->
   <local-tx-datasource>
     <jndi-name>jdbc/lams-ds</jndi-name>
-    <connection-url>jdbc:mysql://@MYSQL_HOST@:3306/@DB_NAME@</connection-url>
+    <connection-url>jdbc:mysql:mxj://localhost:13306/lams</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_USER@</user-name>
-    <password>@DB_PASS@</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>
 
-  <!-- tool-ds datasource for use by Tools -->
-  <local-tx-datasource>
-    <jndi-name>jdbc/tool-ds</jndi-name>
-    <connection-url>jdbc:mysql://@MYSQL_HOST@: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>
+    <!-- Properties below are used only for embedded MySQL server -->
+    <connection-property name="server.basedir">@MYSQLDIR@</connection-property>
+    <connection-property name="createDatabaseIfNotExist">false</connection-property>
+    <connection-property name="server.initialize-user">false</connection-property>
+	<connection-property name="server.key_buffer">16K</connection-property>
+    <connection-property name="server.max_allowed_packet">1M</connection-property>
+    <connection-property name="server.table_cache">4</connection-property>
+    <connection-property name="server.sort_buffer_size">64K</connection-property>
+    <connection-property name="server.read_buffer_size">256K</connection-property>
+    <connection-property name="server.read_rnd_buffer_size">256K</connection-property>
+    <connection-property name="server.net_buffer_length">2K</connection-property>
+    <connection-property name="server.thread_stack">128K</connection-property>
+
     <!-- Set transaction isolation level to match db -->
     <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
-    <user-name>@DB_USER@</user-name>
-    <password>@DB_PASS@</password>
+    <user-name>lams</user-name>
+    <password>lamsdemo</password>
     <!-- Set minimum adn maximum size of pool -->
-    <max-pool-size>32</max-pool-size>
+    <max-pool-size>64</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>
-  
-  <!-- quartz-ds datasource for use by Quartz -->
-  <local-tx-datasource>
-    <jndi-name>jdbc/quartz-ds</jndi-name>
-    <connection-url>jdbc:mysql://@MYSQL_HOST@:3306/@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_USER@</user-name>
-    <password>@DB_PASS@</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>
+  </local-tx-datasource>    
+</datasources>
\ No newline at end of file