Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r3bb66b73292b37e2f3773579947b7ead5017ccea -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 3bb66b73292b37e2f3773579947b7ead5017ccea)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -469,41 +469,18 @@
                     <transaction mode="NONE"/>
                 </local-cache> 
             </cache-container>
-            <cache-container name="hibernate" module="org.infinispan.hibernate-cache">
+            <cache-container name="hibernate" default-cache="entity" module="org.infinispan.hibernate-cache" statistics-enabled="true">
                 <local-cache name="entity">
-                    <transaction mode="NON_XA"/>
-                    <object-memory size="10000"/>
-                    <expiration max-idle="100000"/>
+                    <transaction mode="NON_XA" />
+                    <object-memory />
+                    <expiration lifespan="5000" interval="1000" />
                 </local-cache>
                 <local-cache name="local-query">
-                    <object-memory size="10000"/>
-                    <expiration max-idle="100000"/>
+                    <object-memory />
+                    <expiration lifespan="5000" interval="1000"/>
                 </local-cache>
                 <local-cache name="timestamps"/>
             </cache-container>
-            <!-- LAMS configuration for Hibernate. At the moment the default one above is used.
-			<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"/>
-                </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>
-            </cache-container>
-             -->
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:io:3.0">
             <worker name="default"/>