Index: lams_build/conf/slim/standalone.xml
===================================================================
diff -u -r6f34967d96ec87a5adf7ed13171be12f32e974ec -rf8df3050f071cfdcdf233094e7e51f6e858fb6cb
--- lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision 6f34967d96ec87a5adf7ed13171be12f32e974ec)
+++ lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision f8df3050f071cfdcdf233094e7e51f6e858fb6cb)
@@ -337,41 +337,32 @@
                     <transaction mode="NONE"/>
                 </local-cache> 
             </cache-container>
-            <cache-container name="hibernate" module="org.infinispan.hibernate-cache">
-                <local-cache name="entity">
+            <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"/>
                 </local-cache>
                 <local-cache name="local-query">
                     <object-memory size="10000"/>
-                    <expiration max-idle="100000"/>
+                    <expiration max-idle="100000"  />
                 </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">
+                <local-cache name="timestamps"/> 
+            
+                <!-- These settings should be used on MULTINODE ENVIRONMENT.
+                 	  See matching settings in LAMS applicationContext.xml
+                <local-cache name="entity">
                     <transaction mode="NON_XA"/>
-                    <eviction strategy="LRU" max-entries="200"/>
-                    <expiration max-idle="100000" lifespan="900000"/>
+                    <object-memory size="10000"/>
+                    <expiration lifespan="3000" interval="1000"/>
                 </local-cache>
+                <local-cache name="local-query">
+                    <object-memory size="10000"/>
+                    <expiration lifespan="3000" interval="1000"/>
+                </local-cache>
+                <local-cache name="timestamps"/> 
+                 -->
             </cache-container>
-             -->
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:io:3.0">
             <worker name="default"/>