Index: lams_build/conf/slim/standalone.xml
===================================================================
diff -u -r5217687396432cca729d6e32b5a4aeef7f7fe7fe -r92252270b8c634b6703f62b79d40d7cf6291da4f
--- lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision 5217687396432cca729d6e32b5a4aeef7f7fe7fe)
+++ lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision 92252270b8c634b6703f62b79d40d7cf6291da4f)
@@ -351,25 +351,6 @@
                     <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"/> 
-            
-                <!-- These settings should be used on MULTINODE ENVIRONMENT.
-                 	  See matching settings in LAMS applicationContext.xml
-                <local-cache name="entity">
-                    <transaction mode="NON_XA"/>
-                    <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">
Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r5217687396432cca729d6e32b5a4aeef7f7fe7fe -r92252270b8c634b6703f62b79d40d7cf6291da4f
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 5217687396432cca729d6e32b5a4aeef7f7fe7fe)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 92252270b8c634b6703f62b79d40d7cf6291da4f)
@@ -491,26 +491,6 @@
                     <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"/> 
-            
-                <!-- These settings should be used on MULTINODE ENVIRONMENT.
-                 	  See matching settings in LAMS applicationContext.xml
-                <local-cache name="entity">
-                    <transaction mode="NON_XA"/>
-                    <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">
Index: lams_common/build.xml
===================================================================
diff -u -r658fe82d333cc79e8956978a0956960f728a7ff8 -r92252270b8c634b6703f62b79d40d7cf6291da4f
--- lams_common/build.xml	(.../build.xml)	(revision 658fe82d333cc79e8956978a0956960f728a7ff8)
+++ lams_common/build.xml	(.../build.xml)	(revision 92252270b8c634b6703f62b79d40d7cf6291da4f)
@@ -46,7 +46,17 @@
 		</sql>
 	</target>
 				
-
+	<target name="_build-jar" depends="_compile-java, _build-manifest, _copy-language">
+		<echo>${ant.project.name}: Copying persistence configuration</echo>
+		<copy todir="${basedir}/build/classes/java/META-INF" file="${conf.dir}/persistence.xml" overwrite="true" verbose="true" />
+		<!-- Internal target: Creates JAR file. -->
+		<echo>${ant.project.name}: Building JAR</echo>
+		<jar jarfile="${basedir}/build/lib/${product}.jar"
+			 manifest="${basedir}/build/MANIFEST.MF">
+			<fileset dir="${basedir}/build/classes/java" />
+		</jar>
+	</target>
+	
 	<target name="deploy-war" depends="_target-not-available"
 		    description="Deploys WAR." />
 	
Index: lams_common/conf/persistence.xml
===================================================================
diff -u
--- lams_common/conf/persistence.xml	(revision 0)
+++ lams_common/conf/persistence.xml	(revision 92252270b8c634b6703f62b79d40d7cf6291da4f)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+	<persistence-unit name="lams_dummy_persistence_unit">
+	<!-- This file is need to trigger WildFly container cache initialisation,
+		 so we can reference it using JNDI in applicationContext. -->
+	</persistence-unit>
+</persistence>
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
diff -u -re6c70d383a9a5f72f6727a6a9a4f9e70494801dd -r92252270b8c634b6703f62b79d40d7cf6291da4f
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision e6c70d383a9a5f72f6727a6a9a4f9e70494801dd)
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision 92252270b8c634b6703f62b79d40d7cf6291da4f)
@@ -20,9 +20,13 @@
             
 			<prop key="hibernate.cache.use_query_cache">true</prop>
 		    <prop key="hibernate.cache.use_second_level_cache">true</prop>
-		    <prop key="hibernate.cache.infinispan.statistics">true</prop>
             <prop key="javax.persistence.sharedCache.mode">ALL</prop>
+            <prop key="hibernate.cache.infinispan.statistics">true</prop>
             
+            <!-- Only entity cache is fetched from WildFly container.
+            	 Query and collection cache templates need to be modified here. -->
+            <prop key="hibernate.cache.infinispan.cachemanager">java:jboss/infinispan/container/hibernate</prop>
+    
             <!-- Following configuration should be used in MULTINODE ENVIRONMENT
             	 before proper distributed cache configuration is not implemented.
             	 It creates local cache with short life span, minimising danger of stale cache on each node.
@@ -45,15 +49,8 @@
 			<prop key="hibernate.cache.infinispan.query.expiration.wake_up_interval">1000</prop>
 			 -->
 			 
-			 <!-- Below are immutable entities which can be kept in cache forever.
-			 	  Configuration is modified for each of them as defining a separate cache configuration template does not seem possible
-			 	  for EAR on WildFly without an explicit persistent unit configuration.
-			 	  None of these configuration entries work:
-			 <prop key="hibernate.cache.infinispan.lams.ear#org.lamsfoundation.lams.usermanagement.Role.expiration.max_idle">-1</prop>
-			 <prop key="hibernate.cache.infinispan.lams.ear#default.org.lamsfoundation.lams.usermanagement.Role.expiration.max_idle">-1</prop>
-			 <prop key="hibernate.cache.infinispan.lams.ear#null.org.lamsfoundation.lams.usermanagement.Role.expiration.max_idle">-1</prop>
-			 -->
 			 
+			 <!-- Below are immutable entities which can be kept in cache forever. -->
 			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.learningdesign.LearningLibrary.expiration.max_idle">-1</prop>
 			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.themes.Theme.expiration.max_idle">-1</prop>
 			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.timezone.Timezone.expiration.max_idle">-1</prop>
@@ -66,8 +63,8 @@
 			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.usermanagement.SupportedLocale.expiration.max_idle">-1</prop>
 			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.logevent.LogEventType.expiration.max_idle">-1</prop>
 
-
-            <!-- These are obsolete settings but left here as a reminder what we set up in the past.
+			
+            <!-- These are obsolete 2nd level cache settings but left here as a reminder what we set up in the past.
             <prop key="hibernate.cache.region.factory_class">org.infinispan.hibernate.cache.v53.InfinispanRegionFactory</prop>
             <prop key="hibernate.cache.default_cache_concurrency_strategy">TRANSACTIONAL</prop>
             -->