Index: lams_build/conf/slim/standalone.xml
===================================================================
diff -u -r5af9a708f18efe4c74a174972554cac5049fb0ef -rc012e1e55c4c43a27d8108926fe9fca698c7d758
--- lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision 5af9a708f18efe4c74a174972554cac5049fb0ef)
+++ lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision c012e1e55c4c43a27d8108926fe9fca698c7d758)
@@ -13,7 +13,6 @@
         <extension module="org.jboss.as.naming"/>
         <extension module="org.jboss.as.remoting"/>
         <extension module="org.jboss.as.security"/>
-        <extension module="org.jboss.as.transactions"/>
         <extension module="org.wildfly.extension.io"/>
         <extension module="org.wildfly.extension.undertow"/>
     </extensions>
@@ -349,27 +348,32 @@
                     <file-store passivation="false" purge="false"/>
                 </local-cache>
             </cache-container>
-            <cache-container name="hibernate" default-cache="local-query" module="org.hibernate" start="EAGER">
-                <local-cache name="entity" start="EAGER" statistics-enabled="true">
-                    <transaction mode="NON_XA"/>
-                    <eviction strategy="LRU" max-entries="5000"/>
+			<cache-container name="hibernate" start="EAGER" module="org.hibernate">
+                <local-cache name="entity" statistics-enabled="true">
+                   <!-- 
+                   	<transaction mode="NON_XA"/>
+                    <eviction strategy="LRU" max-entries="50000"/>
                     <expiration max-idle="100000" lifespan="1000000"/>
+                   -->
                 </local-cache>
-                <local-cache name="local-query" start="EAGER" statistics-enabled="true" >
+                <local-cache name="local-query" statistics-enabled="true">
+                   <!--
                     <transaction mode="NONE"/>
                     <eviction strategy="LRU" max-entries="10000"/>
                     <expiration max-idle="100000"/>
+                   -->
                 </local-cache>
-                <local-cache name="timestamps" start="EAGER" statistics-enabled="true" >
+             <!-- 
+                <local-cache name="timestamps" statistics-enabled="true">
                     <transaction mode="NONE"/>
                     <eviction strategy="NONE"/>
                 </local-cache>
-                <!-- contentrepository cache settings template -->
-                <local-cache name="contentrepository-entity" start="EAGER" statistics-enabled="true">
+                <local-cache name="contentrepository-entity" statistics-enabled="true">
                     <transaction mode="NON_XA"/>
                     <eviction strategy="LRU" max-entries="200"/>
                     <expiration max-idle="100000" lifespan="900000"/>
                 </local-cache>
+             -->
             </cache-container>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jca:2.0">
Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r5af9a708f18efe4c74a174972554cac5049fb0ef -rc012e1e55c4c43a27d8108926fe9fca698c7d758
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 5af9a708f18efe4c74a174972554cac5049fb0ef)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision c012e1e55c4c43a27d8108926fe9fca698c7d758)
@@ -376,27 +376,32 @@
                     <file-store passivation="false" purge="false"/>
                 </local-cache>
             </cache-container>
-            <cache-container name="hibernate" default-cache="local-query" module="org.hibernate" start="EAGER">
-                <local-cache name="entity" start="EAGER" statistics-enabled="true">
-                    <transaction mode="NON_XA"/>
+			<cache-container name="hibernate" start="EAGER" module="org.hibernate">
+                <local-cache name="entity" statistics-enabled="true">
+                   <!-- 
+                   	<transaction mode="NON_XA"/>
                     <eviction strategy="LRU" max-entries="50000"/>
                     <expiration max-idle="100000" lifespan="1000000"/>
+                   -->
                 </local-cache>
-                <local-cache name="local-query" start="EAGER" statistics-enabled="true" >
+                <local-cache name="local-query" statistics-enabled="true">
+                   <!--
                     <transaction mode="NONE"/>
                     <eviction strategy="LRU" max-entries="10000"/>
                     <expiration max-idle="100000"/>
+                   -->
                 </local-cache>
-                <local-cache name="timestamps" start="EAGER" statistics-enabled="true" >
+             <!-- 
+                <local-cache name="timestamps" statistics-enabled="true">
                     <transaction mode="NONE"/>
                     <eviction strategy="NONE"/>
                 </local-cache>
-                <!-- contentrepository cache settings template -->
-                <local-cache name="contentrepository-entity" start="EAGER" statistics-enabled="true">
+                <local-cache name="contentrepository-entity" statistics-enabled="true">
                     <transaction mode="NON_XA"/>
                     <eviction strategy="LRU" max-entries="200"/>
                     <expiration max-idle="100000" lifespan="900000"/>
                 </local-cache>
+             -->
             </cache-container>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
diff -u -r521e5c6112ebf6a074de706d2584eea2c45cbda5 -rc012e1e55c4c43a27d8108926fe9fca698c7d758
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision 521e5c6112ebf6a074de706d2584eea2c45cbda5)
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision c012e1e55c4c43a27d8108926fe9fca698c7d758)
@@ -15,17 +15,22 @@
 			<prop key="hibernate.show_sql">false</prop>
 			<prop key="hibernate.current_session_context_class">org.lamsfoundation.lams.util.hibernate.TransactionAwareSessionContext</prop>
 		    <prop key="hibernate.cache.use_second_level_cache">true</prop>
+		    <prop key="hibernate.cache.use_query_cache">true</prop>
             <prop key="hibernate.cache.infinispan.cachemanager">java:jboss/infinispan/container/hibernate</prop>
             <prop key="hibernate.cache.region.factory_class">org.hibernate.cache.infinispan.JndiInfinispanRegionFactory</prop>
+            <prop key="hibernate.cache.default_cache_concurrency_strategy">TRANSACTIONAL</prop>
             <prop key="hibernate.transaction.jta.platform">org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform</prop>   
             <prop key="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</prop>   
-            
+            <prop key="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</prop>
+             
+            <!-- 
             <prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.contentrepository.CrNode.cfg">contentrepository-entity</prop>
             <prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.contentrepository.CrNode.crNodeVersions.cfg">contentrepository-entity</prop>
             <prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.contentrepository.CrNodeVersion.cfg">contentrepository-entity</prop>
             <prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.contentrepository.CrNodeVersion.crNodeVersionProperties.cfg">contentrepository-entity</prop>
             <prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.contentrepository.CrNodeVersionProperty.cfg">contentrepository-entity</prop>
-            <prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.contentrepository.CrWorkspace.cfg">contentrepository-entity</prop>			
+            <prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.contentrepository.CrWorkspace.cfg">contentrepository-entity</prop>	
+            -->		
 		</props>
 		</property>
   	</bean>