Index: lams_common/conf/unix/jboss/service/mysql-ds.xml
===================================================================
diff -u -rb32065c131ff33ff74319e7197484b4ef49d8219 -rcdd2f0a6a600aed91d7935852def1728cdd5f14d
--- lams_common/conf/unix/jboss/service/mysql-ds.xml	(.../mysql-ds.xml)	(revision b32065c131ff33ff74319e7197484b4ef49d8219)
+++ lams_common/conf/unix/jboss/service/mysql-ds.xml	(.../mysql-ds.xml)	(revision cdd2f0a6a600aed91d7935852def1728cdd5f14d)
@@ -1,17 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  JBoss Server Configuration                                           -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
+<!-- $Id$ -->
+<!--  Datasource config for MySQL using 3.0.9 available from:
+http://www.mysql.com/downloads/api-jdbc-stable.html
+-->
 
 <datasources>
+  <!-- lams-ds datasource for use by LAMS Core and Services -->
   <local-tx-datasource>
-    <jndi-name>MySqlDS</jndi-name>
+    <jndi-name>jdbc/lams-ds</jndi-name>
     <connection-url>jdbc:mysql://localhost:3306/lams</connection-url>
     <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <!-- Tell MySQL Connector to use UTF-8 character encoding -->
+    <connection-property name="characterEncoding">utf8</connection-property>
+    <!-- Set transaction isolation level to match db -->
+    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
     <user-name>lams</user-name>
     <password>lamsdemo</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>
\ No newline at end of file
+
+  <!-- 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>
+    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <!-- Tell MySQL Connector to use UTF-8 character encoding -->
+    <connection-property name="characterEncoding">utf8</connection-property>
+    <!-- Set transaction isolation level to match db -->
+    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
+    <user-name>lams</user-name>
+    <password>lamsdemo</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>