Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r26513e4a3a00a82cf700663c7cfe79d39c47732a -r5d1270cc9ab17a922b694e2073b464f8e91b7247
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 26513e4a3a00a82cf700663c7cfe79d39c47732a)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 5d1270cc9ab17a922b694e2073b464f8e91b7247)
@@ -383,32 +383,12 @@
                     <file-store passivation="true" purge="false"/>
                 </local-cache>
             </cache-container>
-			<cache-container name="hibernate" 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"/>
-                   -->
+            <cache-container name="hibernate" module="org.hibernate.infinispan" statistics-enabled="false">
+                <local-cache name="entity" statistics-enabled="false">
+                    <transaction mode="NON_XA" locking="OPTIMISTIC"/>
+                    <expiration max-idle="1800000"/>
                 </local-cache>
-                <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" statistics-enabled="true">
-                    <transaction mode="NONE"/>
-                    <eviction strategy="NONE"/>
-                </local-cache>
-                <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>
-             -->
+                <local-cache name="timestamps"/>
             </cache-container>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>