Index: lams_contentrepository/lib/ehcache/ehcache-1.0.jar
===================================================================
diff -u
Binary files differ
Index: lams_contentrepository/lib/jboss-cache/jboss-cache.jar
===================================================================
diff -u
Binary files differ
Index: lams_contentrepository/lib/jboss-cache/jgroups.jar
===================================================================
diff -u
Binary files differ
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/contentRepositoryApplicationContext.xml
===================================================================
diff -u -rd69fd0c0b6e3af330bb1ddbf3099022feca3f092 -r8774613cfd0a6e8ddbab1c14aa88f160279e1090
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/contentRepositoryApplicationContext.xml	(.../contentRepositoryApplicationContext.xml)	(revision d69fd0c0b6e3af330bb1ddbf3099022feca3f092)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/contentRepositoryApplicationContext.xml	(.../contentRepositoryApplicationContext.xml)	(revision 8774613cfd0a6e8ddbab1c14aa88f160279e1090)
@@ -34,10 +34,8 @@
 
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
-	<!--  copied from lams common! -->
-
 	<!-- Configurer that replaces ${...} placeholders with values from a properties file -->
-	<!-- (in this case, JDBC-related settings for the dataSource definition below) -->
+	<!-- (in this case, hibernate-related settings for the session factory definition below) -->
 	
 	<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="location"><value>/org/lamsfoundation/lams/contentrepository/dbConnection.properties</value></property>
@@ -51,19 +49,14 @@
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
 
-	<!--  copied from lams common! -->
-  
-	<!-- Local DataSource that works in any environment -->
-	<bean id="crDataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-		<property name="driverClassName"><value>${jdbc.driverClassName}</value></property>
-		<property name="url"><value>${jdbc.url}</value></property>
-		<property name="username"><value>${jdbc.username}</value></property>
-		<property name="password"><value>${jdbc.password}</value></property>
+	<!-- JNDI DataSource  - ises tool-ds Datasource set up in the app-server -->
+	<bean id="lamsDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
+		<property name="jndiName"><value>java:jdbc/lams-ds</value></property>
 	</bean>
 
 	<!-- Hibernate SessionFactory -->
 	<bean id="crSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
-		<property name="dataSource"><ref local="crDataSource"/></property>
+		<property name="dataSource"><ref local="lamsDataSource"/></property>
 		<property name="mappingResources">
 			<list>	
 				<value>org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml</value>
@@ -82,7 +75,7 @@
 				<prop key="hibernate.c3p0.maxPoolSize">${hibernate.c3p0.maxPoolSize}</prop>
 				<prop key="hibernate.c3p0.timeout">${hibernate.c3p0.timeout}</prop>
 				<prop key="hibernate.c3p0.max_statement">${hibernate.c3p0.max_statement}</prop>
-				<prop key="hibernate.cache.provider_class">net.sf.hibernate.cache.TreeCacheProvider</prop>
+				<prop key="hibernate.cache.provider_class">${hibernate.cache}</prop>
 			</props>
 		</property>
 	</bean>
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dbConnection.properties
===================================================================
diff -u -r59a810e17dffd1a080d8f1637cd202b9cc6fa4cb -r8774613cfd0a6e8ddbab1c14aa88f160279e1090
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dbConnection.properties	(.../dbConnection.properties)	(revision 59a810e17dffd1a080d8f1637cd202b9cc6fa4cb)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dbConnection.properties	(.../dbConnection.properties)	(revision 8774613cfd0a6e8ddbab1c14aa88f160279e1090)
@@ -21,12 +21,6 @@
 # Applied by PropertyPlaceholderConfigurer from "learningDesignApplicationContext.xml".
 # Targetted at system administrators, to avoid touching the context XML files.
 
-#jdbc configuration
-jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost/lams?characterEncoding=utf8
-jdbc.username=lams
-jdbc.password=lamsdemo
-
 #Hibernate configuration
 hibernate.show_sql=false
 hibernate.dialect=net.sf.hibernate.dialect.MySQLDialect
@@ -35,4 +29,7 @@
 hibernate.c3p0.minPoolSize=5
 hibernate.c3p0.maxPoolSize=20
 hibernate.c3p0.timeout=1800
-hibernate.c3p0.max_statement=50
\ No newline at end of file
+hibernate.c3p0.max_statement=50
+
+# cache configuration
+hibernate.cache=net.sf.hibernate.cache.TreeCacheProvider
\ No newline at end of file
Index: lams_contentrepository/src/java/treecache.xml
===================================================================
diff -u -rd69fd0c0b6e3af330bb1ddbf3099022feca3f092 -r8774613cfd0a6e8ddbab1c14aa88f160279e1090
--- lams_contentrepository/src/java/treecache.xml	(.../treecache.xml)	(revision d69fd0c0b6e3af330bb1ddbf3099022feca3f092)
+++ lams_contentrepository/src/java/treecache.xml	(.../treecache.xml)	(revision 8774613cfd0a6e8ddbab1c14aa88f160279e1090)
@@ -44,12 +44,13 @@
 
 
 	<!-- Use DefaultCache to bind the cache into JNDI. The proxy returned as part of the lookup can be used both
-            by local (e.g. servlet) and remote (e.g. RMI) clients -->
+            by local (e.g. servlet) and remote (e.g. RMI) clients 
+            ?? Doe the jndi stuff even work - Chris said something about it not working.
        <attribute name="JndiName">
            name=DefaultCache
            locatorURI=socket://:5555
        </attribute>
-
+	-->
         <!-- Configure the TransactionManager -->
         <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>