Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml	(.../Comment.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml	(.../Comment.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,6 +11,8 @@
         table="lams_comment"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentLike.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentLike.hbm.xml	(.../CommentLike.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentLike.hbm.xml	(.../CommentLike.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,6 +11,8 @@
         table="lams_comment_likes"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentSession.hbm.xml
===================================================================
diff -u -r9ab6da017a5180a0ee0e766740571644972ce628 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentSession.hbm.xml	(.../CommentSession.hbm.xml)	(revision 9ab6da017a5180a0ee0e766740571644972ce628)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentSession.hbm.xml	(.../CommentSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,6 +11,8 @@
         table="lams_comment_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/config/ConfigurationItem.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/config/ConfigurationItem.hbm.xml	(.../ConfigurationItem.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/config/ConfigurationItem.hbm.xml	(.../ConfigurationItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_configuration"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="key"
             column="config_key"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml	(.../Event.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml	(.../Event.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_notification_event"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Subscription.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Subscription.hbm.xml	(.../Subscription.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Subscription.hbm.xml	(.../Subscription.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_notification_subscription"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml	(.../GradebookUserActivity.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml	(.../GradebookUserActivity.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_gradebook_user_activity"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivityArchive.hbm.xml
===================================================================
diff -u -r8daec7e047f7ea8404c6f16218b63a8e855a15b2 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivityArchive.hbm.xml	(.../GradebookUserActivityArchive.hbm.xml)	(revision 8daec7e047f7ea8404c6f16218b63a8e855a15b2)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivityArchive.hbm.xml	(.../GradebookUserActivityArchive.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_gradebook_user_activity_archive"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLesson.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLesson.hbm.xml	(.../GradebookUserLesson.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLesson.hbm.xml	(.../GradebookUserLesson.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_gradebook_user_lesson"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLessonArchive.hbm.xml
===================================================================
diff -u -r8daec7e047f7ea8404c6f16218b63a8e855a15b2 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLessonArchive.hbm.xml	(.../GradebookUserLessonArchive.hbm.xml)	(revision 8daec7e047f7ea8404c6f16218b63a8e855a15b2)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLessonArchive.hbm.xml	(.../GradebookUserLessonArchive.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_gradebook_user_lesson_archive"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml
===================================================================
diff -u -r11b64f81e406ff277c7c35988304b0064300de57 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml	(.../ExtCourseClassMap.hbm.xml)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml	(.../ExtCourseClassMap.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,25 +15,17 @@
     name="org.lamsfoundation.lams.integration.ExtCourseClassMap" 
     table="lams_ext_course_class_map"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_ext_course_class_map"
-    </meta>
 
+		<cache usage="transactional" />
+    
+
     <id
         name="sid"
         type="java.lang.Integer"
         column="sid"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Integer"
-            column="sid"
-
-
-        </meta>
-        <meta attribute="use-in-equals">true</meta>
+        
+        
         <generator class="native" />
     </id>
 
@@ -44,13 +36,8 @@
         not-null="true"
         length="255"
     >
-        <meta attribute="use-in-tostring">true</meta>
-        <meta attribute="field-description">
-           @hibernate.property
-            column="courseid"
-            length="255"
-            not-null="true"
-        </meta>    
+        
+            
     </property>
 
     <!-- Associations -->
@@ -61,11 +48,7 @@
         class="org.lamsfoundation.lams.integration.ExtServer"
         not-null="true"
     >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="ext_server_org_map_id"         
-        </meta>
+        
         <column name="ext_server_org_map_id" />
     </many-to-one>
     <!-- bi-directional many-to-one association to Organisation -->
@@ -74,11 +57,7 @@
         class="org.lamsfoundation.lams.usermanagement.Organisation"
         not-null="true"
     >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="classid"         
-        </meta>
+        
         <column name="classid" />
     </many-to-one>
 
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml	(.../ExtServerLessonMap.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml	(.../ExtServerLessonMap.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_ext_server_lesson_map"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
===================================================================
diff -u -r953f62a7fc515e2dc5c4ad983df233070cf7a82c -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	(.../ExtServerOrgMap.hbm.xml)	(revision 953f62a7fc515e2dc5c4ad983df233070cf7a82c)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	(.../ExtServerOrgMap.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,6 +11,8 @@
         table="lams_ext_server_org_map"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="sid"
             column="sid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml	(.../ExtServerToolAdapterMap.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml	(.../ExtServerToolAdapterMap.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_ext_server_tool_map"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml	(.../ExtUserUseridMap.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml	(.../ExtUserUseridMap.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_ext_user_userid_map"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="sid"
             column="sid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u -r463716d6023591c9c35eeb5057a16c903289029e -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 463716d6023591c9c35eeb5057a16c903289029e)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,64 +12,66 @@
 -->
 
 <class name="org.lamsfoundation.lams.learningdesign.Activity" table="lams_learning_activity" discriminator-value="0">
-    <meta attribute="class-description" inherit="false">@hibernate.class table="lams_learning_activity"</meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
+
+		<cache usage="transactional" />
+    
+    
 	
-	<cache usage="transactional"/>
+	
     
     <id name="activityId" type="java.lang.Long" column="activity_id">
-        <meta attribute="field-description">@hibernate.id generator-class="native" type="java.lang.Long" column="activity_id"</meta>
+        
         <generator class="native" />
     </id>
     
     <discriminator column="learning_activity_type_id" insert="false"/>
 
 
     <property name="activityUIID" type="java.lang.Integer" column="activity_ui_id" length="11">
-        <meta attribute="field-description">@hibernate.property column="activity_ui_id" length="11" </meta>    
+            
     </property>
     
     <property name="description" type="java.lang.String" column="description" length="65535">
-        <meta attribute="field-description">@hibernate.property column="description" length="65535" </meta>    
+            
     </property>
     
     <property name="title" type="java.lang.String" column="title" length="255" >
-        <meta attribute="field-description">@hibernate.property column="title" length="255" </meta>    
+            
     </property>
 
     <property name="xcoord" type="java.lang.Integer" column="xcoord" length="11" >
-        <meta attribute="field-description">@hibernate.property column="xcoord" length="11" </meta>    
+            
     </property>
 
     <property name="ycoord" type="java.lang.Integer" column="ycoord" length="11">
-        <meta attribute="field-description">@hibernate.property column="ycoord" length="11"</meta>    
+            
     </property>
 
     <property name="orderId" type="java.lang.Integer"  column="order_id" length="11">
-        <meta attribute="field-description">@hibernate.property column="order_id" length="11"</meta>    
+            
     </property>
 
     <property name="createDateTime" type="java.sql.Timestamp" column="create_date_time" not-null="true" length="19">
-        <meta attribute="field-description">@hibernate.property column="create_date_time" length="19" not-null="true"</meta>    
+            
     </property>
 
     <property name="parentUIID" type="java.lang.Integer" column="parent_ui_id" length="11">
-        <meta attribute="field-description">@hibernate.property column="parent_ui_id" length="11" </meta>    
+            
     </property>
     <property name="groupingUIID" type="java.lang.Integer" column="grouping_ui_id" length="11">
-				        <meta attribute="field-description">@hibernate.property column="grouping_ui_id" length="11"</meta>    
+				            
 	</property>				
     
     <property name="activityTypeId" type="java.lang.Integer" column="learning_activity_type_id" length="11" not-null="true">
-    	        <meta attribute="field-description">@hibernate.property column="learning_activity_type_id" length="11"</meta>    
+    	            
    	</property>
    	
    	<property name="activityCategoryID" type="java.lang.Integer" column="activity_category_id" length="11">
-    	        <meta attribute="field-description">@hibernate.property column="activity_category_id" length="11"</meta>    
+    	            
    	</property>
    	
     <property name="libraryActivityUiImage" type="java.lang.String" column="library_activity_ui_image" length="255">
-        <meta attribute="field-description">@hibernate.property column="library_activity_ui_image" length="255"</meta>    
+            
     </property>
     
     <property name="applyGrouping" type="java.lang.Boolean" column="apply_grouping_flag" not-null="true" length="4"/>
@@ -81,49 +83,42 @@
 
     <!-- Associations -->
     <many-to-one name="transitionTo" class="org.lamsfoundation.lams.learningdesign.Transition">
-        <meta attribute="field-description">@hibernate.column name="transition_to_id"         
-        </meta>
+        
         <column name="transition_to_id" />
     </many-to-one>
     <many-to-one name="transitionFrom" class="org.lamsfoundation.lams.learningdesign.Transition">
-        <meta attribute="field-description">@hibernate.column name="transition_from_id"         
-        </meta>
+        
         <column name="transition_from_id" />
     </many-to-one>
    
     <!-- bi-directional many-to-one association to LearningLibrary -->
     <many-to-one name="learningLibrary" class="org.lamsfoundation.lams.learningdesign.LearningLibrary">
-        <meta attribute="field-description">@hibernate.column name="learning_library_id"         
-        </meta>
+        
         <column name="learning_library_id" />
     </many-to-one>
    
     
     <!-- bi-directional many-to-one association to Activity -->
     <many-to-one name="parentActivity" class="org.lamsfoundation.lams.learningdesign.Activity">
-        <meta attribute="field-description">@hibernate.column name="parent_activity_id"         
-        </meta>
+        
         <column name="parent_activity_id" />
     </many-to-one>
     
     <!-- bi-directional many-to-one association to Activity -->
     <many-to-one name="libraryActivity" class="org.lamsfoundation.lams.learningdesign.Activity">
-        <meta attribute="field-description">@hibernate.column name="libraryActivity"         
-        </meta>
+        
         <column name="library_activity_id" />
     </many-to-one>
         
     <!-- bi-directional many-to-one association to LearningDesign -->
     <many-to-one name="learningDesign" class="org.lamsfoundation.lams.learningdesign.LearningDesign">
-        <meta attribute="field-description">@hibernate.column name="learning_design_id"         
-        </meta>
+        
         <column name="learning_design_id" />
     </many-to-one>
     
     <!-- bi-directional many-to-one association to Grouping -->
     <many-to-one name="grouping" class="org.lamsfoundation.lams.learningdesign.Grouping">
-        <meta attribute="field-description">@hibernate.column name="grouping_id"         
-        </meta>
+        
         <column name="grouping_id" />
     </many-to-one>
     
@@ -140,21 +135,18 @@
     
     <!-- Subclass definations for polymorphic persistence -->
     <subclass name="org.lamsfoundation.lams.learningdesign.SimpleActivity" >
-     	 <meta attribute="class-description" inherit="false">@hibernate.class </meta>
-         <meta attribute="scope-class" inherit="false">public abstract</meta>
+     	 
          
+         
 			<subclass name="org.lamsfoundation.lams.learningdesign.ToolActivity" discriminator-value="1">
-				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				
 				<property name="toolContentId" type="java.lang.Long" column="tool_content_id" length="20" />
 				
 				<!-- needs to be lazy because each tool session contains user and
 				lesson -->
 				
 				<set name="competenceMappings" lazy="true" inverse="true" cascade="none" >
-			        <meta attribute="field-description">@hibernate.set lazy="false" inverse="true" cascade="none"
-        												@hibernate.collection-key column="competence_mapping_id"
-        										        @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.CompetenceMapping"
-			        </meta>
+			        
 			        <key><column name="activity_id" /></key>
 			        <one-to-many class="org.lamsfoundation.lams.learningdesign.CompetenceMapping"/>
 			    </set>
@@ -166,19 +158,13 @@
 			    />
 			    
 			    <set name="gradebookUserActivities" lazy="true" inverse="true" cascade="none" >
-			        <meta attribute="field-description">@hibernate.set lazy="false" inverse="true" cascade="none"
-        												@hibernate.collection-key column="gradebook_user_activity_id"
-        										        @hibernate.collection-one-to-many class="org.lamsfoundation.lams.gradebook.GradebookUserActivity"
-			        </meta>
+			        
 			        <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" >
-			        <meta attribute="field-description">@hibernate.set lazy="false" inverse="true" cascade="none"
-        												@hibernate.collection-key column="tool_session_id"
-        										        @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.ToolSession"
-			        </meta>
+			        
 			        <key><column name="activity_id" /></key>
 			        <one-to-many class="org.lamsfoundation.lams.tool.ToolSession"/>
 			    </set>
@@ -193,15 +179,15 @@
 			</subclass>
 			
 			<subclass name="org.lamsfoundation.lams.learningdesign.GroupingActivity" discriminator-value="2">
-				<meta attribute="class-description" inherit="false">@hibernate.class </meta>					
+									
 				
                  <!-- uni-directional many-to-one association to System Tool -->
                  <many-to-one name="systemTool" class="org.lamsfoundation.lams.tool.SystemTool" lazy="false" >
                  	<column name="system_tool_id" not-null="false"/>
                  </many-to-one>                 
 
 				<property name="createGroupingUIID" type="java.lang.Integer" column="create_grouping_ui_id" length="11" lazy="false">
-				        <meta attribute="field-description">@hibernate.property column="create_grouping_ui_id" length="11" </meta>    
+				            
 				</property>
 								
 				 <!-- bi-directional many-to-one association to Grouping-->
@@ -211,7 +197,7 @@
 			</subclass>
 				
 		<subclass name="org.lamsfoundation.lams.learningdesign.GateActivity">
-			<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+			
              <!-- uni-directional many-to-one association to System Tool -->
              <many-to-one name="systemTool" class="org.lamsfoundation.lams.tool.SystemTool" lazy="false" >
              	<column name="system_tool_id" not-null="false"/>
@@ -226,152 +212,143 @@
 			<property name="gateOpen" type="java.lang.Boolean" column="gate_open_flag" length="4" />
 			
 			<subclass name="org.lamsfoundation.lams.learningdesign.ScheduleGateActivity" discriminator-value="4">
-				<meta attribute="class-description" inherit="false">@hibernate.class </meta>					
+									
 				
 				<property name="gateStartTimeOffset" type="java.lang.Long" column="gate_start_time_offset" length="20">
-       				<meta attribute="field-description">@hibernate.property column="gate_start_time_offset" length="20"</meta>    
-        			<meta attribute="use-in-toString">true</meta>
+       				    
+        			
 			    </property>
 			    
 			    <property name="gateEndTimeOffset" type="java.lang.Long" column="gate_end_time_offset" length="20" >
-			    	<meta attribute="field-description">@hibernate.property column="gate_end_time_offset" length="20" </meta>    
-		    		<meta attribute="use-in-toString">true</meta>
+			    	    
+		    		
 			    </property>
 			    
 			    <property name="gateActivityCompletionBased" type="java.lang.Boolean" column="gate_activity_completion_based" length="4" />
 			</subclass>
 			<subclass name="org.lamsfoundation.lams.learningdesign.SynchGateActivity" discriminator-value="3">
-				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				
 			</subclass>
 			<subclass name="org.lamsfoundation.lams.learningdesign.PermissionGateActivity" discriminator-value="5">
-				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				
 			</subclass>
 			<subclass name="org.lamsfoundation.lams.learningdesign.SystemGateActivity" discriminator-value="9">
-				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				
 			</subclass>
 			<subclass name="org.lamsfoundation.lams.learningdesign.ConditionGateActivity" discriminator-value="14">
-				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				
 			</subclass>
 		</subclass>						
 	</subclass>
 
 	<subclass name="org.lamsfoundation.lams.learningdesign.ComplexActivity" >
-		<meta attribute="class-description" inherit="false">@hibernate.class </meta>			
-	    <meta attribute="scope-class" inherit="false">public abstract</meta>
+					
 	    
+	    
 	    <!-- 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" >
-    		<meta attribute="field-description">@hibernate.set lazy="false" inverse="true" cascade="save-update" sort="org.lamsfoundation.lams.learningdesign.ActivityOrderComparator"
-    										@hibernate.collection-key column="parent_activity_id" 
-    										@hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.Activity"
-			</meta>    										
+    		    										
             <key><column name="parent_activity_id" /></key>
             <one-to-many class="org.lamsfoundation.lams.learningdesign.Activity"/>
 		</set>
 		
 	    <many-to-one name="defaultActivity" class="org.lamsfoundation.lams.learningdesign.Activity">
-	        <meta attribute="field-description">
-			      	@hibernate.many-to-one not-null="false"
-     					@hibernate.column name="default_activity_id"         
-	      	</meta>
+	        
 	        <column name="default_activity_id" />
 	    </many-to-one>
 
          <subclass name="org.lamsfoundation.lams.learningdesign.OptionsActivity" discriminator-value="7">
-				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 				
+				
 				<property name="maxNumberOfOptions" type="java.lang.Integer" column="max_number_of_options" length="5">
-					<meta attribute="field-description">@hibernate.property column="max_number_of_options" length="5"</meta>    
-					<meta attribute="use-in-toString">true</meta>
+					    
+					
 				</property>
 				
 			    <property name="minNumberOfOptions" type="java.lang.Integer" column="min_number_of_options" length="5">
-					<meta attribute="field-description">@hibernate.property column="min_number_of_options" length="5"</meta> 
-					<meta attribute="use-in-toString">true</meta>
+					 
+					
 			    </property>
 			    
 			    <property name="optionsInstructions" type="java.lang.String" column="options_instructions" length="65535">
-    			    <meta attribute="field-description">@hibernate.property column="options_instructions" length="65535"</meta>    
+    			        
 			    </property>
 			    
 			    <subclass name="org.lamsfoundation.lams.learningdesign.OptionsWithSequencesActivity" discriminator-value="13">
-					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 					
+					
 					<property name="startXcoord" type="java.lang.Integer" column="start_xcoord" length="11" >
-				       <meta attribute="field-description">@hibernate.property column="start_xcoord" length="11" </meta>    
+				           
 	 			    </property>
 				    <property name="startYcoord" type="java.lang.Integer" column="start_ycoord" length="11">
-				       <meta attribute="field-description">@hibernate.property column="start_ycoord" length="11"</meta>    
+				           
 				    </property>
 		  			<property name="endXcoord" type="java.lang.Integer" column="end_xcoord" length="11" >
-				       <meta attribute="field-description">@hibernate.property column="end_xcoord" length="11" </meta>    
+				           
 	 			    </property>
 				    <property name="endYcoord" type="java.lang.Integer" column="end_ycoord" length="11">
-				       <meta attribute="field-description">@hibernate.property column="end_ycoord" length="11"</meta>    
+				           
 				    </property>
 				</subclass>
 			    
 			</subclass>
 			
 			<subclass name="org.lamsfoundation.lams.learningdesign.SequenceActivity" discriminator-value="8">
-				<meta attribute="class-description" inherit="false">@hibernate.class</meta>
+				
 
                  <!-- uni-directional many-to-one association to System Tool -->
                  <many-to-one name="systemTool" class="org.lamsfoundation.lams.tool.SystemTool" lazy="false" >
                  	<column name="system_tool_id" not-null="false"/>
                  </many-to-one>                 
 
 			    <set name="branchEntries" lazy="true" inverse="true" cascade="all-delete-orphan" >
-		    		<meta attribute="field-description">@hibernate.set lazy="true" inverse="true" cascade="all-delete-orphan" 
-		    				@hibernate.collection-key column="sequence_activity_id" 
-		    				@hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.BranchActivityEntry"
-					</meta>    										
+		    		    										
 		            <key><column name="sequence_activity_id" /></key>
 		            <one-to-many class="org.lamsfoundation.lams.learningdesign.BranchActivityEntry"/>
 				</set>
 			</subclass>
 			<subclass name="org.lamsfoundation.lams.learningdesign.ParallelActivity" discriminator-value="6">
-				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				
 			</subclass>
 
 			<subclass name="org.lamsfoundation.lams.learningdesign.BranchingActivity" >
-				<meta attribute="class-description" inherit="false">@hibernate.class </meta>			
-	  			<meta attribute="scope-class" inherit="false">public abstract</meta>			
+							
+	  						
 	             <!-- uni-directional many-to-one association to System Tool -->
 	             <many-to-one name="systemTool" class="org.lamsfoundation.lams.tool.SystemTool" lazy="false" >
 	             	<column name="system_tool_id" not-null="false"/>
 	             </many-to-one>
 
 	  			<property name="startXcoord" type="java.lang.Integer" column="start_xcoord" length="11" >
-			       <meta attribute="field-description">@hibernate.property column="start_xcoord" length="11" </meta>    
+			           
  			    </property>
 			    <property name="startYcoord" type="java.lang.Integer" column="start_ycoord" length="11">
-			       <meta attribute="field-description">@hibernate.property column="start_ycoord" length="11"</meta>    
+			           
 			    </property>
 	  			<property name="endXcoord" type="java.lang.Integer" column="end_xcoord" length="11" >
-			       <meta attribute="field-description">@hibernate.property column="end_xcoord" length="11" </meta>    
+			           
  			    </property>
 			    <property name="endYcoord" type="java.lang.Integer" column="end_ycoord" length="11">
-			       <meta attribute="field-description">@hibernate.property column="end_ycoord" length="11"</meta>    
+			           
 			    </property>
 				<subclass name="org.lamsfoundation.lams.learningdesign.ChosenBranchingActivity" discriminator-value="10">
-					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+					
 				</subclass>
 				<subclass name="org.lamsfoundation.lams.learningdesign.GroupBranchingActivity" discriminator-value="11">
-					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+					
 				</subclass>
 				<subclass name="org.lamsfoundation.lams.learningdesign.ToolBranchingActivity" discriminator-value="12">
-					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+					
 				</subclass>
 			</subclass>
 			
 		 	<subclass name="org.lamsfoundation.lams.learningdesign.FloatingActivity" discriminator-value="15">
-		 		<meta attribute="class-description" inherit="false">@hibernate.class</meta>
+		 		
 				
 				<property name="maxNumberOfActivities" type="java.lang.Integer" column="max_number_of_options" length="5">
-					<meta attribute="field-description">@hibernate.property column="max_number_of_options" length="5"</meta>    
-					<meta attribute="use-in-toString">true</meta>
+					    
+					
 				</property>
 				
                 <!-- uni-directional many-to-one association to System Tool -->
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.hbm.xml
===================================================================
diff -u -r64e6623bc68b11257c7f5d71f3953154f80b6fde -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.hbm.xml	(.../ActivityEvaluation.hbm.xml)	(revision 64e6623bc68b11257c7f5d71f3953154f80b6fde)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.hbm.xml	(.../ActivityEvaluation.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -10,6 +10,8 @@
         name="org.lamsfoundation.lams.learningdesign.ActivityEvaluation"
         table="lams_activity_evaluation"
     >
+
+		<cache usage="transactional" />
         <id
             name="activityId"
             column="activity_id"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml	(.../BranchActivityEntry.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml	(.../BranchActivityEntry.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -10,6 +10,8 @@
     name="org.lamsfoundation.lams.learningdesign.BranchActivityEntry" 
     table="lams_branch_activity_entry"
 >
+
+		<cache usage="transactional" />
     <id
         name="entryId"
         type="java.lang.Long"
@@ -19,11 +21,11 @@
     </id>
     
     <property name="entryUIID" type="java.lang.Integer" column="entry_ui_id" length="11">
-				        <meta attribute="field-description">@hibernate.property column="group_branch_activity_ui_id" length="11"</meta>    
+				            
 	</property>	
 	
 	<property name="gateOpenWhenConditionMet" type="java.lang.Boolean" column="open_gate">
-				        <meta attribute="field-description">@hibernate.property column="open_gate"</meta>    
+				            
 	</property>			
     
     <!-- Associations -->
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml	(.../BranchCondition.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml	(.../BranchCondition.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,6 +11,8 @@
     table="lams_branch_condition"
     discriminator-value="0" 
 >
+
+		<cache usage="transactional" />
     <id
         name="conditionId"
         type="java.lang.Long"
@@ -20,56 +22,56 @@
     </id>
     
     <property name="conditionUIID" type="java.lang.Integer" column="condition_ui_id" length="11">
-        <meta attribute="field-description">@hibernate.property column="condition_ui_id" length="11"</meta>    
+            
 	</property>				
 
     <property name="orderId" type="java.lang.Integer" column="order_id" length="11">
-        <meta attribute="field-description">@hibernate.property column="order_id" length="11"</meta>    
+            
 	</property>				
     
     <property name="name" type="java.lang.String" column="name" length="255">
-        <meta attribute="field-description">@hibernate.property column="name" length="255" </meta>    
+            
     </property>
     
     <property name="displayName" type="java.lang.String" column="display_name" length="255">
-        <meta attribute="field-description">@hibernate.property column="display_name" length="255" </meta>    
+            
     </property>
     
     <property name="type" type="java.lang.String" column="type" length="255">
-        <meta attribute="field-description">@hibernate.property column="type" length="255" </meta>    
+            
     </property>
     
     <property name="startValue" type="java.lang.String" column="start_value" length="255">
-        <meta attribute="field-description">@hibernate.property column="start_value" length="255" </meta>    
+            
     </property>
     
     <property name="endValue" type="java.lang.String" column="end_value" length="255">
-        <meta attribute="field-description">@hibernate.property column="end_value" length="255" </meta>    
+            
     </property>
     
     <property name="exactMatchValue" type="java.lang.String" column="exact_match_value" length="255">
-        <meta attribute="field-description">@hibernate.property column="exact_match_value" length="255" </meta>    
+            
     </property>
     
      <joined-subclass  name="org.lamsfoundation.lams.learningdesign.TextSearchCondition" table="lams_text_search_condition" lazy="false">
-     	<meta attribute="class-description" inherit="false">@hibernate.class </meta>
      	
+     	
      	<key column="condition_id" />
      	
 	     <property name="allWords" type="java.lang.String" column="text_search_all_words">
-	        <meta attribute="field-description">@hibernate.property column="text_search_all_words"</meta>    
+	            
 	    </property>
 	    
 	    <property name="phrase" type="java.lang.String" column="text_search_phrase">
-	        <meta attribute="field-description">@hibernate.property column="text_search_phrase"</meta>    
+	            
 	    </property>
 	    
 	    <property name="anyWords" type="java.lang.String" column="text_search_any_words">
-	        <meta attribute="field-description">@hibernate.property column="text_search_any_words"</meta>    
+	            
 	    </property>
 	    
 	    <property name="excludedWords" type="java.lang.String" column="text_search_excluded_words">
-	        <meta attribute="field-description">@hibernate.property column="text_search_excluded_words"</meta>    
+	            
 	    </property>
      </joined-subclass>
 </class>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Competence.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Competence.hbm.xml	(.../Competence.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Competence.hbm.xml	(.../Competence.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_competence"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="competenceId"
             column="competence_id"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/CompetenceMapping.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/CompetenceMapping.hbm.xml	(.../CompetenceMapping.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/CompetenceMapping.hbm.xml	(.../CompetenceMapping.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_competence_mapping"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="competenceMappingId"
             column="competence_mapping_id"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/DataFlowObject.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/DataFlowObject.hbm.xml	(.../DataFlowObject.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/DataFlowObject.hbm.xml	(.../DataFlowObject.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_data_flow"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="dataFlowObjectId"
             column="data_flow_object_id"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,25 +15,17 @@
     name="org.lamsfoundation.lams.learningdesign.Group" 
     table="lams_group"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_group"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
 
+		<cache usage="transactional" />
+    
+    
+
     <id
         name="groupId"
         type="java.lang.Long"
         column="group_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Long"
-            column="group_id"
-
-
-        </meta>
+        
         <generator class="native" />
     </id>
 
@@ -44,10 +36,7 @@
         not-null="false"
         length="255"
     >
-        <meta attribute="field-description">
-			@hibernate.property
-			column="group_name"
-         </meta>    
+            
     </property>
     
     <property
@@ -57,16 +46,11 @@
         not-null="true"
         length="6"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="order_id"
-            length="6"
-            not-null="true"
-        </meta>    
+            
     </property>
 
     <property name="groupUIID" type="java.lang.Integer" column="group_ui_id" length="11">
-				        <meta attribute="field-description">@hibernate.property column="group_ui_id" length="11"</meta>    
+				            
 	</property>				
 
     <!-- Associations -->
@@ -95,18 +79,7 @@
 		cascade="none"
         batch-size="20"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="group_id"
-
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.tool.ToolSession"
-        </meta>
+        
         <key>
             <column name="group_id" />
         </key>
@@ -122,11 +95,7 @@
         update="false"
         cascade="none"
     >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="grouping_id"         
-        </meta>
+        
         <column name="grouping_id" />
     </many-to-one>
 
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/GroupUser.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/GroupUser.hbm.xml	(.../GroupUser.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/GroupUser.hbm.xml	(.../GroupUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -8,13 +8,15 @@
     <class
         name="org.lamsfoundation.lams.learningdesign.GroupUser"
         table="lams_user_group"
-    >	    
+    >
+
+		<cache usage="transactional" />	    
 	    <composite-id>
 			<key-many-to-one name="group" class="org.lamsfoundation.lams.learningdesign.Group" column="group_id"/>
 			<key-many-to-one name="user" class="org.lamsfoundation.lams.usermanagement.User" column="user_id"/>
 		</composite-id>
 		<property name="scheduledLessonEndDate" type="java.sql.Timestamp" column="scheduled_lesson_end_date" length="19">
-			<meta attribute="field-description">@hibernate.property column="scheduled_lesson_end_date" length="19"</meta>
+			
 		</property>
 	</class>
 </hibernate-mapping>
\ No newline at end of file
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,6 +11,8 @@
     table="lams_grouping"
     discriminator-value="0"
 >
+
+		<cache usage="transactional" />
     <id
         name="groupingId"
         type="java.lang.Long"
@@ -22,7 +24,7 @@
     <discriminator column="grouping_type_id" type="int" />
     
     <property name="groupingUIID" type="java.lang.Integer" column="grouping_ui_id" length="11">
-        <meta attribute="field-description">@hibernate.property column="grouping_ui_id" length="11"</meta>    
+            
 	</property>				
 
     <property name="maxNumberOfGroups" type="java.lang.Integer" column="max_number_of_groups" length="3"/>
@@ -38,10 +40,7 @@
     
     <!-- bi-directional one-to-many association to Group-->
     <set name="groups" lazy="false" inverse="true" cascade="all-delete-orphan" batch-size="10">
-    	<meta attribute="field-description">@hibernate.set lazy="true" inverse="true" cascade="none"
-    										@hibernate.collection-key column="grouping_id" 
-    										@hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.Group"
-    	</meta>
+    	
         <key><column name="grouping_id" /></key>
         <one-to-many class="org.lamsfoundation.lams.learningdesign.Group"/>        
     </set>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml
===================================================================
diff -u -r26b52cfb94f532a22ad472ac2def2fcc97b1380e -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 26b52cfb94f532a22ad472ac2def2fcc97b1380e)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,8 +15,10 @@
     name="org.lamsfoundation.lams.learningdesign.LearningDesign" 
     table="lams_learning_design"
 >
+
+		<cache usage="transactional" />
     
-    <meta attribute="implement-equals" inherit="false">true</meta>
+    
 
     <id
         name="learningDesignId"
@@ -65,12 +67,7 @@
         not-null="true"
         length="4"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="valid_design_flag"
-            length="4"
-            not-null="true"
-        </meta>    
+            
     </property>
     <property
         name="readOnly"
@@ -94,10 +91,7 @@
         type="java.lang.Boolean"
         column="edit_override_lock"        
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="edit_override_lock"
-        </meta>    
+            
     </property>
     
     <property
@@ -106,10 +100,7 @@
         column="design_version"
         length="11"
     > 
-    	<meta attribute="field-description">
-           @hibernate.property
-            column="design_version"
-        </meta> 
+    	 
     </property>
     
     <property
@@ -144,11 +135,7 @@
         column="version"        
         length="56"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="version"
-            length="56"            
-        </meta>    
+            
     </property>
     
     <property
@@ -160,17 +147,17 @@
         />
     
     <property name="duration" type="java.lang.Long" column="duration">
-    	<meta attribute="field-description">@hibernate.property column ="duration"</meta>
+    	
     </property>
     <property name="licenseText" type="java.lang.String" column="license_text">
-		<meta attribute="field-description">@hibernate.property column ="license_text"</meta>
+		
     </property>
     <property name="lastModifiedDateTime" type ="java.sql.Timestamp" column="last_modified_date_time">
-    	<meta attribute="field-description">@hibernate.property column ="last_modified_date_time"</meta>
+    	
     </property>
 
 	<property name="contentFolderID" type="java.lang.String" column="content_folder_id" length="32">
-		<meta attribute="field-description">@hibernate.property column="content_folder_id" length="32"</meta>
+		
 	</property>
 
     <property
@@ -184,31 +171,28 @@
     
     <!-- bi-directional many-to-one association to License-->  
     <many-to-one name="license" class="org.lamsfoundation.lams.learningdesign.License">
-    	<meta attribute="field-description"> @hibernate.column name="license_id"</meta>
+    	
     	<column name ="license_id"/>
     </many-to-one>
     
     <!-- bi-directional many-to-one association to Activity-->    
     
     <many-to-one name="firstActivity" class="org.lamsfoundation.lams.learningdesign.Activity">
-        <meta attribute="field-description">@hibernate.column name="first_activity_id"         
-      	</meta>
+        
         <column name="first_activity_id" />
     </many-to-one>
     
     <!-- bi-directional many-to-one association to Activity-->    
     
     <many-to-one name="floatingActivity" class="org.lamsfoundation.lams.learningdesign.FloatingActivity">
-        <meta attribute="field-description">@hibernate.column name="floating_activity_id"         
-      	</meta>
+        
         <column name="floating_activity_id" />
     </many-to-one>
     
     <!-- bi-directional many-to-one association to LearningDesign -->
     
     <many-to-one name="originalLearningDesign" class="org.lamsfoundation.lams.learningdesign.LearningDesign">
-        <meta attribute="field-description">@hibernate.column name="original_learning_design_id"         
-      	</meta>
+        
         <column name="original_learning_design_id" />
     </many-to-one>
     			 
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesignAccess.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesignAccess.hbm.xml	(.../LearningDesignAccess.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesignAccess.hbm.xml	(.../LearningDesignAccess.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -8,6 +8,8 @@
 	<class name="org.lamsfoundation.lams.learningdesign.LearningDesignAccess"
 		table="lams_learning_design_access">
 
+		<cache usage="transactional" />
+
 		<composite-id>
 			<key-property name="learningDesignId" column="learning_design_id"/>
 			<key-property name="userId" 		  column="user_id"/>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesignAnnotation.hbm.xml
===================================================================
diff -u -rbd8e4d7f256d453e579e8138182bf51898b2b256 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesignAnnotation.hbm.xml	(.../LearningDesignAnnotation.hbm.xml)	(revision bd8e4d7f256d453e579e8138182bf51898b2b256)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesignAnnotation.hbm.xml	(.../LearningDesignAnnotation.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -7,6 +7,8 @@
 
 <class name="org.lamsfoundation.lams.learningdesign.LearningDesignAnnotation" table="lams_learning_design_annotation">
 
+		<cache usage="transactional" />
+
     <id name="uid" type="java.lang.Long" column="uid">
         <generator class="native" />
     </id>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,8 +15,10 @@
     name="org.lamsfoundation.lams.learningdesign.LearningLibrary" 
     table="lams_learning_library"
 >
+
+		<cache usage="transactional" />
  
-    <meta attribute="implement-equals" inherit="false">true</meta>
+    
 
     <id
         name="learningLibraryId"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibraryGroup.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibraryGroup.hbm.xml	(.../LearningLibraryGroup.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibraryGroup.hbm.xml	(.../LearningLibraryGroup.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_learning_library_group"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="groupId"
             column="group_id"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/License.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/License.hbm.xml	(.../License.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/License.hbm.xml	(.../License.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -4,8 +4,10 @@
 <hibernate-mapping>
 
 <class name="org.lamsfoundation.lams.learningdesign.License"  table="lams_license">
+
+	<cache usage="read-only" />
     
-    <meta attribute="implement-equals" inherit="false">true</meta>
+    
 
     <id name="licenseID" type="java.lang.Long" column="license_id">       
         <generator class="native" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -16,39 +16,31 @@
     table="lams_learning_transition"
     discriminator-value="0"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_learning_transition"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
+
+		<cache usage="transactional" />
+    
+    
  	
     <id
         name="transitionId"
         type="java.lang.Long"
         column="transition_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Long"
-            column="transition_id"
-
-
-        </meta>
+        
         <generator class="native" />
     </id>
     
 	<discriminator column="transition_type"/>
 	
 	
     <property name="transitionUIID" type="java.lang.Integer" column="transition_ui_id" length="11">
-    	<meta attribute="field-description">@hibernate.property column="transition_ui_id" length="11"</meta>
+    	
     </property>
     <property name="toUIID" type="java.lang.Integer" column="to_ui_id" length="11">
-    	<meta attribute="field-description">@hibernate.property column="to_ui_id" length="11"</meta>
+    	
     </property>
     <property name="fromUIID" type="java.lang.Integer" column="from_ui_id" length="11">
-    	<meta attribute="field-description">@hibernate.property column="from_ui_id" length="11"</meta>
+    	
     </property>
     
     <property
@@ -57,23 +49,15 @@
         column="description"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="description"
-            length="65535"
-        </meta>    
+            
     </property>
     <property
         name="title"
         type="java.lang.String"
         column="title"
         length="255"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="title"
-            length="255"
-        </meta>    
+            
     </property>
     <property
         name="createDateTime"
@@ -82,29 +66,20 @@
         not-null="true"
         length="19"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="create_date_time"
-            length="19"
-            not-null="true"
-        </meta>    
+            
     </property>
 
     <!-- Associations -->
   
     <!-- bi-directional many-to-one association to Activity -->
     <many-to-one name="toActivity" class="org.lamsfoundation.lams.learningdesign.Activity" cascade="save-update">
-        <meta attribute="field-description">@hibernate.many-to-one
-        									@hibernate.column name="to_activity_id"         
-        </meta>
+        
         <column name="to_activity_id" />
     </many-to-one>
     
     <!-- bi-directional many-to-one association to Activity -->
     <many-to-one name="fromActivity" class="org.lamsfoundation.lams.learningdesign.Activity" cascade="save-update">
-        <meta attribute="field-description">@hibernate.many-to-one 
-        							        @hibernate.column name="from_activity_id"         
-        </meta>
+        
         <column name="from_activity_id" />
     </many-to-one>
 
@@ -114,19 +89,13 @@
         class="org.lamsfoundation.lams.learningdesign.LearningDesign"
         cascade="save-update"
     >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-           @hibernate.column name="learning_design_id"         
-        </meta>
+        
         <column name="learning_design_id" />
     </many-to-one>
     
 	<subclass name="org.lamsfoundation.lams.learningdesign.DataTransition" discriminator-value="1">		    
 	    <set name="dataFlowObjects" lazy="true" inverse="true" cascade="all">
-	        <meta attribute="field-description">@hibernate.set lazy="true" cascade="all" sort="org.lamsfoundation.lams.learningdesign.DataFlowObjectComparator"
-   												@hibernate.collection-key column="transition_id"
-  												@hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.DataFlowObject"
-	        </meta>
+	        
 	        <key><column name="transition_id" /></key>
 	        <one-to-many class="org.lamsfoundation.lams.learningdesign.DataFlowObject"/>
 	    </set>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/CompletedActivityProgress.hbm.xml
===================================================================
diff -u -r14c33274b785517e5e3f6a7642dc7c6752a34411 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/CompletedActivityProgress.hbm.xml	(.../CompletedActivityProgress.hbm.xml)	(revision 14c33274b785517e5e3f6a7642dc7c6752a34411)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/CompletedActivityProgress.hbm.xml	(.../CompletedActivityProgress.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -7,6 +7,8 @@
 	<class name="org.lamsfoundation.lams.lesson.CompletedActivityProgress"
 		table="lams_progress_completed">
 
+		<cache usage="transactional" />
+
 		<composite-id>
 			<key-many-to-one name="learnerProgress" class="org.lamsfoundation.lams.lesson.LearnerProgress" column="learner_progress_id"/>
 			<key-many-to-one name="activity" class="org.lamsfoundation.lams.learningdesign.Activity" column="activity_id"/>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/CompletedActivityProgressArchive.hbm.xml
===================================================================
diff -u -r14c33274b785517e5e3f6a7642dc7c6752a34411 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/CompletedActivityProgressArchive.hbm.xml	(.../CompletedActivityProgressArchive.hbm.xml)	(revision 14c33274b785517e5e3f6a7642dc7c6752a34411)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/CompletedActivityProgressArchive.hbm.xml	(.../CompletedActivityProgressArchive.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -7,6 +7,8 @@
 	<class name="org.lamsfoundation.lams.lesson.CompletedActivityProgressArchive"
 		table="lams_progress_completed_archive">
 
+		<cache usage="transactional" />
+
 		<composite-id>
 			<key-many-to-one name="learnerProgress" class="org.lamsfoundation.lams.lesson.LearnerProgressArchive" column="learner_progress_id"/>
 			<key-many-to-one name="activity" class="org.lamsfoundation.lams.learningdesign.Activity" column="activity_id"/>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml	(.../LearnerProgress.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml	(.../LearnerProgress.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -14,6 +14,8 @@
 	<class name="org.lamsfoundation.lams.lesson.LearnerProgress"
 		table="lams_learner_progress">
 
+		<cache usage="transactional" />
+
 		<id name="learnerProgressId" type="java.lang.Long"
 			column="learner_progress_id">
 			<generator class="native" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgressArchive.hbm.xml
===================================================================
diff -u -r9ab6da017a5180a0ee0e766740571644972ce628 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgressArchive.hbm.xml	(.../LearnerProgressArchive.hbm.xml)	(revision 9ab6da017a5180a0ee0e766740571644972ce628)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgressArchive.hbm.xml	(.../LearnerProgressArchive.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -7,6 +7,8 @@
 	<class name="org.lamsfoundation.lams.lesson.LearnerProgressArchive"
 		table="lams_learner_progress_archive">
 
+		<cache usage="transactional" />
+
 		<id name="learnerProgressId" type="java.lang.Long"
 			column="learner_progress_id">
 			<generator class="native" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
===================================================================
diff -u -r2c1a1ddb008c9257866826d3068d8ecfe0768e35 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	(.../Lesson.hbm.xml)	(revision 2c1a1ddb008c9257866826d3068d8ecfe0768e35)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	(.../Lesson.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -9,8 +9,10 @@
 	<class name="org.lamsfoundation.lams.lesson.Lesson"
 		table="lams_lesson">
 
-		<meta attribute="implement-equals" inherit="false">true</meta>
+		<cache usage="transactional" />
 
+		
+
 		<id name="lessonId" type="java.lang.Long" column="lesson_id">
 			<generator class="native" />
 		</id>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEvent.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEvent.hbm.xml	(.../LogEvent.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEvent.hbm.xml	(.../LogEvent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_log_event"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="id"
             column="id"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/notebook/model/NotebookEntry.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/notebook/model/NotebookEntry.hbm.xml	(.../NotebookEntry.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/notebook/model/NotebookEntry.hbm.xml	(.../NotebookEntry.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_notebook_entry"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerActivityMetadata.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerActivityMetadata.hbm.xml	(.../PedagogicalPlannerActivityMetadata.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerActivityMetadata.hbm.xml	(.../PedagogicalPlannerActivityMetadata.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,8 +11,10 @@
         name="org.lamsfoundation.lams.planner.PedagogicalPlannerActivityMetadata"
         table="lams_planner_activity_metadata"
     >
-        <cache usage="transactional" />
 
+		<cache usage="transactional" />
+        
+
         <id
             name="id"
             column="activity_id"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.hbm.xml	(.../PedagogicalPlannerNodeRole.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.hbm.xml	(.../PedagogicalPlannerNodeRole.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_planner_node_role"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml	(.../PedagogicalPlannerSequenceNode.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml	(.../PedagogicalPlannerSequenceNode.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_planner_nodes"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/Rating.hbm.xml
===================================================================
diff -u -r5dbbc7b9946ede2b5de406e9adb39928e1dda083 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/Rating.hbm.xml	(.../Rating.hbm.xml)	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/Rating.hbm.xml	(.../Rating.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,6 +11,8 @@
         table="lams_rating"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingComment.hbm.xml
===================================================================
diff -u -r5dbbc7b9946ede2b5de406e9adb39928e1dda083 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingComment.hbm.xml	(.../RatingComment.hbm.xml)	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingComment.hbm.xml	(.../RatingComment.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,6 +11,8 @@
         table="lams_rating_comment"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingCriteria.hbm.xml
===================================================================
diff -u -r9ab6da017a5180a0ee0e766740571644972ce628 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingCriteria.hbm.xml	(.../RatingCriteria.hbm.xml)	(revision 9ab6da017a5180a0ee0e766740571644972ce628)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingCriteria.hbm.xml	(.../RatingCriteria.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,26 +12,28 @@
 -->
 
 <class name="org.lamsfoundation.lams.rating.model.RatingCriteria" table="lams_rating_criteria" discriminator-value="0">
-    <meta attribute="class-description" inherit="false">@hibernate.class table="lams_rating_criteria"</meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
 
+		<cache usage="transactional" />
+    
+    
+
     <id name="ratingCriteriaId" type="java.lang.Long" column="rating_criteria_id">
-        <meta attribute="field-description">@hibernate.id generator-class="native" type="java.lang.Long" column="rating_criteria_id"</meta>
+        
         <generator class="native" />
     </id>
     
     <discriminator column="rating_criteria_type_id" insert="false"/>
     
     <property name="title" type="java.lang.String" column="title" length="255" >
-        <meta attribute="field-description">@hibernate.property column="title" length="255" </meta>    
+            
     </property>
 
     <property name="orderId" type="java.lang.Integer"  column="order_id" length="11">
-        <meta attribute="field-description">@hibernate.property column="order_id" length="11"</meta>    
+            
     </property>
     
     <property name="ratingCriteriaTypeId" type="java.lang.Integer" column="rating_criteria_type_id" length="11" not-null="true">
-		<meta attribute="field-description">@hibernate.property column="rating_criteria_type_id" length="11"</meta>    
+		    
    	</property>
    	
     <property name="ratingStyle" type="java.lang.Integer" column="rating_style" not-null="true">
@@ -64,26 +66,25 @@
     
     <!-- Subclass definations for polymorphic persistence -->
 	<subclass name="org.lamsfoundation.lams.rating.model.ToolActivityRatingCriteria" discriminator-value="1">
-		<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+		
 		<property name="toolContentId" type="java.lang.Long" column="tool_content_id" length="20" />  
 		
 		<subclass name="org.lamsfoundation.lams.rating.model.AuthoredItemRatingCriteria" discriminator-value="2">
-			<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+			
 			<property name="itemId" type="java.lang.Long" column="item_id" length="20" />
 		</subclass>
 		
 		<subclass name="org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria" discriminator-value="3">
-			<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+			
 		</subclass>		
 	</subclass>
 	
 	<subclass name="org.lamsfoundation.lams.rating.model.LessonRatingCriteria" discriminator-value="4">
-		<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 		
+		
 		<!-- bi-directional many-to-one association to LearningDesign -->
 	    <many-to-one name="lesson" class="org.lamsfoundation.lams.lesson.Lesson">
-	        <meta attribute="field-description">@hibernate.column name="lesson_id"         
-	        </meta>
+	        
 	        <column name="lesson_id" />
 	    </many-to-one> 
 	</subclass>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/signup/model/SignupOrganisation.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/signup/model/SignupOrganisation.hbm.xml	(.../SignupOrganisation.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/signup/model/SignupOrganisation.hbm.xml	(.../SignupOrganisation.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,6 +11,8 @@
         table="lams_signup_organisation"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="signupOrganisationId"
             column="signup_organisation_id"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/Theme.hbm.xml
===================================================================
diff -u -r3dbf966d900adefc34cdad501d3c392118451cd9 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/Theme.hbm.xml	(.../Theme.hbm.xml)	(revision 3dbf966d900adefc34cdad501d3c392118451cd9)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/Theme.hbm.xml	(.../Theme.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -16,26 +16,20 @@
     table="lams_theme"
 >
 
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_css_theme_ve"
-    </meta>
+	<cache usage="read-only" />
 
+    
+
 	<!--  Cache it so that is available to the user records -->
-	<cache usage="transactional" />
+	
 
     <id
         name="themeId"
         type="java.lang.Long"
         column="theme_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Long"
-            column="theme_ve_id"
-        </meta>
-        <meta attribute="use-in-equals">true</meta>
+        
+        
         <generator class="native" />
     </id>
 
@@ -46,39 +40,26 @@
         not-null="true"
         length="100"
     >
-        <meta attribute="use-in-tostring">true</meta>
-        <meta attribute="field-description">
-           @hibernate.property
-            column="name"
-            length="100"
-            not-null="true"
-        </meta>    
+        
+            
     </property>
     <property
         name="description"
         type="java.lang.String"
         column="description"
         length="100"
     >
-        <meta attribute="use-in-tostring">true</meta>
-        <meta attribute="field-description">
-           @hibernate.property
-            column="description"
-            length="100"
-        </meta>    
+        
+            
     </property>
    <property
         name="imageDirectory"
         type="java.lang.String"
         column="image_directory"
         length="100"
     >
-        <meta attribute="use-in-tostring">true</meta>
-        <meta attribute="field-description">
-           @hibernate.property
-            column="image_directory"
-            length="100"
-        </meta>    
+        
+            
     </property>
 </class>
 </hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/timezone/Timezone.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/timezone/Timezone.hbm.xml	(.../Timezone.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/timezone/Timezone.hbm.xml	(.../Timezone.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_timezone"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="id"
             column="id"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml	(.../BasicToolVO.hbm.xml)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml	(.../BasicToolVO.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,25 +15,17 @@
     name="org.lamsfoundation.lams.tool.BasicToolVO" 
     table="lams_tool"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_tool"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
 
+		<cache usage="read-only" />
+    
+    
+
     <id
         name="toolId"
         type="java.lang.Long"
         column="tool_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Long"
-            column="tool_id"
-
-
-        </meta>
+        
         <generator class="native" />
     </id>
 
@@ -44,12 +36,7 @@
         not-null="true"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="learner_url"
-            length="65535"
-            not-null="true"
-        </meta>    
+            
     </property>
     <property
         name="groupingSupportTypeId"
@@ -58,24 +45,15 @@
         not-null="true"
         length="3"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="grouping_support_type_id"
-            length="3"
-            not-null="true"
-        </meta>    
+            
     </property>
     <property
         name="authorUrl"
         type="java.lang.String"
         column="author_url"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="author_url"
-            length="65535"
-        </meta>    
+            
     </property>
     
     <property
@@ -85,12 +63,7 @@
         not-null="true"
         length="1"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="valid_flag"
-            length="1"
-            not-null="true"
-        </meta>    
+            
     </property>
         
     <property
@@ -100,12 +73,7 @@
         not-null="false"
         length="20"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="default_tool_content_id"
-            length="20"
-            not-null="false"
-        </meta>    
+            
     </property>
     <property
         name="toolSignature"
@@ -114,12 +82,7 @@
         not-null="true"
         length="64"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="tool_signature"
-            length="64"
-            not-null="true"
-        </meta>    
+            
     </property>
     <property
         name="toolDisplayName"
@@ -128,31 +91,19 @@
         not-null="true"
         length="255"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="tool_display_name"
-            length="255"
-            not-null="true"
-        </meta>    
+            
     </property>
     <property
         name="description"
         type="java.lang.String"
         column="description"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="description"
-            length="65535"
-        </meta>    
+            
     </property>
     <property name="createDateTime" type="java.sql.Timestamp"
 			column="create_date_time" not-null="true" length="19">
-			<meta attribute="field-description">
-				@hibernate.property column="create_date_time"
-				length="19" not-null="true"
-			</meta>
+			
 	</property>
     <property
         name="serviceName"
@@ -161,12 +112,7 @@
         not-null="true"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="class_name"
-            length="65535"
-            not-null="true"
-        </meta>    
+            
     </property>
     
     <property
@@ -176,12 +122,7 @@
         not-null="true"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="monitor_url"
-            length="65535"
-            not-null="true"
-        </meta>    
+            
     </property>
 
 </class>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/SystemTool.hbm.xml
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/SystemTool.hbm.xml	(.../SystemTool.hbm.xml)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/SystemTool.hbm.xml	(.../SystemTool.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -9,25 +9,18 @@
     name="org.lamsfoundation.lams.tool.SystemTool" 
     table="lams_system_tool"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_system_tool"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
 
+	<cache usage="read-only" />
+	
+    
+    
+
     <id
         name="systemToolId"
         type="java.lang.Long"
         column="system_tool_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Long"
-            column="system_tool_id"
-
-
-        </meta>
+        
         <generator class="native" />
     </id>
 
@@ -37,12 +30,7 @@
         column="learning_activity_type_id"
         not-null="true"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="learning_activity_type_id"
-            type="java.lang.Integer"
-            not-null="true"
-        </meta>    
+            
     </property>
     
     <property
@@ -52,24 +40,15 @@
         not-null="true"
         length="255"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="tool_display_name"
-            length="255"
-            not-null="true"
-        </meta>    
+            
     </property>
     <property
         name="description"
         type="java.lang.String"
         column="description"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="description"
-            length="65535"
-        </meta>    
+            
     </property>
     
     <property
@@ -79,12 +58,7 @@
         not-null="true"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="learner_url"
-            length="65535"
-            not-null="true"
-        </meta>    
+            
     </property>
 
     <property
@@ -94,12 +68,7 @@
         not-null="false"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="learner_preview_url"
-            length="65535"
-            not-null="true"
-        </meta>    
+            
     </property>
 
     <property
@@ -109,21 +78,13 @@
         not-null="false"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="learner_progress_url"
-            length="65535"
-            not-null="true"
-        </meta>    
+            
     </property>
 
 
     <property name="createDateTime" type="java.sql.Timestamp"
 			column="create_date_time" not-null="true" length="19">
-			<meta attribute="field-description">
-				@hibernate.property column="create_date_time"
-				length="19" not-null="true"
-			</meta>
+			
 	</property>
  
     <property
@@ -133,12 +94,7 @@
         not-null="false"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="monitor_url"
-            length="65535"
-            not-null="false"
-        </meta>    
+            
     </property>
     
     <property
@@ -148,12 +104,7 @@
         not-null="false"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="contribute_url"
-            length="65535"
-            not-null="false"
-        </meta>    
+            
     </property>
     
     <property
@@ -163,12 +114,7 @@
         not-null="false"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="help_url"
-            length="65535"
-            not-null="false"
-        </meta>    
+            
     </property>
     
     <property
@@ -178,12 +124,7 @@
         not-null="false"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="admin_url"
-            length="65535"
-            not-null="false"
-        </meta>    
+            
     </property>
     
    <property
@@ -193,12 +134,7 @@
         not-null="false"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="pedagogical_planner_url"
-            length="65535"
-            not-null="false"
-        </meta>    
+            
     </property>
     
     
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml	(.../Tool.hbm.xml)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml	(.../Tool.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,25 +15,18 @@
     name="org.lamsfoundation.lams.tool.Tool" 
     table="lams_tool"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_tool"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
 
+	<cache usage="read-only" />
+	
+    
+    
+
     <id
         name="toolId"
         type="java.lang.Long"
         column="tool_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Long"
-            column="tool_id"
-
-
-        </meta>
+        
         <generator class="native" />
     </id>
 
@@ -44,12 +37,7 @@
         not-null="true"
         length="64"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="tool_identifier"
-            length="64"
-            not-null="true"
-        </meta>    
+            
     </property>
     
     <property
@@ -59,12 +47,7 @@
         not-null="true"
         length="10"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="tool_version"
-            length="10"
-            not-null="true"
-        </meta>    
+            
     </property>
     
     <property
@@ -81,12 +64,7 @@
         not-null="true"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="learner_url"
-            length="65535"
-            not-null="true"
-        </meta>    
+            
     </property>
 
     <property
@@ -96,12 +74,7 @@
         not-null="false"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="learner_preview_url"
-            length="65535"
-            not-null="true"
-        </meta>    
+            
     </property>
 
     <property
@@ -111,12 +84,7 @@
         not-null="false"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="learner_progress_url"
-            length="65535"
-            not-null="true"
-        </meta>    
+            
     </property>
 
     <property
@@ -126,12 +94,7 @@
         not-null="true"
         length="3"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="grouping_support_type_id"
-            length="3"
-            not-null="true"
-        </meta>    
+            
     </property>
     <property
         name="authorUrl"
@@ -140,12 +103,7 @@
         length="65535"
         not-null="true"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="author_url"
-            length="65535"
-            not-null="true"
-        </meta>    
+            
     </property>
        
     <property
@@ -155,12 +113,7 @@
         not-null="true"
         length="1"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="valid_flag"
-            length="1"
-            not-null="true"
-        </meta>    
+            
     </property>
 
     <property
@@ -170,12 +123,7 @@
         not-null="false"
         length="20"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="default_tool_content_id"
-            length="20"
-            not-null="false"
-        </meta>    
+            
     </property>
     <property
         name="toolSignature"
@@ -184,12 +132,7 @@
         not-null="true"
         length="64"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="tool_signature"
-            length="64"
-            not-null="true"
-        </meta>    
+            
     </property>
     <property
         name="toolDisplayName"
@@ -198,31 +141,19 @@
         not-null="true"
         length="255"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="tool_display_name"
-            length="255"
-            not-null="true"
-        </meta>    
+            
     </property>
     <property
         name="description"
         type="java.lang.String"
         column="description"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="description"
-            length="65535"
-        </meta>    
+            
     </property>
     <property name="createDateTime" type="java.sql.Timestamp"
 			column="create_date_time" not-null="true" length="19">
-			<meta attribute="field-description">
-				@hibernate.property column="create_date_time"
-				length="19" not-null="true"
-			</meta>
+			
 	</property>
     <property
         name="serviceName"
@@ -231,12 +162,7 @@
         not-null="true"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="class_name"
-            length="65535"
-            not-null="true"
-        </meta>    
+            
     </property>
  
     <property
@@ -246,12 +172,7 @@
         not-null="false"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="monitor_url"
-            length="65535"
-            not-null="false"
-        </meta>    
+            
     </property>
     
     <property
@@ -261,21 +182,11 @@
         not-null="false"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="help_url"
-            length="65535"
-            not-null="false"
-        </meta>    
+            
     </property>
 
     <property name="languageFile" type="java.lang.String" column="language_file" length="255">
-        <meta attribute="field-description">
-           @hibernate.property
-            column="languageFile"
-            length="255"
-            not-null="false"
-        </meta>    
+            
     </property>
            
     <property
@@ -285,12 +196,7 @@
         not-null="false"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="admin_url"
-            length="65535"
-            not-null="false"
-        </meta>    
+            
     </property>
     
         <property
@@ -300,12 +206,7 @@
         not-null="false"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="pedagogical_planner_url"
-            length="65535"
-            not-null="false"
-        </meta>    
+            
     </property>
     
     <property
@@ -315,12 +216,7 @@
         not-null="true"
         length="1"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="supports_outputs"
-            length="1"
-            not-null="true"
-        </meta>    
+            
     </property>
     
     <property
@@ -330,12 +226,7 @@
         not-null="false"
         length="255"
     >
-    	<meta attribute="field-description">
-           name="extLmsId"
-	        type="java.lang.String"
-	        column="ext_lms_id"
-	        length="255"
-        </meta>
+    	
     </property>
     
     <!-- Associations -->
@@ -347,18 +238,7 @@
         inverse="true"
 		cascade="none"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="tool_id"
-
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.learningdesign.Activity"
-        </meta>
+        
         <key>
             <column name="tool_id" />
         </key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml	(.../ToolContent.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml	(.../ToolContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,25 +15,17 @@
     name="org.lamsfoundation.lams.tool.ToolContent" 
     table="lams_tool_content"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_tool_content"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
 
+		<cache usage="transactional" />
+    
+    
+
     <id
         name="toolContentId"
         type="java.lang.Long"
         column="tool_content_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Long"
-            column="tool_content_id"
-
-
-        </meta>
+        
         <generator class="native" />
     </id>
 
@@ -54,18 +46,7 @@
         inverse="true"
 		cascade="none"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="tool_content_id"
-
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.learningdesign.Activity"
-        </meta>
+        
         <key>
             <column name="tool_content_id" />
         </key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml	(.../ToolSession.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml	(.../ToolSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -13,17 +13,14 @@
 
 	<class name="org.lamsfoundation.lams.tool.ToolSession"
 		table="lams_tool_session" discriminator-value="0">
-		<meta attribute="class-description" inherit="false">
-			@hibernate.class table="lams_tool_session"
-		</meta>
-		<meta attribute="implement-equals" inherit="false">true</meta>
 
+		<cache usage="transactional" />
+		
+		
+
 		<id name="toolSessionId" type="java.lang.Long"
 			column="tool_session_id">
-			<meta attribute="field-description">
-				@hibernate.id generator-class="native"
-				type="java.lang.Long" column="tool_session_id"
-			</meta>
+			
 			<generator class="native" />
 		</id>
 
@@ -45,10 +42,7 @@
 
 		<property name="createDateTime" type="java.sql.Timestamp"
 			column="create_date_time" not-null="true" length="19">
-			<meta attribute="field-description">
-				@hibernate.property column="create_date_time"
-				length="19" not-null="true"
-			</meta>
+			
 		</property>
 
 		<property name="toolSessionStateId" type="int"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml	(.../AuthenticationMethod.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml	(.../AuthenticationMethod.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,28 +15,20 @@
     name="org.lamsfoundation.lams.usermanagement.AuthenticationMethod" 
     table="lams_authentication_method"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_authentication_method"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
 
-	<cache usage="read-only" />
+		<cache usage="read-only" />
+    
+    
 
+	
+
     <id
         name="authenticationMethodId"
         type="java.lang.Integer"
         column="authentication_method_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Integer"
-            column="authentication_method_id"
-
-
-        </meta>
-        <meta attribute="use-in-equals">true</meta>
+        
+        
         <generator class="native" />
     </id>
 
@@ -48,13 +40,7 @@
         unique="true"
         length="64"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="authentication_method_name"
-            unique="true"
-            length="64"
-            not-null="true"
-        </meta>    
+            
     </property>
 
     <!-- Associations -->
@@ -66,12 +52,7 @@
         not-null="true"
         lazy="false"
     >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-	        lazy="false"
-            not-null="true"
-           @hibernate.column name="authentication_method_type_id"         
-        </meta>
+        
         <column name="authentication_method_type_id" />
     </many-to-one>
     <!-- bi-directional one-to-many association to User -->
@@ -81,18 +62,7 @@
         inverse="true"
 		cascade="none"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="authentication_method_id"
-
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.usermanagement.User"
-        </meta>
+        
         <key>
             <column name="authentication_method_id" />
         </key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml	(.../AuthenticationMethodType.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml	(.../AuthenticationMethodType.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,28 +15,20 @@
     name="org.lamsfoundation.lams.usermanagement.AuthenticationMethodType" 
     table="lams_auth_method_type"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_auth_method_type"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
 
-	<cache usage="read-only" />
+		<cache usage="read-only" />
+    
+    
 
+	
+
     <id
         name="authenticationMethodTypeId"
         type="java.lang.Integer"
         column="authentication_method_type_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Integer"
-            column="authentication_method_type_id"
-
-
-        </meta>
-        <meta attribute="use-in-equals">true</meta>
+        
+        
         <generator class="native" />
     </id>
 
@@ -47,12 +39,7 @@
         not-null="true"
         length="64"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="description"
-            length="64"
-            not-null="true"
-        </meta>    
+            
     </property>
 
     <!-- Associations -->
@@ -64,18 +51,7 @@
         inverse="true"
 		cascade="none"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="authentication_method_type_id"
-
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.usermanagement.AuthenticationMethod"
-        </meta>
+        
         <key>
             <column name="authentication_method_type_id" />
         </key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/FavoriteOrganisation.hbm.xml
===================================================================
diff -u -r353fe07604639c2166ed68fbf832810959f3f3cf -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/FavoriteOrganisation.hbm.xml	(.../FavoriteOrganisation.hbm.xml)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/FavoriteOrganisation.hbm.xml	(.../FavoriteOrganisation.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -9,27 +9,19 @@
     name="org.lamsfoundation.lams.usermanagement.FavoriteOrganisation" 
     table="lams_favorite_organisation"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_favorite_organisation"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
 
-	<cache usage="transactional" />
+		<cache usage="transactional" />
+    
+    
+
 	
+	
     <id
         name="favoriteOrganisationId"
         type="java.lang.Integer"
         column="favorite_organisation_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Integer"
-            column="favorite_organisation_id"
-
-
-        </meta>
+        
         <generator class="native" />
     </id>
 
@@ -41,12 +33,8 @@
         class="org.lamsfoundation.lams.usermanagement.User"
         not-null="true"
     >
-        <meta attribute="use-in-equals">true</meta>
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="user_id"         
-        </meta>
+        
+        
         <column name="user_id" />
     </many-to-one>
     
@@ -56,12 +44,8 @@
         class="org.lamsfoundation.lams.usermanagement.Organisation"
         not-null="true"
     >
-        <meta attribute="use-in-equals">true</meta>
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="organisation_id"         
-        </meta>
+        
+        
         <column name="organisation_id" />
     </many-to-one>
 
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/ForgotPasswordRequest.hbm.xml
===================================================================
diff -u -rb9ef68053fada854636475569888b97dafbe6e54 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/ForgotPasswordRequest.hbm.xml	(.../ForgotPasswordRequest.hbm.xml)	(revision b9ef68053fada854636475569888b97dafbe6e54)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/ForgotPasswordRequest.hbm.xml	(.../ForgotPasswordRequest.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,28 +15,20 @@
     name="org.lamsfoundation.lams.usermanagement.ForgotPasswordRequest" 
     table="lams_password_request"
 >
+
+		<cache usage="transactional" />
     
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_password_request"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
+    
+    
 
-    <cache usage="transactional" />
+    
 
     <id
         name="requestId"
         type="java.lang.Integer"
         column="request_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Integer"
-            column="request_id"
-
-
-        </meta>
+        
         <generator class="native" />
     </id>
 
@@ -46,11 +38,7 @@
         column="user_id"
         not-null="true"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="user_id"
-            not-null="true"
-        </meta>    
+            
     </property>
     
     <property
@@ -61,14 +49,8 @@
         unique="true"
         length="36"
     >
-        <meta attribute="use-in-equals">true</meta>
-        <meta attribute="field-description">
-           @hibernate.property
-            column="request_key"
-            length="32"
-            not-null="true"
-            unique="true"
-        </meta>    
+        
+            
     </property>
     
     
@@ -79,12 +61,7 @@
         not-null="true"
         length="19"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="request_date"
-            length="19"
-            not-null="true"
-        </meta>    
+            
     </property>
     
     
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
===================================================================
diff -u -ree2713a23c1a795eec5f782795da09918cbdf006 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision ee2713a23c1a795eec5f782795da09918cbdf006)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -9,121 +9,76 @@
 
 	<class name="org.lamsfoundation.lams.usermanagement.Organisation"
 		table="lams_organisation">
-		<meta attribute="class-description" inherit="false">
-			@hibernate.class
-			table="lams_organisation"
-		</meta>
-		<meta attribute="implement-equals" inherit="false">true</meta>
 
 		<cache usage="transactional" />
+		
+		
 
-		<id name="organisationId" type="java.lang.Integer" column="organisation_id">
-			<meta attribute="field-description">
-				@hibernate.id generator-class="native"
-				type="java.lang.Integer" column="organisation_id"
+		
 
-
-			</meta>
-			<meta attribute="use-in-equals">true</meta>
+		<id name="organisationId" type="java.lang.Integer" column="organisation_id">
+			
+			
 			<generator class="native" />
 		</id>
 
 		<property name="name" type="java.lang.String" column="name"
 			length="250">
-			<meta attribute="field-description">
-				@hibernate.property column="name" length="250"
-			</meta>
+			
 		</property>
 		<property name="code" type="java.lang.String" column="code"
 			length="250">
-			<meta attribute="field-description">
-				@hibernate.property column="code" length="250"
-			</meta>
+			
 		</property>
 
 		<property name="description" type="java.lang.String" column="description"
 			length="250">
-			<meta attribute="field-description">
-				@hibernate.property column="description"
-				length="250"
-			</meta>
+			
 		</property>
 		<property name="createDate" type="java.sql.Timestamp" column="create_date"
 			not-null="true" length="19">
-			<meta attribute="field-description">
-				@hibernate.property column="create_date"
-				length="19"
-				not-null="true"
-			</meta>
+			
 		</property>
 
 		<!-- The following admin fields are NOT NULL DEFAULT 0 in the database -->
 		<property name="courseAdminCanAddNewUsers" type="java.lang.Boolean"
 			column="admin_add_new_users" not-null="true" length="1">
-			<meta attribute="field-description">
-				@hibernate.property column="admin_add_new_users"
-				length="1" not-null="true"
-			</meta>
+			
 		</property>
 
 		<property name="courseAdminCanBrowseAllUsers" type="java.lang.Boolean"
 			column="admin_browse_all_users" not-null="true" length="1">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="admin_browse_all_users"
-				length="1" not-null="true"
-			</meta>
+			
 		</property>
 
 		<property name="courseAdminCanChangeStatusOfCourse" type="java.lang.Boolean"
 			column="admin_change_status" not-null="true" length="1">
-			<meta attribute="field-description">
-				@hibernate.property column="admin_change_status"
-				length="1" not-null="true"
-			</meta>
+			
 		</property>
 
 		<property name="courseAdminCanCreateGuestAccounts" type="java.lang.Boolean"
 			column="admin_create_guest" not-null="true" length="1">
-			<meta attribute="field-description">
-				@hibernate.property column="admin_create_guest"
-				length="1" not-null="true"
-			</meta>
+			
 		</property>
 
 		<property name="enableCourseNotifications" type="java.lang.Boolean"
 			column="enable_course_notifications" not-null="true" length="1">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="enable_course_notifications"
-				length="1" not-null="true"
-			</meta>
+			
 		</property>
 
 		<property name="enableGradebookForLearners" type="java.lang.Boolean"
 			column="enable_learner_gradebook" not-null="true" length="1">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="enable_learner_gradebook"
-				length="1" not-null="true"
-			</meta>
+			
 		</property>
 
 		<property name="enableSingleActivityLessons" type="java.lang.Boolean"
 			column="enable_single_activity_lessons" not-null="true" length="1">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="enable_single_activity_lessons"
-				length="1" not-null="true"
-			</meta>
+			
 		</property>
 
 		<property name="enableLiveEdit" type="java.lang.Boolean"
 			column="enable_live_edit" not-null="true" length="1">
-			<meta attribute="field-description">
-				@hibernate.property column="enable_live_edit"
-				length="1" not-null="true"
-			</meta>
+			
 		</property>
 		
 		<property name="enableKumalive" type="java.lang.Boolean"
@@ -136,51 +91,30 @@
 			organisation -->
 		<many-to-one name="createdBy"
 			class="org.lamsfoundation.lams.usermanagement.User" not-null="true">
-			<meta attribute="field-description">
-				@hibernate.many-to-one not-null="true"
-				@hibernate.column
-				name="created_by"
-			</meta>
+			
 			<column name="created_by" />
 		</many-to-one>
 
 		<!-- bi-directional many-to-one association to OrganisationState -->
 		<many-to-one name="organisationState"
 			class="org.lamsfoundation.lams.usermanagement.OrganisationState"
 			not-null="true">
-			<meta attribute="field-description">
-				@hibernate.many-to-one not-null="true"
-				@hibernate.column
-				name="organisation_state_id"
-			</meta>
+			
 			<column name="organisation_state_id" />
 		</many-to-one>
 
 		<!-- bi-directional many-to-one association to OrganisationType -->
 		<many-to-one name="organisationType"
 			class="org.lamsfoundation.lams.usermanagement.OrganisationType"
 			not-null="true">
-			<meta attribute="field-description">
-				@hibernate.many-to-one not-null="true"
-				@hibernate.column
-				name="organisation_type_id"
-			</meta>
+			
 			<column name="organisation_type_id" />
 		</many-to-one>
 		<!-- bi-directional one-to-many association to UserOrganisation -->
 		<set name="userOrganisations" lazy="true" inverse="true"
 			cascade="all-delete-orphan">
-			<meta attribute="field-description">
-				@hibernate.set lazy="true" inverse="true"
-				cascade="all-delete-orphan"
+			
 
-				@hibernate.collection-key
-				column="organisation_id"
-
-				@hibernate.collection-one-to-many
-				class="org.lamsfoundation.lams.usermanagement.UserOrganisation"
-			</meta>
-
 			<key>
 				<column name="organisation_id" />
 			</key>
@@ -190,18 +124,9 @@
 		<!-- bi-directional one-to-many association to WorkspaceFolder -->
 		<set name="childOrganisations" lazy="true" inverse="true"
 			cascade="all-delete-orphan">
-			<meta attribute="field-description">
-				@hibernate.set lazy="true" inverse="true"
-				cascade="none"
+			
 
-				@hibernate.collection-key
-				column="parent_organisation_id"
-
-				@hibernate.collection-one-to-many
-				class="org.lamsfoundation.lams.usermanagement.Organisation"
-			</meta>
-
-			<cache usage="transactional" />
+			
 			<key>
 				<column name="parent_organisation_id" />
 			</key>
@@ -210,23 +135,12 @@
 		<!-- bi-directional many-to-one association to Organisation -->
 		<many-to-one name="parentOrganisation"
 			class="org.lamsfoundation.lams.usermanagement.Organisation">
-			<meta attribute="field-description">
-				@hibernate.many-to-one @hibernate.column
-				name="parent_organisation_id"
-			</meta>
+			
 			<column name="parent_organisation_id" />
 		</many-to-one>
 		<!-- bi-directional one-to-many association to Lesson -->
 		<set name="lessons" lazy="extra" inverse="true" cascade="none">
-			<meta attribute="field-description">
-				@hibernate.set lazy="true" inverse="true"
-				cascade="none"
-
-				@hibernate.collection-key column="organisation_id"
-
-				@hibernate.collection-one-to-many
-				class="org.lamsfoundation.lams.lesson.Lesson"
-			</meta>
+			
 			<key>
 				<column name="organisation_id" />
 			</key>
@@ -244,11 +158,7 @@
 		<many-to-one name="locale"
 			class="org.lamsfoundation.lams.usermanagement.SupportedLocale"
 			not-null="true">
-			<meta attribute="field-description">
-				@hibernate.many-to-one not-null="true"
-				@hibernate.column
-				name="locale_id"
-			</meta>
+			
 			<column name="locale_id" />
 		</many-to-one>
 
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationGroup.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationGroup.hbm.xml	(.../OrganisationGroup.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationGroup.hbm.xml	(.../OrganisationGroup.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_organisation_group"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="groupId"
             column="group_id"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationGrouping.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationGrouping.hbm.xml	(.../OrganisationGrouping.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationGrouping.hbm.xml	(.../OrganisationGrouping.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_organisation_grouping"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="groupingId"
             column="grouping_id"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationState.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationState.hbm.xml	(.../OrganisationState.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationState.hbm.xml	(.../OrganisationState.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,26 +15,18 @@
     name="org.lamsfoundation.lams.usermanagement.OrganisationState" 
     table="lams_organisation_state"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_organisation_state"
-    </meta>
 
-	<cache usage="read-only" />
+		<cache usage="transactional" />
+    
 
+	
+
     <id
         name="organisationStateId"
         type="java.lang.Integer"
         column="organisation_state_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Integer"
-            column="organisation_state_id"
-
-
-        </meta>
+        
         <generator class="native" />
     </id>
 
@@ -44,12 +36,8 @@
         column="description"
         length="255"
     >
-        <meta attribute="use-in-tostring">true</meta>
-        <meta attribute="field-description">
-           @hibernate.property
-            column="description"
-            length="255"
-        </meta>    
+        
+            
     </property>
 
     <!-- Associations -->
@@ -61,18 +49,7 @@
         inverse="true"
 		cascade="none"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="organisation_state_id"
-
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.usermanagement.Organisation"
-        </meta>
+        
         <key>
             <column name="organisation_state_id" />
         </key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml	(.../OrganisationType.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml	(.../OrganisationType.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,29 +15,20 @@
     name="org.lamsfoundation.lams.usermanagement.OrganisationType" 
     table="lams_organisation_type"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_organisation_type"
-        proxy="org.lamsfoundation.lams.usermanagement.OrganisationType"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
-	
+
 	<cache usage="read-only" />
+    
+    
+	
+	
 
     <id
         name="organisationTypeId"
         type="java.lang.Integer"
         column="organisation_type_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="increment"
-            type="java.lang.Integer"
-            column="organisation_type_id"
-
-
-        </meta>
-        <meta attribute="use-in-equals">true</meta>
+        
+        
         <generator class="increment" />
     </id>
 
@@ -49,13 +40,7 @@
         unique="true"
         length="64"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="name"
-            unique="true"
-            length="64"
-            not-null="true"
-        </meta>    
+            
     </property>
     <property
         name="description"
@@ -64,12 +49,7 @@
         not-null="true"
         length="255"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="description"
-            length="255"
-            not-null="true"
-        </meta>    
+            
     </property>
 
     <!-- Associations -->
@@ -81,18 +61,7 @@
         inverse="true"
 		cascade="none"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="organisation_type_id"
-
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.usermanagement.Organisation"
-        </meta>
+        
         <key>
             <column name="organisation_type_id" />
         </key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Privilege.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Privilege.hbm.xml	(.../Privilege.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Privilege.hbm.xml	(.../Privilege.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,24 +15,17 @@
     name="org.lamsfoundation.lams.usermanagement.Privilege" 
     table="lams_privilege"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_privilege"
-    </meta>
 
+	<cache usage="read-only" />
+	
+    
+
     <id
         name="privilegeId"
         type="java.lang.Long"
         column="privilege_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Long"
-            column="privilege_id"
-
-
-        </meta>
+        
         <generator class="native" />
     </id>
 
@@ -44,25 +37,15 @@
         unique="true"
         length="10"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="code"
-            unique="true"
-            length="10"
-            not-null="true"
-        </meta>    
+            
     </property>
     <property
         name="description"
         type="java.lang.String"
         column="description"
         length="255"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="description"
-            length="255"
-        </meta>    
+            
     </property>
 
     <!-- Associations -->
@@ -74,18 +57,7 @@
         inverse="true"
 		cascade="delete-orphan"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="delete-orphan"
-
-           @hibernate.collection-key
-            column="privilege_id"
-
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.usermanagement.RolePrivilege"
-        </meta>
+        
         <key>
             <column name="privilege_id" />
         </key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Role.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Role.hbm.xml	(.../Role.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Role.hbm.xml	(.../Role.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,27 +15,19 @@
     name="org.lamsfoundation.lams.usermanagement.Role" 
     table="lams_role"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_role"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
 
 	<cache usage="read-only" />
+    
+    
 
+	
+
     <id
         name="roleId"
         type="java.lang.Integer"
         column="role_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Integer"
-            column="role_id"
-
-
-        </meta>
+        
         <generator class="native" />
     </id>
 
@@ -46,25 +38,16 @@
         not-null="true"
         length="64"
     >
-        <meta attribute="use-in-equals">true</meta>
-        <meta attribute="field-description">
-           @hibernate.property
-            column="name"
-            length="64"
-            not-null="true"
-        </meta>    
+        
+            
     </property>
     <property
         name="description"
         type="java.lang.String"
         column="description"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="description"
-            length="65535"
-        </meta>    
+            
     </property>
 
     <!-- Associations -->
@@ -76,18 +59,7 @@
         inverse="true"
 		cascade="delete-orphan"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="delete-orphan"
-
-           @hibernate.collection-key
-            column="role_id"
-
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.usermanagement.RolePrivilege"
-        </meta>
+        
         <key>
             <column name="role_id" />
         </key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/RolePrivilege.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/RolePrivilege.hbm.xml	(.../RolePrivilege.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/RolePrivilege.hbm.xml	(.../RolePrivilege.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,24 +15,16 @@
     name="org.lamsfoundation.lams.usermanagement.RolePrivilege" 
     table="lams_role_privilege"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_role_privilege"
-    </meta>
 
+	<cache usage="read-only" />
+    
+
     <id
         name="rpId"
         type="java.lang.Long"
         column="rp_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Long"
-            column="rp_id"
-
-
-        </meta>
+        
         <generator class="native" />
     </id>
 
@@ -45,11 +37,7 @@
         class="org.lamsfoundation.lams.usermanagement.Privilege"
         not-null="true"
     >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="privilege_id"         
-        </meta>
+        
         <column name="privilege_id" />
     </many-to-one>
     <!-- bi-directional many-to-one association to Role -->
@@ -58,11 +46,7 @@
         class="org.lamsfoundation.lams.usermanagement.Role"
         not-null="true"
     >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="role_id"         
-        </meta>
+        
         <column name="role_id" />
     </many-to-one>
 
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml	(.../SupportedLocale.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml	(.../SupportedLocale.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -10,8 +10,10 @@
         name="org.lamsfoundation.lams.usermanagement.SupportedLocale"
         table="lams_supported_locale"
     >
-		<cache usage="read-only" />
 
+		<cache usage="transactional" />
+		
+
         <id
             name="localeId"
             column="locale_id"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
diff -u -rb2e66cf93ba0697399e0105e788dd1c036536713 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision b2e66cf93ba0697399e0105e788dd1c036536713)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -9,208 +9,106 @@
 
 	<class name="org.lamsfoundation.lams.usermanagement.User" table="lams_user">
 
-		<meta attribute="class-description" inherit="false">
-			@hibernate.class
-			table="lams_user"
-		</meta>
-		<meta attribute="implement-equals" inherit="false">true</meta>
-
 		<cache usage="transactional" />
 
+		
+		
+
+		
+
 		<id name="userId" type="java.lang.Integer" column="user_id">
-			<meta attribute="field-description">
-				@hibernate.id
-				generator-class="native"
-				type="java.lang.Integer"
-				column="user_id"
-			</meta>
+			
 			<generator class="native" />
 		</id>
 
 		<property name="login" type="java.lang.String" column="login"
 			not-null="true" unique="true" length="255">
-			<meta attribute="use-in-equals">true</meta>
-			<meta attribute="field-description">
-				@hibernate.property
-				column="login"
-				unique="true"
-				length="255"
-				not-null="true"
-			</meta>
+			
+			
 		</property>
 		<property name="password" type="java.lang.String" column="password"
 			not-null="true" length="64">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="password"
-				length="64"
-				not-null="true"
-			</meta>
+			
 		</property>
 		<property name="salt" type="java.lang.String" column="salt"
 			not-null="false" length="64">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="salt"
-				length="64"
-				not-null="false"
-			</meta>
+			
 		</property>
 		<property name="twoFactorAuthenticationEnabled" type="java.lang.Boolean"
 			column="two_factor_auth_enabled" not-null="true" length="1">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="two_factor_auth_enabled"
-				length="1"
-				not-null="true"
-			</meta>
+			
 		</property>
 		<property name="twoFactorAuthenticationSecret" type="java.lang.String" column="two_factor_auth_secret"
 			not-null="false" length="64">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="two_factor_auth_secret"
-				length="64"
-				not-null="true"
-			</meta>
+			
 		</property>
 		<property name="title" type="java.lang.String" column="title"
 			length="32">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="title"
-				length="32"
-			</meta>
+			
 		</property>
 		<property name="firstName" type="java.lang.String" column="first_name"
 			length="128">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="first_name"
-				length="128"
-			</meta>
+			
 		</property>
 		<property name="lastName" type="java.lang.String" column="last_name"
 			length="128">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="last_name"
-				length="128"
-			</meta>
+			
 		</property>
 		<property name="addressLine1" type="java.lang.String" column="address_line_1"
 			length="64">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="address_line_1"
-				length="64"
-			</meta>
+			
 		</property>
 		<property name="addressLine2" type="java.lang.String" column="address_line_2"
 			length="64">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="address_line_2"
-				length="64"
-			</meta>
+			
 		</property>
 		<property name="addressLine3" type="java.lang.String" column="address_line_3"
 			length="64">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="address_line_3"
-				length="64"
-			</meta>
+			
 		</property>
 		<property name="city" type="java.lang.String" column="city"
 			length="64">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="city"
-				length="64"
-			</meta>
+			
 		</property>
 		<property name="state" type="java.lang.String" column="state"
 			length="64">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="state"
-				length="64"
-			</meta>
+			
 		</property>
 		<property name="postcode" type="java.lang.String" column="postcode"
 			length="10">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="postcode"
-				length="10"
-			</meta>
+			
 		</property>
 		<property name="country" type="java.lang.String" column="country"
 			length="64">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="country"
-				length="64"
-			</meta>
+			
 		</property>
 		<property name="dayPhone" type="java.lang.String" column="day_phone"
 			length="64">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="day_phone"
-				length="64"
-			</meta>
+			
 		</property>
 		<property name="eveningPhone" type="java.lang.String" column="evening_phone"
 			length="64">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="evening_phone"
-				length="64"
-			</meta>
+			
 		</property>
 		<property name="mobilePhone" type="java.lang.String" column="mobile_phone"
 			length="64">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="mobile_phone"
-				length="64"
-			</meta>
+			
 		</property>
 		<property name="fax" type="java.lang.String" column="fax"
 			length="64">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="fax"
-				length="64"
-			</meta>
+			
 		</property>
 		<property name="email" type="java.lang.String" column="email"
 			length="128">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="email"
-				length="128"
-			</meta>
+			
 		</property>
 		<property name="disabledFlag" type="java.lang.Boolean"
 			column="disabled_flag" not-null="true" length="1">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="disabled_flag"
-				length="1"
-				not-null="true"
-			</meta>
+			
 		</property>
 		<property name="createDate" type="java.sql.Timestamp" column="create_date"
 			not-null="true" length="19">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="create_date"
-				length="19"
-				not-null="true"
-			</meta>
+			
 		</property>
 		<property name="lastVisitedOrganisationId" type="java.lang.Integer" column="last_visited_organisation_id"/>
 
@@ -222,18 +120,8 @@
 		</many-to-one>
 		<!-- bi-directional one-to-many association to UserOrganisation -->
 		<set name="userOrganisations" inverse="true" cascade="all-delete-orphan">
-			<meta attribute="field-description">
-				@hibernate.set
-				inverse="true"
-				cascade="all-delete-orphan"
+			
 
-				@hibernate.collection-key
-				column="user_id"
-
-				@hibernate.collection-one-to-many
-				class="org.lamsfoundation.lams.usermanagement.UserOrganisation"
-			</meta>
-
 			<key>
 				<column name="user_id" />
 			</key>
@@ -244,41 +132,20 @@
 		<many-to-one name="authenticationMethod"
 			class="org.lamsfoundation.lams.usermanagement.AuthenticationMethod"
 			not-null="true" lazy="false">
-			<meta attribute="field-description">
-				@hibernate.many-to-one
-				not-null="true"
-				lazy="false"
-				@hibernate.column name="authentication_method_id"
-			</meta>
+			
 			<column name="authentication_method_id" />
 		</many-to-one>
 
 		<!-- bi-directional many-to-one association to CSSTheme -->
 		<many-to-one name="theme" class="org.lamsfoundation.lams.themes.Theme"
 			lazy="false" not-null="true">
-			<meta attribute="field-description">
-				@hibernate.many-to-one
-				lazy="false"
-				not-null="true"
-				@hibernate.column name="theme_id"
-			</meta>
+			
 			<column name="theme_id" />
 		</many-to-one>
 
 		<!-- bi-directional one-to-many association to LearnerProgress -->
 		<set name="learnerProgresses" lazy="extra" inverse="true" cascade="none">
-			<meta attribute="field-description">
-				@hibernate.set
-				lazy="true"
-				inverse="true"
-				cascade="none"
-
-				@hibernate.collection-key
-				column="user_id"
-
-				@hibernate.collection-one-to-many
-				class="org.lamsfoundation.lams.lesson.LearnerProgress"
-			</meta>
+			
 			<key>
 				<column name="user_id" />
 			</key>
@@ -288,11 +155,7 @@
 
 		<!-- bi-directional one-to-many association to LearningDesign -->
 		<set name="learningDesigns" lazy="true" inverse="true" cascade="none">
-			<meta attribute="field-description">@hibernate.set lazy="true" inverse="true"
-				cascade="none"
-				@hibernate.collection-key column="user_id"
-				@hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.LearningDesign"
-			</meta>
+			
 			<key>
 				<column name="user_id" />
 			</key>
@@ -301,18 +164,7 @@
 
 		<!-- bi-directional one-to-many association to Lesson -->
 		<set name="lessons" lazy="true" inverse="true" cascade="none">
-			<meta attribute="field-description">
-				@hibernate.set
-				lazy="true"
-				inverse="true"
-				cascade="none"
-
-				@hibernate.collection-key
-				column="user_id"
-
-				@hibernate.collection-one-to-many
-				class="org.lamsfoundation.lams.lesson.Lesson"
-			</meta>
+			
 			<key>
 				<column name="user_id" />
 			</key>
@@ -323,58 +175,33 @@
 		<many-to-one name="locale"
 			class="org.lamsfoundation.lams.usermanagement.SupportedLocale"
 			not-null="true" lazy="false">
-			<meta attribute="field-description">
-				@hibernate.many-to-one
-				not-null="true"
-				lazy="false"
-				@hibernate.column name="locale_id"
-			</meta>
+			
 			<column name="locale_id" />
 		</many-to-one>
 
 		<property name="timeZone" type="java.lang.String" column="timezone"
 			length="64">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="timezone"
-				length="64"
-			</meta>
+			
 		</property>
 
 		<property name="portraitUuid" type="java.lang.Long" column="portrait_uuid"
 			length="20">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="portrait_uuid"
-				length="20"
-			</meta>
+			
 		</property>
 
 		<property name="changePassword" type="java.lang.Boolean"
 			column="change_password" length="1">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="change_password"
-				length="1"
-			</meta>
+			
 		</property>
 
 		<property name="tutorialsDisabled" type="java.lang.Boolean"
 			column="tutorials_disabled" length="1">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="tutorials_disabled"
-				length="1"
-			</meta>
+			
 		</property>
 
 		<property name="firstLogin" type="java.lang.Boolean" column="first_login"
 			length="1">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="first_login"
-				length="1"
-			</meta>
+			
 		</property>
 
 		<set name="recentlyModifiedLearningDesigns" table="lams_planner_recent_learning_designs"
@@ -396,12 +223,7 @@
 
 		<property name="modifiedDate" type="java.sql.Timestamp"
 			column="modified_date" not-null="false" length="19">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="modified_date"
-				length="19"
-				not-null="false"
-			</meta>
+			
 		</property>
 		
 		<property name="failedAttempts" type="java.lang.Integer" column="failed_attempts"/>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml
===================================================================
diff -u -r353fe07604639c2166ed68fbf832810959f3f3cf -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,27 +15,19 @@
     name="org.lamsfoundation.lams.usermanagement.UserOrganisation" 
     table="lams_user_organisation"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_user_organisation"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
 
-	<cache usage="transactional" />
+		<cache usage="transactional" />
+    
+    
+
 	
+	
     <id
         name="userOrganisationId"
         type="java.lang.Integer"
         column="user_organisation_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Integer"
-            column="user_organisation_id"
-
-
-        </meta>
+        
         <generator class="native" />
     </id>
 
@@ -47,12 +39,8 @@
         class="org.lamsfoundation.lams.usermanagement.User"
         not-null="true"
     >
-        <meta attribute="use-in-equals">true</meta>
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="user_id"         
-        </meta>
+        
+        
         <column name="user_id" />
     </many-to-one>
     <!-- bi-directional one-to-many association to UserOrganisationRole -->
@@ -61,18 +49,8 @@
         inverse="true"
 		cascade="all-delete-orphan"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            inverse="true"
-            cascade="all-delete-orphan"
-
-           @hibernate.collection-key
-            column="user_organisation_id"
-
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.usermanagement.UserOrganisationRole"
-        </meta>
         
+        
         <key>
             <column name="user_organisation_id" />
         </key>
@@ -86,12 +64,8 @@
         class="org.lamsfoundation.lams.usermanagement.Organisation"
         not-null="true"
     >
-        <meta attribute="use-in-equals">true</meta>
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="organisation_id"         
-        </meta>
+        
+        
         <column name="organisation_id" />
     </many-to-one>
 
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml	(.../UserOrganisationRole.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml	(.../UserOrganisationRole.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,27 +15,19 @@
     name="org.lamsfoundation.lams.usermanagement.UserOrganisationRole" 
     table="lams_user_organisation_role"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_user_organisation_role"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
 
-	<cache usage="transactional" />
+		<cache usage="transactional" />
+    
+    
 
+	
+
     <id
         name="userOrganisationRoleId"
         type="java.lang.Integer"
         column="user_organisation_role_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Integer"
-            column="user_organisation_role_id"
-
-
-        </meta>
+        
         <generator class="native" />
     </id>
 
@@ -48,12 +40,8 @@
         class="org.lamsfoundation.lams.usermanagement.UserOrganisation"
         not-null="true"
     >
-        <meta attribute="use-in-equals">true</meta>
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="user_organisation_id"         
-        </meta>
+        
+        
         <column name="user_organisation_id" />
     </many-to-one>
     <!-- bi-directional many-to-one association to Role -->
@@ -62,12 +50,8 @@
         class="org.lamsfoundation.lams.usermanagement.Role"
         not-null="true"
     >
-        <meta attribute="use-in-equals">true</meta>
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="role_id"         
-        </meta>
+        
+        
         <column name="role_id" />
     </many-to-one>
 
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml
===================================================================
diff -u -rc3c499fa8b7a5487229a59411af3710fa878b93c -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision c3c499fa8b7a5487229a59411af3710fa878b93c)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -9,73 +9,46 @@
 
 	<class name="org.lamsfoundation.lams.usermanagement.WorkspaceFolder"
 		table="lams_workspace_folder">
-		<meta attribute="class-description" inherit="false">
-			@hibernate.class
-			table="lams_workspace_folder"
-		</meta>
-		<meta attribute="implement-equals" inherit="false">true</meta>
 
-		<id name="workspaceFolderId" type="java.lang.Integer" column="workspace_folder_id">
-			<meta attribute="field-description">
-				@hibernate.id
-				generator-class="native"
-				type="java.lang.Integer"
-				column="workspace_folder_id"
+		<cache usage="transactional" />
+		
+		
 
-
-			</meta>
+		<id name="workspaceFolderId" type="java.lang.Integer" column="workspace_folder_id">
+			
 			<generator class="native" />
 		</id>
 
 		<property name="name" type="java.lang.String" column="name"
 			not-null="true" length="255">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="name"
-				length="255"
-				not-null="true"
-			</meta>
+			
 		</property>
 
 		<property name="userID" type="java.lang.Integer" column="user_id"
 			length="11">
-			<meta attribute="field-description">@hibernate.property column="user_id" length="11" </meta>
+			
 		</property>
 		<property name="organisationID" type="java.lang.Integer" column="organisation_id" length="11">
 		</property>
 		<property name="workspaceFolderType" type="java.lang.Integer"
 			column="lams_workspace_folder_type_id" length="11">
-			<meta attribute="field-description">@hibernate.property
-				column="lams_workspace_folder_type_id" length="11" </meta>
+			
 		</property>
 		<property name="creationDate" type="java.sql.Timestamp"
 			column="create_date_time" not-null="true" length="19">
-			<meta attribute="field-description">@hibernate.property column="create_date_time"
-				length="19" not-null="true"</meta>
+			
 		</property>
 		<property name="lastModifiedDate" type="java.sql.Timestamp"
 			column="last_modified_date_time" not-null="true" length="19">
-			<meta attribute="field-description">@hibernate.property
-				column="last_modified_date_time" length="19" not-null="true"</meta>
+			
 		</property>
 
 		<!-- Associations -->
 
 		<!-- bi-directional one-to-many association to WorkspaceFolder -->
 		<set name="childWorkspaceFolders" lazy="true" inverse="true"
 			cascade="none">
-			<meta attribute="field-description">
-				@hibernate.set
-				lazy="true"
-				inverse="true"
-				cascade="none"
-
-				@hibernate.collection-key
-				column="parent_folder_id"
-
-				@hibernate.collection-one-to-many
-				class="org.lamsfoundation.lams.usermanagement.WorkspaceFolder"
-			</meta>
+			
 			<key>
 				<column name="parent_folder_id" />
 			</key>
@@ -84,20 +57,13 @@
 		<!-- bi-directional many-to-one association to WorkspaceFolder -->
 		<many-to-one name="parentWorkspaceFolder"
 			class="org.lamsfoundation.lams.usermanagement.WorkspaceFolder">
-			<meta attribute="field-description">
-				@hibernate.many-to-one
-				@hibernate.column name="parent_folder_id"
-			</meta>
+			
 			<column name="parent_folder_id" />
 		</many-to-one>
 
 		<!-- bi-directional one-to-many association to LearningDesign -->
 		<set name="learningDesigns" lazy="true" inverse="true" cascade="none">
-			<meta attribute="field-description">@hibernate.set lazy="false" inverse="true"
-				cascade="none"
-				@hibernate.collection-key column="user_id"
-				@hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.LearningDesign"
-			</meta>
+			
 			<key>
 				<column name="workspace_folder_id" />
 			</key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml	(.../WorkspaceFolderContent.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml	(.../WorkspaceFolderContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -5,8 +5,10 @@
     
 <hibernate-mapping>
 	<class name="org.lamsfoundation.lams.workspace.WorkspaceFolderContent" table="lams_workspace_folder_content">
-		<meta attribute="implement-equals" inherit="false">true</meta>
 
+		<cache usage="transactional" />
+		
+
 		<id name="folderContentID" 
 			column="folder_content_id"
 			type="java.lang.Long"
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml	(.../CrCredential.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml	(.../CrCredential.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_cr_credential"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="credentialId"
             column="credential_id"
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml	(.../CrNode.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml	(.../CrNode.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,8 +11,10 @@
         name="org.lamsfoundation.lams.contentrepository.CrNode"
         table="lams_cr_node"
     >
-        <cache usage="transactional" />
 
+		<cache usage="transactional" />
+        
+
         <id
             name="nodeId"
             column="node_id"
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml	(.../CrNodeVersion.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml	(.../CrNodeVersion.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,8 +11,10 @@
         name="org.lamsfoundation.lams.contentrepository.CrNodeVersion"
         table="lams_cr_node_version"
     >
-        <cache usage="transactional" />
 
+		<cache usage="transactional" />
+        
+
         <id
             name="nvId"
             column="nv_id"
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.hbm.xml	(.../CrNodeVersionProperty.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.hbm.xml	(.../CrNodeVersionProperty.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,8 +11,10 @@
         name="org.lamsfoundation.lams.contentrepository.CrNodeVersionProperty"
         table="lams_cr_node_version_property"
     >
-        <cache usage="transactional" />
 
+		<cache usage="transactional" />
+        
+
         <id
             name="id"
             column="id"
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml	(.../CrWorkspace.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml	(.../CrWorkspace.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,8 +11,10 @@
         name="org.lamsfoundation.lams.contentrepository.CrWorkspace"
         table="lams_cr_workspace"
     >
-        <cache usage="transactional" />
 
+		<cache usage="transactional" />
+        
+
         <id
             name="workspaceId"
             column="workspace_id"
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml	(.../CrWorkspaceCredential.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml	(.../CrWorkspaceCredential.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_cr_workspace_credential"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="wcId"
             column="wc_id"
Index: lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/command/Command.hbm.xml
===================================================================
diff -u -rd19a95db673b7cf90351de4d567299c5fa86b450 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/command/Command.hbm.xml	(.../Command.hbm.xml)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
+++ lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/command/Command.hbm.xml	(.../Command.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,6 +11,8 @@
         table="lams_learning_command"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/Kumalive.hbm.xml
===================================================================
diff -u -r3cccb9ba98efd5722b7365ffec582e2889143166 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/Kumalive.hbm.xml	(.../Kumalive.hbm.xml)	(revision 3cccb9ba98efd5722b7365ffec582e2889143166)
+++ lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/Kumalive.hbm.xml	(.../Kumalive.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -6,6 +6,8 @@
 <hibernate-mapping>
 	<class name="org.lamsfoundation.lams.learning.kumalive.model.Kumalive" table="lams_kumalive">
 
+		<cache usage="transactional" />
+
 		<id name="kumaliveId" type="java.lang.Long" column="kumalive_id">
 			<generator class="native" />
 		</id>
Index: lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveRubric.hbm.xml
===================================================================
diff -u -r3cccb9ba98efd5722b7365ffec582e2889143166 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveRubric.hbm.xml	(.../KumaliveRubric.hbm.xml)	(revision 3cccb9ba98efd5722b7365ffec582e2889143166)
+++ lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveRubric.hbm.xml	(.../KumaliveRubric.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -7,6 +7,8 @@
 	<class name="org.lamsfoundation.lams.learning.kumalive.model.KumaliveRubric"
 		table="lams_kumalive_rubric">
 
+		<cache usage="transactional" />
+
 		<id name="rubricId" type="java.lang.Long" column="rubric_id">
 			<generator class="native" />
 		</id>
Index: lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveScore.hbm.xml
===================================================================
diff -u -rd370d27131a5cc99c714158be574703a26cd0416 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveScore.hbm.xml	(.../KumaliveScore.hbm.xml)	(revision d370d27131a5cc99c714158be574703a26cd0416)
+++ lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveScore.hbm.xml	(.../KumaliveScore.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -6,6 +6,8 @@
 <hibernate-mapping>
 	<class name="org.lamsfoundation.lams.learning.kumalive.model.KumaliveScore" table="lams_kumalive_score">
 
+		<cache usage="transactional" />
+
 		<id name="scoreId" type="java.lang.Long" column="score_id">
 			<generator class="native" />
 		</id>
Index: lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/presence/model/PresenceChatMessage.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/presence/model/PresenceChatMessage.hbm.xml	(.../PresenceChatMessage.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/presence/model/PresenceChatMessage.hbm.xml	(.../PresenceChatMessage.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_presence_chat_msgs"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/presence/model/PresenceChatUser.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/presence/model/PresenceChatUser.hbm.xml	(.../PresenceChatUser.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/presence/model/PresenceChatUser.hbm.xml	(.../PresenceChatUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="lams_presence_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="nickname"
             column="nickname"
Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
===================================================================
diff -u -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml	(.../Assessment.hbm.xml)	(revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml	(.../Assessment.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laasse10_assessment"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentOptionAnswer.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentOptionAnswer.hbm.xml	(.../AssessmentOptionAnswer.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentOptionAnswer.hbm.xml	(.../AssessmentOptionAnswer.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laasse10_option_answer"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentOverallFeedback.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentOverallFeedback.hbm.xml	(.../AssessmentOverallFeedback.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentOverallFeedback.hbm.xml	(.../AssessmentOverallFeedback.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laasse10_assessment_overall_feedback"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml
===================================================================
diff -u -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml	(.../AssessmentQuestion.hbm.xml)	(revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml	(.../AssessmentQuestion.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laasse10_assessment_question"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.hbm.xml	(.../AssessmentQuestionOption.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.hbm.xml	(.../AssessmentQuestionOption.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laasse10_question_option"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml	(.../AssessmentQuestionResult.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml	(.../AssessmentQuestionResult.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laasse10_question_result"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.hbm.xml	(.../AssessmentResult.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.hbm.xml	(.../AssessmentResult.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laasse10_assessment_result"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.hbm.xml	(.../AssessmentSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.hbm.xml	(.../AssessmentSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laasse10_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentUnit.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentUnit.hbm.xml	(.../AssessmentUnit.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentUnit.hbm.xml	(.../AssessmentUnit.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laasse10_assessment_unit"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.hbm.xml	(.../AssessmentUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.hbm.xml	(.../AssessmentUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laasse10_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.hbm.xml	(.../QuestionReference.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.hbm.xml	(.../QuestionReference.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laasse10_question_reference"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/Bbb.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/Bbb.hbm.xml	(.../Bbb.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/Bbb.hbm.xml	(.../Bbb.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_labbb10_bbb"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbConfig.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbConfig.hbm.xml	(.../BbbConfig.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbConfig.hbm.xml	(.../BbbConfig.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_labbb10_config"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbSession.hbm.xml	(.../BbbSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbSession.hbm.xml	(.../BbbSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_labbb10_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbUser.hbm.xml	(.../BbbUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbUser.hbm.xml	(.../BbbUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_labbb10_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/Chat.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/Chat.hbm.xml	(.../Chat.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/Chat.hbm.xml	(.../Chat.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lachat11_chat"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatMessage.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatMessage.hbm.xml	(.../ChatMessage.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatMessage.hbm.xml	(.../ChatMessage.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lachat11_message"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatSession.hbm.xml	(.../ChatSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatSession.hbm.xml	(.../ChatSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lachat11_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatUser.hbm.xml	(.../ChatUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatUser.hbm.xml	(.../ChatUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lachat11_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/Daco.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/Daco.hbm.xml	(.../Daco.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/Daco.hbm.xml	(.../Daco.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_ladaco10_contents"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.hbm.xml	(.../DacoAnswer.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.hbm.xml	(.../DacoAnswer.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_ladaco10_answers"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoAnswerOption.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoAnswerOption.hbm.xml	(.../DacoAnswerOption.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoAnswerOption.hbm.xml	(.../DacoAnswerOption.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_ladaco10_answer_options"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.hbm.xml	(.../DacoQuestion.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.hbm.xml	(.../DacoQuestion.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_ladaco10_questions"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoSession.hbm.xml	(.../DacoSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoSession.hbm.xml	(.../DacoSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_ladaco10_sessions"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoUser.hbm.xml	(.../DacoUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoUser.hbm.xml	(.../DacoUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_ladaco10_users"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.hbm.xml
===================================================================
diff -u -r7a4b493a0008b281e8c3ec7aafbd325165085ed9 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.hbm.xml	(.../Dokumaran.hbm.xml)	(revision 7a4b493a0008b281e8c3ec7aafbd325165085ed9)
+++ lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.hbm.xml	(.../Dokumaran.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_ladoku11_dokumaran"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranConfigItem.hbm.xml
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranConfigItem.hbm.xml	(.../DokumaranConfigItem.hbm.xml)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranConfigItem.hbm.xml	(.../DokumaranConfigItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_ladoku11_configuration"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="id"
             column="uid"
Index: lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.hbm.xml
===================================================================
diff -u -r1749733feed614e1f96fe2876e3cebe2c62ecb56 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.hbm.xml	(.../DokumaranSession.hbm.xml)	(revision 1749733feed614e1f96fe2876e3cebe2c62ecb56)
+++ lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.hbm.xml	(.../DokumaranSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_ladoku11_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.hbm.xml
===================================================================
diff -u -r1749733feed614e1f96fe2876e3cebe2c62ecb56 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.hbm.xml	(.../DokumaranUser.hbm.xml)	(revision 1749733feed614e1f96fe2876e3cebe2c62ecb56)
+++ lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.hbm.xml	(.../DokumaranUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_ladoku11_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml	(.../Attachment.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml	(.../Attachment.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,8 +11,10 @@
         name="org.lamsfoundation.lams.tool.forum.persistence.Attachment"
         table="tl_lafrum11_attachment"
     >
-        <cache usage="transactional" />
 
+		<cache usage="transactional" />
+        
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,8 +11,10 @@
         name="org.lamsfoundation.lams.tool.forum.persistence.Forum"
         table="tl_lafrum11_forum"
     >
-        <cache usage="transactional" />
 
+		<cache usage="transactional" />
+        
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumConfigItem.hbm.xml
===================================================================
diff -u -rd71c8a085fb0ea3c341f2cf46df958c356d88ec7 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumConfigItem.hbm.xml	(.../ForumConfigItem.hbm.xml)	(revision d71c8a085fb0ea3c341f2cf46df958c356d88ec7)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumConfigItem.hbm.xml	(.../ForumConfigItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -9,7 +9,9 @@
     <class
         name="org.lamsfoundation.lams.tool.forum.persistence.ForumConfigItem"
         table="tl_lafrum11_configuration"
-    >
+    >
+
+		<cache usage="transactional" />
 
         <id
             name="id"
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.hbm.xml	(.../ForumReport.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.hbm.xml	(.../ForumReport.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,8 +11,10 @@
         name="org.lamsfoundation.lams.tool.forum.persistence.ForumReport"
         table="tl_lafrum11_report"
     >
-        <cache usage="transactional" />
 
+		<cache usage="transactional" />
+        
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml
===================================================================
diff -u -r2c1a1ddb008c9257866826d3068d8ecfe0768e35 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	(.../ForumToolSession.hbm.xml)	(revision 2c1a1ddb008c9257866826d3068d8ecfe0768e35)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	(.../ForumToolSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,8 +11,10 @@
         name="org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession"
         table="tl_lafrum11_tool_session"
     >
-        <cache usage="transactional" />
 
+		<cache usage="transactional" />
+        
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	(.../ForumUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	(.../ForumUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,8 +11,10 @@
         name="org.lamsfoundation.lams.tool.forum.persistence.ForumUser"
         table="tl_lafrum11_forum_user"
     >
-        <cache usage="transactional" />
 
+		<cache usage="transactional" />
+        
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,8 +11,10 @@
         name="org.lamsfoundation.lams.tool.forum.persistence.Message"
         table="tl_lafrum11_message"
     >
-        <cache usage="transactional" />
 
+		<cache usage="transactional" />
+        
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/MessageRating.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/MessageRating.hbm.xml	(.../MessageRating.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/MessageRating.hbm.xml	(.../MessageRating.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,8 +11,10 @@
         name="org.lamsfoundation.lams.tool.forum.persistence.MessageRating"
         table="tl_lafrum11_message_rating"
     >
-        <cache usage="transactional" />
 
+		<cache usage="transactional" />
+        
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/MessageSeq.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/MessageSeq.hbm.xml	(.../MessageSeq.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/MessageSeq.hbm.xml	(.../MessageSeq.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,8 +11,10 @@
         name="org.lamsfoundation.lams.tool.forum.persistence.MessageSeq"
         table="tl_lafrum11_message_seq"
     >
-        <cache usage="transactional" />
 
+		<cache usage="transactional" />
+        
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Timestamp.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Timestamp.hbm.xml	(.../Timestamp.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Timestamp.hbm.xml	(.../Timestamp.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,8 +11,10 @@
         name="org.lamsfoundation.lams.tool.forum.persistence.Timestamp"
         table="tl_lafrum11_timestamp"
     >
-        <cache usage="transactional" />
 
+		<cache usage="transactional" />
+        
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml	(.../Gmap.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml	(.../Gmap.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lagmap10_gmap"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapConfigItem.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapConfigItem.hbm.xml	(.../GmapConfigItem.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapConfigItem.hbm.xml	(.../GmapConfigItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lagmap10_configuration"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="id"
             column="uid"
Index: lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml	(.../GmapMarker.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml	(.../GmapMarker.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lagmap10_marker"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapSession.hbm.xml	(.../GmapSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapSession.hbm.xml	(.../GmapSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lagmap10_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapUser.hbm.xml	(.../GmapUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapUser.hbm.xml	(.../GmapUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lagmap10_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml	(.../ImageGallery.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml	(.../ImageGallery.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,6 +11,8 @@
         table="tl_laimag10_imagegallery"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryConfigItem.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryConfigItem.hbm.xml	(.../ImageGalleryConfigItem.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryConfigItem.hbm.xml	(.../ImageGalleryConfigItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laimag10_configuration"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="id"
             column="uid"
Index: lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml
===================================================================
diff -u -rc0799c23f6d6b6be5ca5b740b85c72e3cc89a5b1 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml	(.../ImageGalleryItem.hbm.xml)	(revision c0799c23f6d6b6be5ca5b740b85c72e3cc89a5b1)
+++ lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml	(.../ImageGalleryItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laimag10_imagegallery_item"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItemVisitLog.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItemVisitLog.hbm.xml	(.../ImageGalleryItemVisitLog.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItemVisitLog.hbm.xml	(.../ImageGalleryItemVisitLog.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laimag10_item_log"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.hbm.xml	(.../ImageGallerySession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.hbm.xml	(.../ImageGallerySession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laimag10_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.hbm.xml	(.../ImageGalleryUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.hbm.xml	(.../ImageGalleryUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laimag10_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageVote.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageVote.hbm.xml	(.../ImageVote.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageVote.hbm.xml	(.../ImageVote.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laimag10_image_vote"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.hbm.xml	(.../CommonCartridge.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.hbm.xml	(.../CommonCartridge.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laimsc11_commoncartridge"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeConfigItem.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeConfigItem.hbm.xml	(.../CommonCartridgeConfigItem.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeConfigItem.hbm.xml	(.../CommonCartridgeConfigItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laimsc11_configuration"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="id"
             column="uid"
Index: lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.hbm.xml	(.../CommonCartridgeItem.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.hbm.xml	(.../CommonCartridgeItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laimsc11_commoncartridge_item"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemInstruction.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemInstruction.hbm.xml	(.../CommonCartridgeItemInstruction.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemInstruction.hbm.xml	(.../CommonCartridgeItemInstruction.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laimsc11_item_instruction"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemVisitLog.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemVisitLog.hbm.xml	(.../CommonCartridgeItemVisitLog.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemVisitLog.hbm.xml	(.../CommonCartridgeItemVisitLog.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laimsc11_item_log"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.hbm.xml	(.../CommonCartridgeSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.hbm.xml	(.../CommonCartridgeSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laimsc11_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeUser.hbm.xml	(.../CommonCartridgeUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeUser.hbm.xml	(.../CommonCartridgeUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laimsc11_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/Kaltura.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/Kaltura.hbm.xml	(.../Kaltura.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/Kaltura.hbm.xml	(.../Kaltura.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lakalt11_kaltura"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaComment.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaComment.hbm.xml	(.../KalturaComment.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaComment.hbm.xml	(.../KalturaComment.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lakalt11_comment"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaItem.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaItem.hbm.xml	(.../KalturaItem.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaItem.hbm.xml	(.../KalturaItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lakalt11_kaltura_item"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaItemVisitLog.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaItemVisitLog.hbm.xml	(.../KalturaItemVisitLog.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaItemVisitLog.hbm.xml	(.../KalturaItemVisitLog.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lakalt11_item_log"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaRating.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaRating.hbm.xml	(.../KalturaRating.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaRating.hbm.xml	(.../KalturaRating.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lakalt11_rating"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaSession.hbm.xml	(.../KalturaSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaSession.hbm.xml	(.../KalturaSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lakalt11_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaUser.hbm.xml	(.../KalturaUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaUser.hbm.xml	(.../KalturaUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lakalt11_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -9,6 +9,8 @@
     name="org.lamsfoundation.lams.tool.mc.pojos.McContent" 
     table="tl_lamc11_content"
 >
+
+		<cache usage="transactional" />
     <id
         name="uid"
         type="java.lang.Long"
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.hbm.xml	(.../McOptsContent.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.hbm.xml	(.../McOptsContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,6 +15,8 @@
     name="org.lamsfoundation.lams.tool.mc.pojos.McOptsContent" 
     table="tl_lamc11_options_content"
 >
+
+		<cache usage="transactional" />
     <id
         name="uid"
         type="java.lang.Long"
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.hbm.xml	(.../McQueContent.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.hbm.xml	(.../McQueContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,6 +15,8 @@
     name="org.lamsfoundation.lams.tool.mc.pojos.McQueContent" 
     table="tl_lamc11_que_content"
 >
+
+		<cache usage="transactional" />
     <id
         name="uid"
         type="java.lang.Long"
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.hbm.xml	(.../McQueUsr.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.hbm.xml	(.../McQueUsr.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -9,6 +9,8 @@
     name="org.lamsfoundation.lams.tool.mc.pojos.McQueUsr" 
     table="tl_lamc11_que_usr"
 >
+
+		<cache usage="transactional" />
     <id
         name="uid"
         type="java.lang.Long"
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McSession.hbm.xml	(.../McSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McSession.hbm.xml	(.../McSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -8,6 +8,8 @@
     name="org.lamsfoundation.lams.tool.mc.pojos.McSession" 
     table="tl_lamc11_session"
 >
+
+		<cache usage="transactional" />
     <id
         name="uid"
         type="java.lang.Long"
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.hbm.xml	(.../McUsrAttempt.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.hbm.xml	(.../McUsrAttempt.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -9,6 +9,8 @@
     name="org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt" 
     table="tl_lamc11_usr_attempt"
 >
+
+		<cache usage="transactional" />
     <id
         name="uid"
         type="java.lang.Long"
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaConfigItem.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaConfigItem.hbm.xml	(.../QaConfigItem.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaConfigItem.hbm.xml	(.../QaConfigItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laqa11_configuration"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
diff -u -r13a1c855ce1ee5275acdb0324aa93a26be58eb51 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 13a1c855ce1ee5275acdb0324aa93a26be58eb51)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -10,6 +10,8 @@
     table="tl_laqa11_content"
 >
 
+		<cache usage="transactional" />
+
     <id
         name="uid"
         type="java.lang.Long"
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	(.../QaQueContent.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	(.../QaQueContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -9,6 +9,8 @@
         table="tl_laqa11_que_content"
     >
 
+		<cache usage="transactional" />
+
     <id
         name="uid"
         type="java.lang.Long"
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	(.../QaQueUsr.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	(.../QaQueUsr.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -10,6 +10,8 @@
     table="tl_laqa11_que_usr"
 >
 
+		<cache usage="transactional" />
+
     <id
         name="uid"
         type="java.lang.Long"
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -9,6 +9,8 @@
     table="tl_laqa11_session"
 >
 
+		<cache usage="transactional" />
+
     <id
         name="uid"
         type="java.lang.Long"
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml	(.../QaUsrResp.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml	(.../QaUsrResp.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -9,6 +9,8 @@
     name="org.lamsfoundation.lams.tool.qa.QaUsrResp" 
     table="tl_laqa11_usr_resp"
 >
+
+		<cache usage="transactional" />
     <id
         name="responseId"
         type="java.lang.Long"
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCategory.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCategory.hbm.xml	(.../QaWizardCategory.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCategory.hbm.xml	(.../QaWizardCategory.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laqa11_wizard_category"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.hbm.xml	(.../QaWizardCognitiveSkill.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.hbm.xml	(.../QaWizardCognitiveSkill.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laqa11_wizard_cognitive_skill"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.hbm.xml	(.../QaWizardQuestion.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.hbm.xml	(.../QaWizardQuestion.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_laqa11_wizard_question"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml	(.../Resource.hbm.xml)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml	(.../Resource.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_larsrc11_resource"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_larsrc11_resource_item"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.hbm.xml	(.../ResourceItemInstruction.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.hbm.xml	(.../ResourceItemInstruction.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_larsrc11_item_instruction"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml	(.../ResourceItemVisitLog.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml	(.../ResourceItemVisitLog.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_larsrc11_item_log"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml	(.../ResourceSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml	(.../ResourceSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_larsrc11_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml	(.../ResourceUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml	(.../ResourceUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_larsrc11_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_leader/conf/hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_leader/conf/hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.hbm.xml	(.../Leaderselection.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_leader/conf/hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.hbm.xml	(.../Leaderselection.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lalead11_leaderselection"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_leader/conf/hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_leader/conf/hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.hbm.xml	(.../LeaderselectionSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_leader/conf/hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.hbm.xml	(.../LeaderselectionSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lalead11_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_leader/conf/hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_leader/conf/hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionUser.hbm.xml	(.../LeaderselectionUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_leader/conf/hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionUser.hbm.xml	(.../LeaderselectionUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lalead11_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.hbm.xml	(.../Mindmap.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.hbm.xml	(.../Mindmap.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lamind10_mindmap"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapNode.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapNode.hbm.xml	(.../MindmapNode.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapNode.hbm.xml	(.../MindmapNode.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lamind10_node"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="nodeId"
             column="node_id"
Index: lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapRequest.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapRequest.hbm.xml	(.../MindmapRequest.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapRequest.hbm.xml	(.../MindmapRequest.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lamind10_request"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.hbm.xml	(.../MindmapSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.hbm.xml	(.../MindmapSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lamind10_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapUser.hbm.xml	(.../MindmapUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapUser.hbm.xml	(.../MindmapUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lamind10_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml	(.../NoticeboardContent.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml	(.../NoticeboardContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lanb11_content"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml	(.../NoticeboardSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml	(.../NoticeboardSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lanb11_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardUser.hbm.xml	(.../NoticeboardUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardUser.hbm.xml	(.../NoticeboardUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lanb11_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml
===================================================================
diff -u -rdba506c6b1663eba922793a44b6ad5726f2931d1 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml	(.../Notebook.hbm.xml)	(revision dba506c6b1663eba922793a44b6ad5726f2931d1)
+++ lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml	(.../Notebook.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lantbk11_notebook"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookSession.hbm.xml	(.../NotebookSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookSession.hbm.xml	(.../NotebookSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lantbk11_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.hbm.xml	(.../NotebookUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.hbm.xml	(.../NotebookUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lantbk11_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/Pixlr.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/Pixlr.hbm.xml	(.../Pixlr.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/Pixlr.hbm.xml	(.../Pixlr.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lapixl10_pixlr"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/PixlrConfigItem.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/PixlrConfigItem.hbm.xml	(.../PixlrConfigItem.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/PixlrConfigItem.hbm.xml	(.../PixlrConfigItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lapixl10_configuration"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="id"
             column="uid"
Index: lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/PixlrSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/PixlrSession.hbm.xml	(.../PixlrSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/PixlrSession.hbm.xml	(.../PixlrSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lapixl10_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/PixlrUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/PixlrUser.hbm.xml	(.../PixlrUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/PixlrUser.hbm.xml	(.../PixlrUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lapixl10_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml	(.../Peerreview.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml	(.../Peerreview.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,6 +11,8 @@
         table="tl_laprev11_peerreview"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewSession.hbm.xml	(.../PeerreviewSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewSession.hbm.xml	(.../PeerreviewSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,6 +11,8 @@
         table="tl_laprev11_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.hbm.xml	(.../PeerreviewUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.hbm.xml	(.../PeerreviewUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -11,6 +11,8 @@
         table="tl_laprev11_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	(.../SubmissionDetails.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	(.../SubmissionDetails.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lasbmt11_submission_details"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="submissionID"
             column="submission_id"
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lasbmt11_content"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="contentID"
             column="content_id"
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	(.../SubmitFilesReport.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	(.../SubmitFilesReport.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lasbmt11_report"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="reportID"
             column="report_id"
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml	(.../SubmitFilesSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml	(.../SubmitFilesSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lasbmt11_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="sessionID"
             column="session_id"
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml	(.../SubmitUser.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml	(.../SubmitUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lasbmt11_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.hbm.xml	(.../BurningQuestionLike.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.hbm.xml	(.../BurningQuestionLike.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lascrt11_burning_que_like"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
===================================================================
diff -u -rfa3eff32270a8fc08855e99726b4ff318d60bf09 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml	(.../Scratchie.hbm.xml)	(revision fa3eff32270a8fc08855e99726b4ff318d60bf09)
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml	(.../Scratchie.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lascrt11_scratchie"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.hbm.xml	(.../ScratchieAnswer.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.hbm.xml	(.../ScratchieAnswer.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lascrt11_scratchie_answer"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.hbm.xml	(.../ScratchieAnswerVisitLog.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.hbm.xml	(.../ScratchieAnswerVisitLog.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lascrt11_answer_log"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.hbm.xml	(.../ScratchieBurningQuestion.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.hbm.xml	(.../ScratchieBurningQuestion.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lascrt11_burning_question"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieConfigItem.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieConfigItem.hbm.xml	(.../ScratchieConfigItem.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieConfigItem.hbm.xml	(.../ScratchieConfigItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lascrt11_configuration"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="id"
             column="uid"
Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.hbm.xml	(.../ScratchieItem.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.hbm.xml	(.../ScratchieItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lascrt11_scratchie_item"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.hbm.xml	(.../ScratchieSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.hbm.xml	(.../ScratchieSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lascrt11_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.hbm.xml	(.../ScratchieUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.hbm.xml	(.../ScratchieUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lascrt11_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml	(.../Scribe.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml	(.../Scribe.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lascrb11_scribe"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.hbm.xml	(.../ScribeHeading.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.hbm.xml	(.../ScribeHeading.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lascrb11_heading"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeReportEntry.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeReportEntry.hbm.xml	(.../ScribeReportEntry.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeReportEntry.hbm.xml	(.../ScribeReportEntry.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lascrb11_report_entry"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml
===================================================================
diff -u -r2c1a1ddb008c9257866826d3068d8ecfe0768e35 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml	(.../ScribeSession.hbm.xml)	(revision 2c1a1ddb008c9257866826d3068d8ecfe0768e35)
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml	(.../ScribeSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lascrb11_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeUser.hbm.xml	(.../ScribeUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeUser.hbm.xml	(.../ScribeUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lascrb11_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.hbm.xml	(.../Spreadsheet.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.hbm.xml	(.../Spreadsheet.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lasprd10_spreadsheet"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetMark.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetMark.hbm.xml	(.../SpreadsheetMark.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetMark.hbm.xml	(.../SpreadsheetMark.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lasprd10_spreadsheet_mark"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.hbm.xml	(.../SpreadsheetSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.hbm.xml	(.../SpreadsheetSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lasprd10_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetUser.hbm.xml	(.../SpreadsheetUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetUser.hbm.xml	(.../SpreadsheetUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lasprd10_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.hbm.xml	(.../UserModifiedSpreadsheet.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.hbm.xml	(.../UserModifiedSpreadsheet.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lasprd10_user_modified_spreadsheet"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml	(.../Survey.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml	(.../Survey.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lasurv11_survey"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml	(.../SurveyAnswer.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml	(.../SurveyAnswer.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lasurv11_answer"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml	(.../SurveyOption.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml	(.../SurveyOption.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lasurv11_option"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml	(.../SurveyQuestion.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml	(.../SurveyQuestion.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lasurv11_question"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml	(.../SurveySession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml	(.../SurveySession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lasurv11_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml	(.../SurveyUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml	(.../SurveyUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lasurv11_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskList.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskList.hbm.xml	(.../TaskList.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskList.hbm.xml	(.../TaskList.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_latask10_tasklist"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml	(.../TaskListCondition.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml	(.../TaskListCondition.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_latask10_condition"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="condition_uid"
Index: lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml	(.../TaskListItem.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml	(.../TaskListItem.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_latask10_tasklist_item"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.hbm.xml	(.../TaskListItemAttachment.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.hbm.xml	(.../TaskListItemAttachment.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_latask10_item_attachment"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItemComment.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItemComment.hbm.xml	(.../TaskListItemComment.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItemComment.hbm.xml	(.../TaskListItemComment.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_latask10_item_comment"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItemVisitLog.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItemVisitLog.hbm.xml	(.../TaskListItemVisitLog.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItemVisitLog.hbm.xml	(.../TaskListItemVisitLog.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_latask10_item_log"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListSession.hbm.xml	(.../TaskListSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListSession.hbm.xml	(.../TaskListSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_latask10_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListUser.hbm.xml	(.../TaskListUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListUser.hbm.xml	(.../TaskListUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_latask10_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.hbm.xml	(.../VoteContent.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.hbm.xml	(.../VoteContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -9,6 +9,8 @@
     name="org.lamsfoundation.lams.tool.vote.pojos.VoteContent" 
     table="tl_lavote11_content"
 >
+
+		<cache usage="transactional" />
     <id
         name="uid"
         type="java.lang.Long"
Index: lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.hbm.xml	(.../VoteQueContent.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.hbm.xml	(.../VoteQueContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -15,6 +15,8 @@
     name="org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent" 
     table="tl_lavote11_nomination_content"
 >
+
+		<cache usage="transactional" />
     <id
         name="uid"
         type="java.lang.Long"
Index: lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.hbm.xml	(.../VoteQueUsr.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.hbm.xml	(.../VoteQueUsr.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -9,6 +9,8 @@
     name="org.lamsfoundation.lams.tool.vote.pojos.VoteQueUsr" 
     table="tl_lavote11_usr"
 >
+
+		<cache usage="transactional" />
     <id
         name="uid"
         type="java.lang.Long"
Index: lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.hbm.xml	(.../VoteSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.hbm.xml	(.../VoteSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -8,6 +8,8 @@
     name="org.lamsfoundation.lams.tool.vote.pojos.VoteSession" 
     table="tl_lavote11_session"
 >
+
+		<cache usage="transactional" />
     <id
         name="uid"
         type="java.lang.Long"
Index: lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.hbm.xml	(.../VoteUsrAttempt.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.hbm.xml	(.../VoteUsrAttempt.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -9,6 +9,8 @@
     name="org.lamsfoundation.lams.tool.vote.pojos.VoteUsrAttempt" 
     table="tl_lavote11_usr_attempt"
 >
+
+		<cache usage="transactional" />
     <id
         name="uid"
         type="java.lang.Long"
Index: lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml	(.../Wiki.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml	(.../Wiki.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lawiki10_wiki"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPage.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPage.hbm.xml	(.../WikiPage.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPage.hbm.xml	(.../WikiPage.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lawiki10_wiki_page"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPageContent.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPageContent.hbm.xml	(.../WikiPageContent.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPageContent.hbm.xml	(.../WikiPageContent.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lawiki10_wiki_page_content"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiSession.hbm.xml	(.../WikiSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiSession.hbm.xml	(.../WikiSession.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lawiki10_session"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"
Index: lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r64b01b16c79948bf1fbb2ee012055cb2611c0187
--- lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiUser.hbm.xml	(.../WikiUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiUser.hbm.xml	(.../WikiUser.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
@@ -12,6 +12,8 @@
         table="tl_lawiki10_user"
     >
 
+		<cache usage="transactional" />
+
         <id
             name="uid"
             column="uid"