Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r305b8a3177470767febe6b9510cf66640ec52c60 -r489e21001d0359e9f84fc6674d482b0d4a7df2b8
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 305b8a3177470767febe6b9510cf66640ec52c60)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 489e21001d0359e9f84fc6674d482b0d4a7df2b8)
@@ -446,35 +446,46 @@
                     <transaction mode="BATCH"/>
                 </local-cache>
             </cache-container>
-            <cache-container name="web" default-cache="default" module="org.wildfly.clustering.web.infinispan">
+            <cache-container name="web" default-cache="lams" module="org.wildfly.clustering.web.infinispan">
                 <local-cache name="passivation">
                     <locking isolation="REPEATABLE_READ"/>
                     <transaction mode="BATCH"/>
                     <file-store passivation="true" purge="false"/>
                 </local-cache>
-                <!-- The default cache below has been added for LAMS.
-                	 In vanilla WildFly "passivation" cache is used for storing web sessions,
+  				<!-- 
+                The default cache below has been added for LAMS.
+                	 In vanilla WildFly "passivation" cache above is used for storing web sessions,
                 	 which allows sessions to be kept between server restarts -->
-                <local-cache name="default">
-                    <transaction mode="BATCH"/>
+                <local-cache name="lams" >
+                	<binary-memory />
+                	<locking isolation="NONE" />
+                    <transaction mode="NONE"/>
+                </local-cache> 
+            </cache-container>
+            <cache-container name="hibernate" module="org.infinispan.hibernate-cache">
+                <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"/>
+                </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"/>
@@ -484,8 +495,8 @@
                     <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"/>