Index: unix_installer/installer-package/conf/unix/jboss/service/mysql-ds.xml
===================================================================
diff -u -rc6a8998567722aec174bb639b1fb4d81dece93d8 -ra4e9c0a40589df6d4f974341fbc8967fc524857d
--- unix_installer/installer-package/conf/unix/jboss/service/mysql-ds.xml	(.../mysql-ds.xml)	(revision c6a8998567722aec174bb639b1fb4d81dece93d8)
+++ unix_installer/installer-package/conf/unix/jboss/service/mysql-ds.xml	(.../mysql-ds.xml)	(revision a4e9c0a40589df6d4f974341fbc8967fc524857d)
@@ -9,7 +9,7 @@
   <!-- 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://@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 -->
@@ -20,7 +20,7 @@
     <user-name>@DB_USER@</user-name>
     <password>@DB_PASS@</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>
@@ -29,7 +29,7 @@
   <!-- 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>
+    <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 -->
@@ -40,7 +40,7 @@
     <user-name>@DB_USER@</user-name>
     <password>@DB_PASS@</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>
@@ -49,14 +49,15 @@
   <!-- 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>
+    <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_USER@</user-name>
     <password>@DB_PASS@</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>