Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r41f7aa0207bd48d5f5efee6a0b2061e37bffc291 -r750f84843809e7143585d1ace1742c935df2898a
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
diff -u -r5e3b7e025a58560b5dad47341288294692d3d0c5 -r750f84843809e7143585d1ace1742c935df2898a
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision 5e3b7e025a58560b5dad47341288294692d3d0c5)
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision 750f84843809e7143585d1ace1742c935df2898a)
@@ -7,6 +7,25 @@
 
 <beans>
 
+ 	<!-- Hibernate Properties. Should be used by all Hibernate session factories unless -->
+  	<!--  the tool has a specific need for a different setting. 						-->			
+  	<!-- If you change hibernate.treecache.objectName, you will also need to change the -->
+  	<!--  cacheManager object 															-->
+  	<bean id="hibernateProperties" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+	  	<property name="properties">
+		<props>
+			<prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop>
+			<prop key="hibernate.show_sql">false</prop>
+			<prop key="hibernate.c3p0.minPoolSize">5</prop>
+			<prop key="hibernate.c3p0.maxPoolSize">20</prop>
+			<prop key="hibernate.c3p0.timeout">1800</prop>
+			<prop key="hibernate.c3p0.max_statement">50</prop>
+  			<prop key="hibernate.cache.provider_class">org.jboss.hibernate.cache.DeployedTreeCacheProvider</prop>
+			<prop key="hibernate.treecache.objectName">jboss.cache:service=TreeCache</prop>
+		</props>
+		</property>
+  	</bean>
+  	
 	<import resource="commonContext.xml"/>
 
 	<!-- JNDI DataSource for all "core" components 		  -->
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -rf8ae59adef57f2f13c9d22cca469423d817e4fb9 -r750f84843809e7143585d1ace1742c935df2898a
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision f8ae59adef57f2f13c9d22cca469423d817e4fb9)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 750f84843809e7143585d1ace1742c935df2898a)
@@ -15,29 +15,7 @@
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
   
-  	<!-- Hibernate Properties. Should be used by all Hibernate session factories unless -->
-  	<!--  the tool has a specific need for a different setting. 						-->			
-  	<!-- If you change hibernate.treecache.objectName, you will also need to change the -->
-  	<!--  cacheManager object 															-->
-  	<bean id="hibernateProperties" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
-	  	<property name="properties">
-		<props>
-			<prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop>
-			<prop key="hibernate.show_sql">false</prop>
-			<prop key="hibernate.c3p0.minPoolSize">5</prop>
-			<prop key="hibernate.c3p0.maxPoolSize">20</prop>
-			<prop key="hibernate.c3p0.timeout">1800</prop>
-			<prop key="hibernate.c3p0.max_statement">50</prop>
-  			<prop key="hibernate.cache.provider_class">org.jboss.hibernate.cache.DeployedTreeCacheProvider</prop>
-			<prop key="hibernate.treecache.objectName">jboss.cache:service=TreeCache</prop>
-		</props>
-		</property>
-  	</bean>
-  	
-  <!-- 			<prop key="hibernate.cache.provider_class">org.hibernate.cache.JndiBoundTreeCacheProvider</prop> -->
-  	<!-- hibernate.cache.jndi -->
-  	
-	<!-- Hibernate SessionFactory -->
+ 	<!-- Hibernate SessionFactory -->
 	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="dataSource"><ref bean="dataSource"/></property>
 		<property name="mappingResources">
@@ -82,7 +60,7 @@
 				<value>org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml</value>
 			</list>
 		</property>
-		<property name="hibernateProperties"><ref local="hibernateProperties"/></property>
+		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
 	</bean>
 	
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
Index: lams_common/src/java/org/lamsfoundation/lams/localApplicationContext.xml
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r750f84843809e7143585d1ace1742c935df2898a
--- lams_common/src/java/org/lamsfoundation/lams/localApplicationContext.xml	(.../localApplicationContext.xml)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/src/java/org/lamsfoundation/lams/localApplicationContext.xml	(.../localApplicationContext.xml)	(revision 750f84843809e7143585d1ace1742c935df2898a)
@@ -9,6 +9,23 @@
 
 <beans>
 
+ 	<!-- Hibernate Properties. Should be used by all Hibernate session factories unless -->
+  	<!--  the tool has a specific need for a different setting. 						-->			
+  	<!-- If you change hibernate.treecache.objectName, you will also need to change the -->
+  	<!--  cacheManager object 															-->
+  	<bean id="hibernateProperties" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+	  	<property name="properties">
+		<props>
+			<prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop>
+			<prop key="hibernate.show_sql">false</prop>
+			<prop key="hibernate.c3p0.minPoolSize">5</prop>
+			<prop key="hibernate.c3p0.maxPoolSize">20</prop>
+			<prop key="hibernate.c3p0.timeout">1800</prop>
+			<prop key="hibernate.c3p0.max_statement">50</prop>
+		</props>
+		</property>
+  	</bean>
+	
 	<import resource="commonContext.xml"/>
 	
 	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">