Index: lams_build/conf/slim/standalone.xml
===================================================================
diff -u -r26513e4a3a00a82cf700663c7cfe79d39c47732a -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision 26513e4a3a00a82cf700663c7cfe79d39c47732a)
+++ lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -365,32 +365,16 @@
                     <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 name="collection" statistics-enabled="false">
+                    <transaction mode="NON_XA" locking="OPTIMISTIC"/>
+                    <expiration max-idle="1800000"/>
                 </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:jca:4.0">
Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r5d1270cc9ab17a922b694e2073b464f8e91b7247 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 5d1270cc9ab17a922b694e2073b464f8e91b7247)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -388,6 +388,10 @@
                     <transaction mode="NON_XA" locking="OPTIMISTIC"/>
                     <expiration max-idle="1800000"/>
                 </local-cache>
+                <local-cache name="collection" statistics-enabled="false">
+                    <transaction mode="NON_XA" locking="OPTIMISTIC"/>
+                    <expiration max-idle="1800000"/>
+                </local-cache>
                 <local-cache name="timestamps"/>
             </cache-container>
         </subsystem>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml	(.../Event.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml	(.../Event.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -85,7 +85,9 @@
             sort="unsorted"
             fetch="join"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="event_uid"
             >
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	(.../ExtServerOrgMap.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	(.../ExtServerOrgMap.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -161,7 +161,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="ext_server_org_map_id"
             >
@@ -180,7 +182,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="ext_server_org_map_id"
             >
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -123,12 +123,16 @@
     </many-to-one>
     
 	<set  name="inputActivities" lazy="true" cascade="none" table="lams_input_activity" order-by="activity_id">
+    <cache usage="transactional" />
+
    		<key><column name="activity_id" /></key>
    		<many-to-many column="input_activity_id" class="org.lamsfoundation.lams.learningdesign.Activity"/>
 	</set>
 	
 	<!-- bi-directional assocation to BranchActivityEntry -->
 	<set name="branchActivityEntries" lazy="true" inverse="true" cascade="all-delete-orphan">
+    <cache usage="transactional" />
+
 		<key><column name="branch_activity_id" /></key>
 		<one-to-many class="org.lamsfoundation.lams.learningdesign.BranchActivityEntry"/>
 	</set>  
@@ -146,6 +150,8 @@
 				lesson -->
 				
 				<set name="competenceMappings" lazy="true" inverse="true" cascade="none" >
+    <cache usage="transactional" />
+
 			        
 			        <key><column name="activity_id" /></key>
 			        <one-to-many class="org.lamsfoundation.lams.learningdesign.CompetenceMapping"/>
@@ -158,12 +164,16 @@
 			    />
 			    
 			    <set name="gradebookUserActivities" lazy="true" inverse="true" cascade="none" >
+    <cache usage="transactional" />
+
 			        
 			        <key><column name="activity_id" /></key>
 			        <one-to-many class="org.lamsfoundation.lams.gradebook.GradebookUserActivity"/>
 			    </set>
 				
 				<set name="toolSessions" lazy="true" inverse="true" cascade="none" >
+    <cache usage="transactional" />
+
 			        
 			        <key><column name="activity_id" /></key>
 			        <one-to-many class="org.lamsfoundation.lams.tool.ToolSession"/>
@@ -204,6 +214,8 @@
              </many-to-one>                 
 
    			<set name="allowedToPassLearners" table="lams_gate_allowed_learners" lazy="true" cascade="none">
+    <cache usage="transactional" />
+
        			<key><column name="activity_id" /></key>
         		<many-to-many column="user_id" class="org.lamsfoundation.lams.usermanagement.User" />
    			</set>
@@ -248,6 +260,8 @@
 	    <!-- bi-directional one-to-many association to Activity. Don't use all-delete-orphan as the child activity may be removed -->
 	    <!-- from this relationship but not from the database (e.g. moving from an optional activity to the main level in the design -->
 	    <set name="activities" lazy="false" inverse="true" cascade="save-update" sort="org.lamsfoundation.lams.learningdesign.ActivityOrderComparator" >
+    <cache usage="transactional" />
+
     		    										
             <key><column name="parent_activity_id" /></key>
             <one-to-many class="org.lamsfoundation.lams.learningdesign.Activity"/>
@@ -303,6 +317,8 @@
                  </many-to-one>                 
 
 			    <set name="branchEntries" lazy="true" inverse="true" cascade="all-delete-orphan" >
+    <cache usage="transactional" />
+
 		    		    										
 		            <key><column name="sequence_activity_id" /></key>
 		            <one-to-many class="org.lamsfoundation.lams.learningdesign.BranchActivityEntry"/>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -63,6 +63,8 @@
         table="lams_user_group"
         batch-size="20"
     >
+    <cache usage="transactional" />
+
         <key>
             <column name="group_id" />
         </key>
@@ -79,6 +81,8 @@
 		cascade="none"
         batch-size="20"
     >
+    <cache usage="transactional" />
+
         
         <key>
             <column name="group_id" />
@@ -102,6 +106,8 @@
 	<!--  bi-directional many-to-one association to GroupBranchActivity -->
 	<!--  don't want all-delete-orphan as we will specifically delete the ones we don't want -->
    <set name="branchActivities" lazy="true" inverse="true" cascade="all">
+    <cache usage="transactional" />
+
         <key><column name="group_id" /></key>
         <one-to-many class="org.lamsfoundation.lams.learningdesign.BranchActivityEntry"/>
     </set>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -40,6 +40,8 @@
     
     <!-- bi-directional one-to-many association to Group-->
     <set name="groups" lazy="false" inverse="true" cascade="all-delete-orphan" batch-size="10">
+    <cache usage="transactional" />
+
     	
         <key><column name="grouping_id" /></key>
         <one-to-many class="org.lamsfoundation.lams.learningdesign.Group"/>        
@@ -52,6 +54,8 @@
         inverse="true"
 		cascade="none"
     >
+    <cache usage="transactional" />
+
         <key>
             <column name="grouping_id" />
         </key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -214,35 +214,47 @@
     
     <!-- bi-directional one-to-many association to LearningDesign -->
     <set name="childLearningDesigns" lazy="true" inverse="true" cascade="none">
+    <cache usage="transactional" />
+
         <key><column name="parent_learning_design_id" /></key>
         <one-to-many class="org.lamsfoundation.lams.learningdesign.LearningDesign"/>
     </set>
     
     <!-- bi-directional one-to-many association to Lesson -->
-    <set name="lessons" lazy="true" inverse="true" cascade="none">        
+    <set name="lessons" lazy="true" inverse="true" cascade="none">
+    <cache usage="transactional" />
+        
         <key><column name="learning_design_id" /></key>
         <one-to-many class="org.lamsfoundation.lams.lesson.Lesson"/>
     </set>
     
     <!-- bi-directional one-to-many association to Transition -->
     <set name="transitions" inverse="true" cascade="all-delete-orphan" sort="unsorted">
+    <cache usage="transactional" />
+
     	 <key><column name="learning_design_id" /></key>
     	 <one-to-many class="org.lamsfoundation.lams.learningdesign.Transition"/>
     </set>
     
     <!-- bi-directional one-to-many association to Activity -->
     <set name="activities" inverse="true" cascade="all-delete-orphan" sort="org.lamsfoundation.lams.learningdesign.ActivityOrderComparator">
+    <cache usage="transactional" />
+
     	 <key><column name="learning_design_id" /></key>
          <one-to-many class="org.lamsfoundation.lams.learningdesign.Activity"/>
     </set>
     
     <set name="competences" inverse="true" cascade="all-delete-orphan" >
+    <cache usage="transactional" />
+
     	 <key><column name="learning_design_id" /></key>
          <one-to-many class="org.lamsfoundation.lams.learningdesign.Competence"/>
     </set>
     
     <!-- bi-directional one-to-many association to Lesson -->
-    <set name="annotations" inverse="true" cascade="all-delete-orphan">        
+    <set name="annotations" inverse="true" cascade="all-delete-orphan">
+    <cache usage="transactional" />
+        
         <key><column name="learning_design_id" /></key>
         <one-to-many class="org.lamsfoundation.lams.learningdesign.LearningDesignAnnotation"/>
     </set>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -69,6 +69,8 @@
         inverse="true"
 		cascade="none"
     >
+    <cache usage="transactional" />
+
         
         <key>
             <column name="learning_library_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibraryGroup.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibraryGroup.hbm.xml	(.../LearningLibraryGroup.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibraryGroup.hbm.xml	(.../LearningLibraryGroup.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -43,7 +43,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="group_id"
             >
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -95,6 +95,8 @@
     
 	<subclass name="org.lamsfoundation.lams.learningdesign.DataTransition" discriminator-value="1">		    
 	    <set name="dataFlowObjects" lazy="true" inverse="true" cascade="all">
+    <cache usage="transactional" />
+
 	        
 	        <key><column name="transition_id" /></key>
 	        <one-to-many class="org.lamsfoundation.lams.learningdesign.DataFlowObject"/>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	(.../Lesson.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	(.../Lesson.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -97,6 +97,8 @@
 		<!-- bi-directional one-to-many association to LearnerProgress -->
 		<set name="learnerProgresses" lazy="true" inverse="true"
 			cascade="all-delete-orphan">
+    <cache usage="transactional" />
+
 			<key>
 				<column name="lesson_id" />
 			</key>
@@ -107,6 +109,8 @@
 		<!-- bi-directional one-to-many association to gradebookUserLessons -->
 		<set name="gradebookUserLessons" lazy="true" inverse="true"
 			cascade="all-delete-orphan">
+    <cache usage="transactional" />
+
 			<key>
 				<column name="lesson_id" />
 			</key>
@@ -132,6 +136,8 @@
 		</many-to-one>
 		
 		<set name="precedingLessons" table="lams_lesson_dependency" cascade="all" >
+    <cache usage="transactional" />
+
             <key>
                 <column name="lesson_id" not-null="true" />
             </key>
@@ -141,6 +147,8 @@
         </set>
         
        <set name="succeedingLessons" table="lams_lesson_dependency" cascade="all" >
+    <cache usage="transactional" />
+
             <key>
                 <column name="preceding_lesson_id" not-null="true" />
             </key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml	(.../PedagogicalPlannerSequenceNode.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml	(.../PedagogicalPlannerSequenceNode.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -86,7 +86,9 @@
             sort="unsorted"
             order-by="order_id asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="parent_uid"
             >
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml	(.../Tool.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml	(.../Tool.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -238,6 +238,8 @@
         inverse="true"
 		cascade="none"
     >
+    <cache usage="transactional" />
+
         
         <key>
             <column name="tool_id" />
@@ -253,6 +255,8 @@
     	inverse="false" 
     	cascade="none" 
     	sort="unsorted" >
+    <cache usage="transactional" />
+
     	
 		<key column="tool_id"></key>
 		<one-to-many class="org.lamsfoundation.lams.integration.ExtServerToolAdapterMap"/>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml	(.../ToolContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml	(.../ToolContent.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -46,6 +46,8 @@
         inverse="true"
 		cascade="none"
     >
+    <cache usage="transactional" />
+
         
         <key>
             <column name="tool_content_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml	(.../AuthenticationMethod.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml	(.../AuthenticationMethod.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -62,6 +62,8 @@
         inverse="true"
 		cascade="none"
     >
+    <cache usage="transactional" />
+
         
         <key>
             <column name="authentication_method_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml	(.../AuthenticationMethodType.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml	(.../AuthenticationMethodType.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -51,6 +51,8 @@
         inverse="true"
 		cascade="none"
     >
+    <cache usage="transactional" />
+
         
         <key>
             <column name="authentication_method_type_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -113,6 +113,8 @@
 		<!-- bi-directional one-to-many association to UserOrganisation -->
 		<set name="userOrganisations" lazy="true" inverse="true"
 			cascade="all-delete-orphan">
+    <cache usage="transactional" />
+
 			
 
 			<key>
@@ -124,6 +126,8 @@
 		<!-- bi-directional one-to-many association to WorkspaceFolder -->
 		<set name="childOrganisations" lazy="true" inverse="true"
 			cascade="all-delete-orphan">
+    <cache usage="transactional" />
+
 			
 
 			
@@ -140,6 +144,8 @@
 		</many-to-one>
 		<!-- bi-directional one-to-many association to Lesson -->
 		<set name="lessons" lazy="extra" inverse="true" cascade="none">
+    <cache usage="transactional" />
+
 			
 			<key>
 				<column name="organisation_id" />
@@ -149,6 +155,8 @@
 		
 		<!-- bi-directional one-to-many association to WorkspaceFolder -->
 		<set cascade="all-delete-orphan" inverse="true" lazy="true" name="workspaceFolders" sort="unsorted">
+    <cache usage="transactional" />
+
 			<key>
 				<column name="organisation_id" />
 			</key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationGroup.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationGroup.hbm.xml	(.../OrganisationGroup.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationGroup.hbm.xml	(.../OrganisationGroup.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -51,7 +51,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="group_id"
             >
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationGrouping.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationGrouping.hbm.xml	(.../OrganisationGrouping.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationGrouping.hbm.xml	(.../OrganisationGrouping.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -51,7 +51,9 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="grouping_id"
             >
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationState.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationState.hbm.xml	(.../OrganisationState.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationState.hbm.xml	(.../OrganisationState.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -49,6 +49,8 @@
         inverse="true"
 		cascade="none"
     >
+    <cache usage="transactional" />
+
         
         <key>
             <column name="organisation_state_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml	(.../OrganisationType.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml	(.../OrganisationType.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -61,6 +61,8 @@
         inverse="true"
 		cascade="none"
     >
+    <cache usage="transactional" />
+
         
         <key>
             <column name="organisation_type_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Privilege.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Privilege.hbm.xml	(.../Privilege.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Privilege.hbm.xml	(.../Privilege.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -57,6 +57,8 @@
         inverse="true"
 		cascade="delete-orphan"
     >
+    <cache usage="transactional" />
+
         
         <key>
             <column name="privilege_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Role.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Role.hbm.xml	(.../Role.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Role.hbm.xml	(.../Role.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -59,6 +59,8 @@
         inverse="true"
 		cascade="delete-orphan"
     >
+    <cache usage="transactional" />
+
         
         <key>
             <column name="role_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -120,6 +120,8 @@
 		</many-to-one>
 		<!-- bi-directional one-to-many association to UserOrganisation -->
 		<set name="userOrganisations" inverse="true" cascade="all-delete-orphan">
+    <cache usage="transactional" />
+
 			
 
 			<key>
@@ -145,6 +147,8 @@
 
 		<!-- bi-directional one-to-many association to LearnerProgress -->
 		<set name="learnerProgresses" lazy="extra" inverse="true" cascade="none">
+    <cache usage="transactional" />
+
 			
 			<key>
 				<column name="user_id" />
@@ -155,6 +159,8 @@
 
 		<!-- bi-directional one-to-many association to LearningDesign -->
 		<set name="learningDesigns" lazy="true" inverse="true" cascade="none">
+    <cache usage="transactional" />
+
 			
 			<key>
 				<column name="user_id" />
@@ -164,6 +170,8 @@
 
 		<!-- bi-directional one-to-many association to Lesson -->
 		<set name="lessons" lazy="true" inverse="true" cascade="none">
+    <cache usage="transactional" />
+
 			
 			<key>
 				<column name="user_id" />
@@ -207,14 +215,18 @@
 		<set name="recentlyModifiedLearningDesigns" table="lams_planner_recent_learning_designs"
 			lazy="true" inverse="false" cascade="all-delete-orphan" sort="unsorted"
 			order-by="last_modified_date DESC">
+    <cache usage="transactional" />
 
+
 			<key column="user_id"></key>
 
 			<element column="learning_design_id" type="long" not-null="true" />
 		</set>
 
 		<set name="pagesWithDisabledTutorials" lazy="false"
 			table="lams_user_disabled_tutorials" cascade="all-delete-orphan">
+    <cache usage="transactional" />
+
 			<key>
 				<column name="user_id" />
 			</key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -49,6 +49,8 @@
         inverse="true"
 		cascade="all-delete-orphan"
     >
+    <cache usage="transactional" />
+
         
         
         <key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -48,6 +48,8 @@
 		<!-- bi-directional one-to-many association to WorkspaceFolder -->
 		<set name="childWorkspaceFolders" lazy="true" inverse="true"
 			cascade="none">
+    <cache usage="transactional" />
+
 			
 			<key>
 				<column name="parent_folder_id" />
@@ -63,6 +65,8 @@
 
 		<!-- bi-directional one-to-many association to LearningDesign -->
 		<set name="learningDesigns" lazy="true" inverse="true" cascade="none">
+    <cache usage="transactional" />
+
 			
 			<key>
 				<column name="workspace_folder_id" />
@@ -72,6 +76,8 @@
 
 		<!-- bi-directional one-to-many association to WorkspaceFolderContent -->
 		<set name="folderContent" lazy="true" inverse="true" cascade="delete">
+    <cache usage="transactional" />
+
 			<key>
 				<column name="workspace_folder_id" />
 			</key>
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml	(.../CrCredential.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml	(.../CrCredential.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -57,7 +57,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="credential_id"
             >
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml
===================================================================
diff -u -r2ace1ae28b1708b69c4cfbdedc60640d231148bb -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml	(.../CrNode.hbm.xml)	(revision 2ace1ae28b1708b69c4cfbdedc60640d231148bb)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml	(.../CrNode.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -98,6 +98,8 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
+
             <key
                 column="node_id"
             >
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml
===================================================================
diff -u -r2ace1ae28b1708b69c4cfbdedc60640d231148bb -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml	(.../CrNodeVersion.hbm.xml)	(revision 2ace1ae28b1708b69c4cfbdedc60640d231148bb)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml	(.../CrNodeVersion.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -78,6 +78,8 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
+
             <key
                 column="nv_id"
             >
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml	(.../CrWorkspace.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml	(.../CrWorkspace.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -47,7 +47,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="workspace_id"
             >
@@ -66,7 +68,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="workspace_id"
             >
Index: lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/Kumalive.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/Kumalive.hbm.xml	(.../Kumalive.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/Kumalive.hbm.xml	(.../Kumalive.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -27,6 +27,8 @@
 		</many-to-one>
 		
 		<set name="rubrics" table="lams_kumalive_rubric" lazy="false" order-by="orderId asc">
+    <cache usage="transactional" />
+
     		<key column="kumalive_id"/>
     		<one-to-many class="org.lamsfoundation.lams.learning.kumalive.model.KumaliveRubric" />
 		</set>
Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml	(.../Assessment.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml	(.../Assessment.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -102,7 +102,9 @@
             sort="unsorted"
             order-by="sequence_id asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="assessment_uid"
             >
@@ -122,7 +124,9 @@
             sort="unsorted"
             order-by="sequence_id asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="assessment_uid"
             >
@@ -141,7 +145,9 @@
             sort="unsorted"
             order-by="sequence_id asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="assessment_uid"
             >
Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml	(.../AssessmentQuestion.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml	(.../AssessmentQuestion.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -189,7 +189,9 @@
             sort="unsorted"
             order-by="sequence_id asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="question_uid"
             >
@@ -208,7 +210,9 @@
             sort="unsorted"
             order-by="sequence_id asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="question_uid"
             >
Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml	(.../AssessmentQuestionResult.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml	(.../AssessmentQuestionResult.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -110,7 +110,9 @@
             cascade="all"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="question_result_uid"
             >
Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.hbm.xml	(.../AssessmentResult.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.hbm.xml	(.../AssessmentResult.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -110,7 +110,9 @@
             cascade="all"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="result_uid"
             >
Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.hbm.xml	(.../AssessmentSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.hbm.xml	(.../AssessmentSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -87,7 +87,9 @@
             sort="unsorted"
             order-by="create_date desc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="session_uid"
             >
@@ -107,7 +109,9 @@
             sort="unsorted"
             order-by="last_name asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="session_uid"
             >
Index: lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/Bbb.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/Bbb.hbm.xml	(.../Bbb.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/Bbb.hbm.xml	(.../Bbb.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -132,7 +132,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="bbb_uid"
             >
Index: lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbSession.hbm.xml	(.../BbbSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbSession.hbm.xml	(.../BbbSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -92,7 +92,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="bbb_session_uid"
             >
Index: lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/Chat.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/Chat.hbm.xml	(.../Chat.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/Chat.hbm.xml	(.../Chat.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -132,7 +132,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="chat_uid"
             >
@@ -176,7 +178,9 @@
             cascade="all"
             sort="org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="content_uid"
             >
Index: lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatSession.hbm.xml	(.../ChatSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatSession.hbm.xml	(.../ChatSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -91,7 +91,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="chat_session_uid"
             >
@@ -110,7 +112,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="chat_session_uid"
             >
Index: lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/Daco.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/Daco.hbm.xml	(.../Daco.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/Daco.hbm.xml	(.../Daco.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -87,7 +87,9 @@
             order-by="uid asc"
             fetch="join"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="content_uid"
             >
Index: lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.hbm.xml	(.../DacoQuestion.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.hbm.xml	(.../DacoQuestion.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -110,7 +110,9 @@
             sort="unsorted"
             order-by="sequence_num asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="question_uid"
             >
Index: lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoSession.hbm.xml	(.../DacoSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoSession.hbm.xml	(.../DacoSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -87,7 +87,9 @@
             sort="unsorted"
             order-by="create_date desc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="session_uid"
             >
Index: lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoUser.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoUser.hbm.xml	(.../DacoUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoUser.hbm.xml	(.../DacoUser.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -102,7 +102,9 @@
             order-by="record_id asc, uid asc"
             fetch="join"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="user_uid"
             >
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -95,7 +95,9 @@
             sort="unsorted"
             order-by="create_date desc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="forum_uid"
             >
@@ -266,7 +268,9 @@
             cascade="all"
             sort="org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="content_uid"
             >
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml
===================================================================
diff -u -r7af0a437b323d3d479c87d6a8884125213dc4411 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml	(.../ForumCondition.hbm.xml)	(revision 7af0a437b323d3d479c87d6a8884125213dc4411)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml	(.../ForumCondition.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -23,6 +23,8 @@
 	            order-by="topic_uid asc"
 	            
 	     >
+    <cache usage="transactional" />
+
 	
 	            <key
 	                column="condition_id"
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -141,7 +141,9 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="message_uid"
             >
@@ -204,7 +206,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="authored_parent_uid"
             >
Index: lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml	(.../Gmap.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml	(.../Gmap.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -114,7 +114,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="gmap_uid"
             >
@@ -132,7 +134,9 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="gmap_uid"
             >
Index: lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapSession.hbm.xml	(.../GmapSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapSession.hbm.xml	(.../GmapSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -91,7 +91,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="gmap_session_uid"
             >
Index: lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml	(.../ImageGallery.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml	(.../ImageGallery.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -93,7 +93,9 @@
             sort="unsorted"
             order-by="create_date desc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="imageGallery_uid"
             >
@@ -178,7 +180,9 @@
             sort="unsorted"
             order-by="order_id asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="tool_content_id"
 				property-ref="contentId"
Index: lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.hbm.xml	(.../CommonCartridge.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.hbm.xml	(.../CommonCartridge.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -86,7 +86,9 @@
             sort="unsorted"
             order-by="create_date desc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="commonCartridge_uid"
             >
Index: lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.hbm.xml	(.../CommonCartridgeItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.hbm.xml	(.../CommonCartridgeItem.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -76,7 +76,9 @@
             sort="unsorted"
             order-by="sequence_id asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="item_uid"
             >
Index: lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/Kaltura.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/Kaltura.hbm.xml	(.../Kaltura.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/Kaltura.hbm.xml	(.../Kaltura.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -183,7 +183,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="kaltura_uid"
             >
@@ -203,7 +205,9 @@
             sort="unsorted"
             order-by="create_date desc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="kaltura_uid"
             >
Index: lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaItem.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaItem.hbm.xml	(.../KalturaItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaItem.hbm.xml	(.../KalturaItem.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -120,7 +120,9 @@
             sort="unsorted"
             order-by="create_date asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="kaltura_item_uid"
             >
Index: lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaSession.hbm.xml	(.../KalturaSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaSession.hbm.xml	(.../KalturaSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -91,7 +91,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="kaltura_session_uid"
             >
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -187,6 +187,8 @@
             cascade="all"
             sort="unsorted"
         >
+    <cache usage="transactional" />
+
               <key
                   column="mc_content_id"
               >
@@ -205,6 +207,8 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
+
               <key
                   column="mc_content_id"
               >
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.hbm.xml	(.../McQueContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.hbm.xml	(.../McQueContent.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -91,6 +91,8 @@
 		cascade="all"
 		order-by="displayOrder"
     >
+    <cache usage="transactional" />
+
         <key>
             <column name="mc_que_content_id" />
         </key>
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McSession.hbm.xml	(.../McSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McSession.hbm.xml	(.../McSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -81,6 +81,8 @@
         cascade="all-delete-orphan"
         sort="unsorted"
     >
+    <cache usage="transactional" />
+
         <key>
         	<column name="mc_session_id" />
    		</key>
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml
===================================================================
diff -u -r7af0a437b323d3d479c87d6a8884125213dc4411 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml	(.../QaCondition.hbm.xml)	(revision 7af0a437b323d3d479c87d6a8884125213dc4411)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml	(.../QaCondition.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -22,6 +22,8 @@
 	            sort="unsorted"
 	            order-by="question_uid asc"
 	     >
+    <cache usage="transactional" />
+
 	
 	            <key
 	                column="condition_id"
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -188,7 +188,9 @@
         sort="unsorted"
         order-by="order_id asc"
      >
+    <cache usage="transactional" />
 
+
         <key
             column="tool_content_id"
             property-ref="qaContentId"
@@ -223,6 +225,8 @@
             cascade="all"
             order-by="display_order"
         >
+    <cache usage="transactional" />
+
               <key
                   column="qa_content_id"
               >
@@ -240,6 +244,8 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
+
               <key
                   column="qa_content_id"
               >
@@ -258,7 +264,9 @@
             cascade="all"
             sort="org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="content_uid"
             >
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	(.../QaQueUsr.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	(.../QaQueUsr.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -78,7 +78,9 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
               <key
                   column="que_usr_id" 
               >
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -84,6 +84,8 @@
         cascade="all-delete-orphan"
         sort="unsorted"
     >
+    <cache usage="transactional" />
+
         <key>
         	<column name="qa_session_id" />
    		</key>
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCategory.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCategory.hbm.xml	(.../QaWizardCategory.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCategory.hbm.xml	(.../QaWizardCategory.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -45,7 +45,9 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="category_uid"
             >
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.hbm.xml	(.../QaWizardCognitiveSkill.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.hbm.xml	(.../QaWizardCognitiveSkill.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -56,7 +56,9 @@
             sort="unsorted"
             order-by="uid asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="cognitive_skill_uid"
             >
Index: lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml	(.../Resource.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml	(.../Resource.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -86,7 +86,9 @@
             sort="unsorted"
             order-by="create_date desc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="resource_uid"
             >
@@ -195,7 +197,9 @@
             sort="unsorted"
             order-by="order_id asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="tool_content_id"
 				property-ref="contentId"
Index: lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -76,7 +76,9 @@
             sort="unsorted"
             order-by="sequence_id asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="item_uid"
             >
Index: lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml	(.../ResourceSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml	(.../ResourceSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -87,7 +87,9 @@
             sort="unsorted"
             order-by="create_date desc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="session_uid"
             >
Index: lams_tool_leader/conf/hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_leader/conf/hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.hbm.xml	(.../Leaderselection.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_leader/conf/hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.hbm.xml	(.../Leaderselection.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -105,7 +105,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="leaderselection_uid"
             >
Index: lams_tool_leader/conf/hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_leader/conf/hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.hbm.xml	(.../LeaderselectionSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_leader/conf/hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.hbm.xml	(.../LeaderselectionSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -91,7 +91,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="leaderselection_session_uid"
             >
Index: lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.hbm.xml	(.../Mindmap.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.hbm.xml	(.../Mindmap.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -156,7 +156,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="mindmap_uid"
             >
Index: lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.hbm.xml	(.../MindmapSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.hbm.xml	(.../MindmapSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -91,7 +91,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="mindmap_session_uid"
             >
Index: lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml	(.../NoticeboardContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml	(.../NoticeboardContent.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -136,7 +136,9 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="nb_content_uid"
             >
Index: lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml	(.../NoticeboardSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml	(.../NoticeboardSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -96,7 +96,9 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="nb_session_uid"
             >
Index: lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml	(.../Notebook.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml	(.../Notebook.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -140,7 +140,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="notebook_uid"
             >
@@ -158,7 +160,9 @@
             cascade="all"
             sort="org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="content_uid"
             >
Index: lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookSession.hbm.xml	(.../NotebookSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookSession.hbm.xml	(.../NotebookSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -91,7 +91,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="notebook_session_uid"
             >
Index: lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/Pixlr.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/Pixlr.hbm.xml	(.../Pixlr.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/Pixlr.hbm.xml	(.../Pixlr.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -132,7 +132,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="pixlr_uid"
             >
Index: lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/PixlrSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/PixlrSession.hbm.xml	(.../PixlrSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/PixlrSession.hbm.xml	(.../PixlrSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -91,7 +91,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="pixlr_session_uid"
             >
Index: lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml	(.../Peerreview.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml	(.../Peerreview.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -181,6 +181,8 @@
         	cascade="all" 
         	sort="unsorted" 
         	order-by="order_id asc">
+    <cache usage="transactional" />
+
         	<key 
         		column="tool_content_id" 
         		property-ref="contentId">
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml	(.../SubmitFilesSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml	(.../SubmitFilesSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -45,7 +45,9 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="session_id"
             >
Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml	(.../Scratchie.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml	(.../Scratchie.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -76,7 +76,9 @@
             sort="unsorted"
             order-by="order_id asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="scratchie_uid"
             >
Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.hbm.xml	(.../ScratchieItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.hbm.xml	(.../ScratchieItem.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -76,7 +76,9 @@
             sort="unsorted"
             order-by="order_id asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="scratchie_item_uid"
             >
Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.hbm.xml	(.../ScratchieSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.hbm.xml	(.../ScratchieSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -95,7 +95,9 @@
             sort="unsorted"
             order-by="create_date desc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="session_uid"
             >
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml	(.../Scribe.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml	(.../Scribe.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -140,7 +140,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="scribe_uid"
             >
@@ -159,7 +161,9 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="scribe_uid"
             >
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml	(.../ScribeSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml	(.../ScribeSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -91,7 +91,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="scribe_session_uid"
             >
@@ -110,7 +112,9 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="scribe_session_uid"
             >
Index: lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml	(.../Survey.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml	(.../Survey.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -86,7 +86,9 @@
             sort="unsorted"
             order-by="sequence_id asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="survey_uid"
             >
@@ -169,7 +171,9 @@
             cascade="all"
             sort="org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="content_uid"
             >
Index: lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml
===================================================================
diff -u -r329ca3f50cb1a0409803b0a4c8c21717bb63e60c -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml	(.../SurveyCondition.hbm.xml)	(revision 329ca3f50cb1a0409803b0a4c8c21717bb63e60c)
+++ lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml	(.../SurveyCondition.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -23,6 +23,8 @@
 	            order-by="question_uid asc"
 	            
 	     >
+    <cache usage="transactional" />
+
 	
 	            <key
 	                column="condition_id"
Index: lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml	(.../SurveyQuestion.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml	(.../SurveyQuestion.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -44,7 +44,9 @@
             sort="unsorted"
             order-by="sequence_id asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="question_uid"
             >
Index: lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskList.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskList.hbm.xml	(.../TaskList.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskList.hbm.xml	(.../TaskList.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -78,7 +78,9 @@
             sort="unsorted"
             order-by="sequence_id asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="taskList_uid"
             >
@@ -98,7 +100,9 @@
             sort="unsorted"
             order-by="sequence_id asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="taskList_uid"
             >
Index: lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml	(.../TaskListCondition.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml	(.../TaskListCondition.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -44,7 +44,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="condition_uid"
             >
Index: lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml	(.../TaskListItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml	(.../TaskListItem.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -176,7 +176,9 @@
             sort="unsorted"
             order-by="create_date asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="taskList_item_uid"
             >
@@ -196,7 +198,9 @@
             sort="unsorted"
             order-by="create_date asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="taskList_item_uid"
             >
Index: lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListSession.hbm.xml	(.../TaskListSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListSession.hbm.xml	(.../TaskListSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -87,7 +87,9 @@
             sort="unsorted"
             order-by="create_date desc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="session_uid"
             >
Index: lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.hbm.xml	(.../VoteContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.hbm.xml	(.../VoteContent.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -184,6 +184,8 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
+
               <key
                   column="vote_content_id"
               >
@@ -202,6 +204,8 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
+
               <key
                   column="vote_content_id"
               >
Index: lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.hbm.xml	(.../VoteQueUsr.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.hbm.xml	(.../VoteQueUsr.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -96,6 +96,8 @@
             cascade="all-delete-orphan"
             sort="unsorted"
         >
+    <cache usage="transactional" />
+
               <key
                   column="que_usr_id"
               >
Index: lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.hbm.xml	(.../VoteSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.hbm.xml	(.../VoteSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -91,6 +91,8 @@
         cascade="all-delete-orphan"
         sort="unsorted"
     >
+    <cache usage="transactional" />
+
         <key>
         	<column name="vote_session_id" />
    		</key>
Index: lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml	(.../Wiki.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml	(.../Wiki.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -184,7 +184,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="wiki_uid"
             >
@@ -204,7 +206,9 @@
             sort="unsorted"
             order-by="uid asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="wiki_uid"
             >
Index: lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPage.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPage.hbm.xml	(.../WikiPage.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPage.hbm.xml	(.../WikiPage.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -76,7 +76,9 @@
             sort="unsorted"
             order-by="uid asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="wiki_page_uid"
             >
Index: lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiSession.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab
--- lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiSession.hbm.xml	(.../WikiSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiSession.hbm.xml	(.../WikiSession.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
@@ -91,7 +91,9 @@
             cascade="none"
             sort="unsorted"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="wiki_session_uid"
             >
@@ -111,7 +113,9 @@
             sort="unsorted"
             order-by="uid asc"
         >
+    <cache usage="transactional" />
 
+
             <key
                 column="wiki_session_uid"
             >