Index: lams_build/conf/windows/jboss/service/mysql-ds.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/windows/jboss/service/mysql-ds.xml,v
diff -u -r1.6 -r1.6.4.1
--- lams_build/conf/windows/jboss/service/mysql-ds.xml	14 May 2008 02:12:32 -0000	1.6
+++ lams_build/conf/windows/jboss/service/mysql-ds.xml	23 Mar 2009 20:37:52 -0000	1.6.4.1
@@ -24,43 +24,5 @@
     <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://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>@db.username@</user-name>
-    <password>@db.password@</password>
-    <!-- Set minimum adn maximum size of pool -->
-    <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://localhost: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.username@</user-name>
-    <password>@db.password@</password>
-    <!-- Set minimum adn maximum size of pool -->
-    <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>
-    
-</datasources>
+  </local-tx-datasource>    
+</datasources>
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml,v
diff -u -r1.6 -r1.6.14.1
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	13 Mar 2006 05:51:10 -0000	1.6
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	23 Mar 2009 20:37:42 -0000	1.6.14.1
@@ -34,16 +34,6 @@
 		<property name="jndiName"><value>java:jdbc/lams-ds</value></property>
 	</bean>
 
-	<!-- JNDI DataSource for all tools				      -->
-	<!-- uses tool-ds datasource set up in the app-server -->
-	<bean id="toolDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
-		<property name="jndiName"><value>java:jdbc/tool-ds</value></property>
-	</bean>
-	
-	<bean id="quartzDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
-		<property name="jndiName"><value>java:jdbc/quartz-ds</value></property>
-	</bean>
-
 	<!--  Transaction manager for all transactions involving the core classes or the content repository. -->
 	
 	<!--  If your code calls classes in the content repository or in the core, and your data needs   -->
@@ -54,5 +44,4 @@
 	<!--  But remember all application servers do not have the same JNDI name for their transaction manager! -->
 	<bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/>
 
-</beans>
-
+</beans>
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml,v
diff -u -r1.73.2.2 -r1.73.2.3
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	19 Mar 2009 01:56:14 -0000	1.73.2.2
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	23 Mar 2009 20:37:42 -0000	1.73.2.3
@@ -273,7 +273,7 @@
 				<prop key="org.quartz.jobStore.tablePrefix">lams_qtz_</prop>
 			</props>
 		</property> 
-		<property name="dataSource"><ref bean="quartzDataSource"/></property>     
+		<property name="dataSource"><ref bean="dataSource"/></property>     
     </bean>