Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u -r1274faa8cf4613e5d8537ff2954796f1aa1ed5b5 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 1274faa8cf4613e5d8537ff2954796f1aa1ed5b5)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,8 +16,8 @@
     <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id name="activityId" type="java.lang.Long" column="activity_id">
-        <meta attribute="field-description">@hibernate.id generator-class="identity" type="java.lang.Long" column="activity_id"</meta>
-        <generator class="identity" />
+        <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"/>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml
===================================================================
diff -u -r69f28424509df91f90c81157d2cfa15b0ef7bab5 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 69f28424509df91f90c81157d2cfa15b0ef7bab5)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -28,13 +28,13 @@
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="identity"
+            generator-class="native"
             type="java.lang.Long"
             column="group_id"
 
 
         </meta>
-        <generator class="identity" />
+        <generator class="native" />
     </id>
 
     <property
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml
===================================================================
diff -u -r69f28424509df91f90c81157d2cfa15b0ef7bab5 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 69f28424509df91f90c81157d2cfa15b0ef7bab5)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
         type="java.lang.Long"
         column="grouping_id"
     >
-        <generator class="identity" />
+        <generator class="native" />
     </id>
     
     <discriminator column="grouping_type_id" type="int" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml
===================================================================
diff -u -r0988ce4dfd3a003db77de92d7c158bdf548093ab -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 0988ce4dfd3a003db77de92d7c158bdf548093ab)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -24,7 +24,7 @@
         column="learning_design_id"
     >
        
-        <generator class="identity" />
+        <generator class="native" />
     </id>
 
     <property
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml
===================================================================
diff -u -r0df86e5f4467d23d7b17881a44827fef9a58a672 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision 0df86e5f4467d23d7b17881a44827fef9a58a672)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -24,7 +24,7 @@
         column="learning_library_id"
     >
  
-        <generator class="identity" />
+        <generator class="native" />
     </id>
 
     <property
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/License.hbm.xml
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/License.hbm.xml	(.../License.hbm.xml)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/License.hbm.xml	(.../License.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -8,7 +8,7 @@
     <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id name="licenseID" type="java.lang.Long" column="license_id">       
-        <generator class="identity" />
+        <generator class="native" />
     </id>
 
     <property name="name" type="java.lang.String" column="name" length="255" not-null="true" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -28,13 +28,13 @@
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="identity"
+            generator-class="native"
             type="java.lang.Long"
             column="transition_id"
 
 
         </meta>
-        <generator class="identity" />
+        <generator class="native" />
     </id>
 
     <property name="transitionUIID" type="java.lang.Integer" column="transition_ui_id" length="11">
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml
===================================================================
diff -u -r57c67cb560b7623b59a2fa25090641743141a09d -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml	(.../LearnerProgress.hbm.xml)	(revision 57c67cb560b7623b59a2fa25090641743141a09d)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml	(.../LearnerProgress.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
 
 		<id name="learnerProgressId" type="java.lang.Long"
 			column="learner_progress_id">
-			<generator class="identity" />
+			<generator class="native" />
 		</id>
 
 		<property name="lessonComplete" type="java.lang.Boolean"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
===================================================================
diff -u -r69f28424509df91f90c81157d2cfa15b0ef7bab5 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	(.../Lesson.hbm.xml)	(revision 69f28424509df91f90c81157d2cfa15b0ef7bab5)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	(.../Lesson.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -12,7 +12,7 @@
 		<meta attribute="implement-equals" inherit="false">true</meta>
 
 		<id name="lessonId" type="java.lang.Long" column="lesson_id">
-			<generator class="identity" />
+			<generator class="native" />
 		</id>
     	<property name="lessonDescription" type="java.lang.String" 
     			 column="description" length="65535">
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml
===================================================================
diff -u -r169ca0b8ede4541373ae7aeff047a43053e9c227 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml	(.../BasicToolVO.hbm.xml)	(revision 169ca0b8ede4541373ae7aeff047a43053e9c227)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml	(.../BasicToolVO.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -28,13 +28,13 @@
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="identity"
+            generator-class="native"
             type="java.lang.Long"
             column="tool_id"
 
 
         </meta>
-        <generator class="identity" />
+        <generator class="native" />
     </id>
 
     <property
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
===================================================================
diff -u -r3fa27c9bc10d0c90d602cc38201e6eb248ce348c -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml	(.../Tool.hbm.xml)	(revision 3fa27c9bc10d0c90d602cc38201e6eb248ce348c)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml	(.../Tool.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -28,13 +28,13 @@
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="identity"
+            generator-class="native"
             type="java.lang.Long"
             column="tool_id"
 
 
         </meta>
-        <generator class="identity" />
+        <generator class="native" />
     </id>
 
     <property
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml
===================================================================
diff -u -r27fbc8140e958c21edc3aabcdf5579bea45a08c6 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml	(.../ToolContent.hbm.xml)	(revision 27fbc8140e958c21edc3aabcdf5579bea45a08c6)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml	(.../ToolContent.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -28,13 +28,13 @@
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="identity"
+            generator-class="native"
             type="java.lang.Long"
             column="tool_content_id"
 
 
         </meta>
-        <generator class="identity" />
+        <generator class="native" />
     </id>
 
 	<many-to-one name="tool"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolImportSupport.hbm.xml
===================================================================
diff -u -r2b636f4e834cd0b45c00bb3abf6a6b5e5f3161c8 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolImportSupport.hbm.xml	(.../ToolImportSupport.hbm.xml)	(revision 2b636f4e834cd0b45c00bb3abf6a6b5e5f3161c8)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolImportSupport.hbm.xml	(.../ToolImportSupport.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -28,13 +28,13 @@
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="identity"
+            generator-class="native"
             type="java.lang.Long"
             column="id"
 
 
         </meta>
-        <generator class="identity" />
+        <generator class="native" />
     </id>
 
     <property
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml
===================================================================
diff -u -r3a66ca7c8e447f3eaf3bc0209d5bc455e02539a8 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml	(.../ToolSession.hbm.xml)	(revision 3a66ca7c8e447f3eaf3bc0209d5bc455e02539a8)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml	(.../ToolSession.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -21,10 +21,10 @@
 		<id name="toolSessionId" type="java.lang.Long"
 			column="tool_session_id">
 			<meta attribute="field-description">
-				@hibernate.id generator-class="identity"
+				@hibernate.id generator-class="native"
 				type="java.lang.Long" column="tool_session_id"
 			</meta>
-			<generator class="identity" />
+			<generator class="native" />
 		</id>
 
 		<discriminator column="tool_session_type_id" type="int" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml	(.../WorkspaceFolderContent.hbm.xml)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml	(.../WorkspaceFolderContent.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -11,7 +11,7 @@
 			column="folder_content_id"
 			type="java.lang.Long"
 		>
-		<generator class="identity"/>			
+		<generator class="native"/>			
 		</id>
 		
 		<property name="contentTypeID"
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
diff -u -racf9436c6118cfab5aa7ee7adb258c5ea7375cd9 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision acf9436c6118cfab5aa7ee7adb258c5ea7375cd9)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -324,7 +324,7 @@
     // Getters and Setters
     //---------------------------------------------------------------------	
 	/**
-	 * @hibernate.activityUIID generator-class="identity" type="java.lang.Long"
+	 * @hibernate.activityUIID generator-class="native" type="java.lang.Long"
 	 *               column="activity_id"
 	 */
 	public Long getActivityId() {
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java	(.../Group.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java	(.../Group.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -138,7 +138,7 @@
 
     /** 
      *            @hibernate.id
-     *             generator-class="identity"
+     *             generator-class="native"
      *             type="java.lang.Long"
      *             column="group_id"
      *         
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java	(.../LearningLibrary.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java	(.../LearningLibrary.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -90,7 +90,7 @@
 
     /** 
      *            @hibernate.id
-     *             generator-class="identity"
+     *             generator-class="native"
      *             type="java.lang.Long"
      *             column="learning_library_id"
      *         
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java	(.../Transition.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java	(.../Transition.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -134,7 +134,7 @@
 	}
 
 	/**
-	 * @hibernate.transitionUIID generator-class="identity"
+	 * @hibernate.transitionUIID generator-class="native"
 	 *                           type="java.lang.Long" column="transition_id"
 	 *  
 	 */
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	(.../Lesson.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	(.../Lesson.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -224,7 +224,7 @@
     // Getters and Setters
     //---------------------------------------------------------------------
     /** 
-     * @hibernate.id  generator-class="identity" type="java.lang.Long"
+     * @hibernate.id  generator-class="native" type="java.lang.Long"
      *                column="lesson_id"
      */
     public Long getLessonId() {
Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java	(.../Tool.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java	(.../Tool.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -213,7 +213,7 @@
     }
 
     /** 
-     * @hibernate.id generator-class="identity" type="java.lang.Long"
+     * @hibernate.id generator-class="native" type="java.lang.Long"
      *             	 column="tool_id"      
      */
     public Long getToolId() {
Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolContent.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolContent.java	(.../ToolContent.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolContent.java	(.../ToolContent.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -63,7 +63,7 @@
 
     /** 
      *            @hibernate.id
-     *             generator-class="identity"
+     *             generator-class="native"
      *             type="java.lang.Long"
      *             column="tool_content_id"
      *         
Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolImportSupport.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolImportSupport.java	(.../ToolImportSupport.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolImportSupport.java	(.../ToolImportSupport.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -67,7 +67,7 @@
 
 
     /** 
-     * @hibernate.id generator-class="identity" type="java.lang.Long"
+     * @hibernate.id generator-class="native" type="java.lang.Long"
      *             	 column="id"      
      */
     public Long getId() {
Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java	(.../ToolSession.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java	(.../ToolSession.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -94,7 +94,7 @@
 
     /** 
      *            @hibernate.id
-     *             generator-class="identity"
+     *             generator-class="native"
      *             type="java.lang.Long"
      *             column="tool_session_id"
      *         
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -641,25 +641,6 @@
      *            @hibernate.collection-key
      *             column="user_id"
      *            @hibernate.collection-one-to-many
-     *             class="org.lamsfoundation.lams.lesson.UserGroup"
-     *         
-     */
-    public Set getUserGroups() {
-        return this.userGroups;
-    }
-
-    public void setUserGroups(Set userGroups) {
-        this.userGroups = userGroups;
-    }
-
-    /** 
-     *            @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"
      *         
      */
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml
===================================================================
diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml	(.../CrCredential.hbm.xml)	(revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml	(.../CrCredential.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -17,7 +17,7 @@
             type="java.lang.Long"
             unsaved-value="0"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-CrCredential.xml 
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml
===================================================================
diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml	(.../CrNode.hbm.xml)	(revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml	(.../CrNode.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -18,7 +18,7 @@
             type="java.lang.Long"
             unsaved-value="0"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-CrNode.xml 
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml
===================================================================
diff -u -r9ad43dec7eb0960145bc92da0ae6435a2c412a58 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml	(.../CrNodeVersion.hbm.xml)	(revision 9ad43dec7eb0960145bc92da0ae6435a2c412a58)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml	(.../CrNodeVersion.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -18,7 +18,7 @@
             type="java.lang.Long"
             unsaved-value="0"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-CrNodeVersion.xml 
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.hbm.xml
===================================================================
diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.hbm.xml	(.../CrNodeVersionProperty.hbm.xml)	(revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.hbm.xml	(.../CrNodeVersionProperty.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -18,7 +18,7 @@
             type="java.lang.Long"
             unsaved-value="0"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-CrNodeVersionProperty.xml 
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml
===================================================================
diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml	(.../CrWorkspace.hbm.xml)	(revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml	(.../CrWorkspace.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -18,7 +18,7 @@
             type="java.lang.Long"
             unsaved-value="0"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-CrWorkspace.xml 
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml
===================================================================
diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml	(.../CrWorkspaceCredential.hbm.xml)	(revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml	(.../CrWorkspaceCredential.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -17,7 +17,7 @@
             type="java.lang.Long"
             unsaved-value="0"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-CrWorkspaceCredential.xml 
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrCredential.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrCredential.java	(.../CrCredential.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrCredential.java	(.../CrCredential.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -63,7 +63,7 @@
 
     /** 
      *            @hibernate.id
-     *             generator-class="identity"
+     *             generator-class="native"
      *             type="java.lang.Long"
      *             column="credential_id"
      *             unsaved-value="0"
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java	(.../CrNode.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java	(.../CrNode.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -108,7 +108,7 @@
 */
     /** 
      *            @hibernate.id
-     *             generator-class="identity"
+     *             generator-class="native"
      *             type="java.lang.Long"
      *             column="node_id"
      *             unsaved-value="0"
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java	(.../CrNodeVersion.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java	(.../CrNodeVersion.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -101,7 +101,7 @@
 
     /** 
      *            @hibernate.id
-     *             generator-class="identity"
+     *             generator-class="native"
      *             type="java.lang.Long"
      *             column="nv_id"
      *             unsaved-value="0"
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java	(.../CrNodeVersionProperty.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java	(.../CrNodeVersionProperty.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -74,7 +74,7 @@
 
     /** 
      *            @hibernate.id
-     *             generator-class="identity"
+     *             generator-class="native"
      *             type="java.lang.Long"
      *             column="id"
      *             unsaved-value="0"
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspace.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspace.java	(.../CrWorkspace.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspace.java	(.../CrWorkspace.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -64,7 +64,7 @@
 
     /** 
      *            @hibernate.id
-     *             generator-class="identity"
+     *             generator-class="native"
      *             type="java.lang.Long"
      *             column="workspace_id"
      *             unsaved-value="0"
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.java	(.../CrWorkspaceCredential.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.java	(.../CrWorkspaceCredential.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -58,7 +58,7 @@
 
     /** 
      *            @hibernate.id
-     *             generator-class="identity"
+     *             generator-class="native"
      *             type="java.lang.Long"
      *             column="wc_id"
      *             unsaved-value="0"
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml
===================================================================
diff -u -r67333d9d0d4a93667e5b86544a3fca0cf85eacb8 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	(.../ForumToolSession.hbm.xml)	(revision 67333d9d0d4a93667e5b86544a3fca0cf85eacb8)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	(.../ForumToolSession.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-ForumToolSession.xml 
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml
===================================================================
diff -u -rf6f0e93d2134d055aadd9414aee1b588f0669c19 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	(.../ForumUser.hbm.xml)	(revision f6f0e93d2134d055aadd9414aee1b588f0669c19)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	(.../ForumUser.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-ForumUser.xml 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml
===================================================================
diff -u -r67333d9d0d4a93667e5b86544a3fca0cf85eacb8 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	(.../ForumToolSession.hbm.xml)	(revision 67333d9d0d4a93667e5b86544a3fca0cf85eacb8)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	(.../ForumToolSession.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-ForumToolSession.xml 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java	(.../ForumToolSession.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java	(.../ForumToolSession.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -70,7 +70,7 @@
   	//		Get/Set methods
 //  **********************************************************
 	/**
-	 * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+	 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 	 * @return Returns the learnerID.
 	 */
 	public Long getUid() {
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml
===================================================================
diff -u -rf6f0e93d2134d055aadd9414aee1b588f0669c19 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	(.../ForumUser.hbm.xml)	(revision f6f0e93d2134d055aadd9414aee1b588f0669c19)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	(.../ForumUser.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-ForumUser.xml 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java	(.../ForumUser.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java	(.../ForumUser.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -88,7 +88,7 @@
   	//		Get/Set methods
 //  **********************************************************
 	/**
-	 * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+	 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 	 * @return Returns the uid.
 	 */
 	public Long getUid() {
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml
===================================================================
diff -u -rc25a2c783e51d05045d1fb61981c169357cd3e98 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-ResourceItem.xml 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	(.../ResourceItem.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	(.../ResourceItem.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -109,7 +109,7 @@
 	  	//		Get/Set methods
 //	  **********************************************************
 		/**
-		 * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+		 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 		 * @return Returns the uid.
 		 */
 		public Long getUid() {
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.hbm.xml
===================================================================
diff -u -r2116db454fd0ec719a6deeaacd9d10306d341b93 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.hbm.xml	(.../ResourceItemInstruction.hbm.xml)	(revision 2116db454fd0ec719a6deeaacd9d10306d341b93)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.hbm.xml	(.../ResourceItemInstruction.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-ResourceItemInstruction.xml 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java	(.../ResourceItemInstruction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java	(.../ResourceItemInstruction.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -54,7 +54,7 @@
 	  	//		Get/Set methods
 //	  **********************************************************
 		/**
-		 * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+		 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 		 * @return Returns the uid.
 		 */
 		public Long getUid() {
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml
===================================================================
diff -u -rc25a2c783e51d05045d1fb61981c169357cd3e98 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml	(.../ResourceItemVisitLog.hbm.xml)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml	(.../ResourceItemVisitLog.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-ResourceItemVisitLog.xml 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java	(.../ResourceItemVisitLog.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java	(.../ResourceItemVisitLog.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -64,7 +64,7 @@
 	}
 	
 	/**
-	 * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+	 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 	 * @return Returns the log Uid.
 	 */
 	public Long getUid() {
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml
===================================================================
diff -u -r27653cd039c7a5c282fed7bb692473179a4d89ec -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml	(.../ResourceSession.hbm.xml)	(revision 27653cd039c7a5c282fed7bb692473179a4d89ec)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml	(.../ResourceSession.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-ResourceSession.xml 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java	(.../ResourceSession.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java	(.../ResourceSession.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -55,7 +55,7 @@
   	//		Get/Set methods
 //  **********************************************************
 	/**
-	 * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+	 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 	 * @return Returns the learnerID.
 	 */
 	public Long getUid() {
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml
===================================================================
diff -u -r92e8b8d1454cfbd9ae8a20934a677340dac3b507 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml	(.../ResourceUser.hbm.xml)	(revision 92e8b8d1454cfbd9ae8a20934a677340dac3b507)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml	(.../ResourceUser.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-ResourceUser.xml 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java	(.../ResourceUser.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java	(.../ResourceUser.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -95,7 +95,7 @@
   	//		Get/Set methods
 //  **********************************************************
 	/**
-	 * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+	 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 	 * @return Returns the uid.
 	 */
 	public Long getUid() {
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml
===================================================================
diff -u -r2437f5fc533ea6acaf8a86a9a703a5909b456516 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	(.../InstructionFiles.hbm.xml)	(revision 2437f5fc533ea6acaf8a86a9a703a5909b456516)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	(.../InstructionFiles.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-InstructionFiles.xml 
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml
===================================================================
diff -u -re7f9f5772bf6f3cf2786a65e78d7de441d348c37 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	(.../SubmissionDetails.hbm.xml)	(revision e7f9f5772bf6f3cf2786a65e78d7de441d348c37)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	(.../SubmissionDetails.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="submission_id"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SubmissionDetails.xml 
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml
===================================================================
diff -u -r759c8f83bff5a495f44ea5532762395ee626c7c2 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	(.../SubmitFilesReport.hbm.xml)	(revision 759c8f83bff5a495f44ea5532762395ee626c7c2)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	(.../SubmitFilesReport.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="report_id"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SubmitFilesReport.xml 
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml
===================================================================
diff -u -r8b51e7543717ab3982989e3dd3662c88e192426f -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml	(.../SubmitUser.hbm.xml)	(revision 8b51e7543717ab3982989e3dd3662c88e192426f)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml	(.../SubmitUser.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SubmitUser.xml 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml
===================================================================
diff -u -r2437f5fc533ea6acaf8a86a9a703a5909b456516 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	(.../InstructionFiles.hbm.xml)	(revision 2437f5fc533ea6acaf8a86a9a703a5909b456516)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	(.../InstructionFiles.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-InstructionFiles.xml 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java	(.../InstructionFiles.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java	(.../InstructionFiles.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -44,7 +44,7 @@
 	private String type;
 
 	/**
-     * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+     * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 	 * @return Returns the uid.
 	 */
 	public Long getUid() {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml
===================================================================
diff -u -re7f9f5772bf6f3cf2786a65e78d7de441d348c37 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	(.../SubmissionDetails.hbm.xml)	(revision e7f9f5772bf6f3cf2786a65e78d7de441d348c37)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	(.../SubmissionDetails.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="submission_id"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SubmissionDetails.xml 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java	(.../SubmissionDetails.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java	(.../SubmissionDetails.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -74,7 +74,7 @@
 	public SubmissionDetails() {
 	}
 	/**
-	 * @hibernate.id generator-class="identity" type="java.lang.Long"
+	 * @hibernate.id generator-class="native" type="java.lang.Long"
 	 *               column="submission_id"
 	 */
 	public Long getSubmissionID() {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml
===================================================================
diff -u -r759c8f83bff5a495f44ea5532762395ee626c7c2 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	(.../SubmitFilesReport.hbm.xml)	(revision 759c8f83bff5a495f44ea5532762395ee626c7c2)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	(.../SubmitFilesReport.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="report_id"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SubmitFilesReport.xml 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java	(.../SubmitFilesReport.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java	(.../SubmitFilesReport.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -66,7 +66,7 @@
     public SubmitFilesReport() {
 	}
     /** 
-     * @hibernate.id generator-class="identity" type="java.lang.Long" column="report_id"
+     * @hibernate.id generator-class="native" type="java.lang.Long" column="report_id"
      */
     public Long getReportID() {
         return this.reportID;
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml
===================================================================
diff -u -r8b51e7543717ab3982989e3dd3662c88e192426f -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml	(.../SubmitUser.hbm.xml)	(revision 8b51e7543717ab3982989e3dd3662c88e192426f)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml	(.../SubmitUser.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SubmitUser.xml 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitUser.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitUser.java	(.../SubmitUser.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitUser.java	(.../SubmitUser.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -72,7 +72,7 @@
 	// Get / Set methods
 	//***********************************************************
 	/**
-	 * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+	 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 	 * @return Returns the learnerID.
 	 */
 	public Long getUid() {
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml	(.../Scribe.hbm.xml)	(revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml	(.../Scribe.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -70,7 +70,7 @@
 
         <property
             name="runOffline"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="run_offline"
@@ -79,7 +79,7 @@
 
         <property
             name="lockOnFinished"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="lock_on_finished"
@@ -88,15 +88,15 @@
 
         <property
             name="autoSelectScribe"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="auto_select_scribe"
         />
 
         <property
             name="reflectOnActivity"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="reflect_on_activity"
@@ -132,7 +132,7 @@
 
         <property
             name="contentInUse"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="content_in_use"
@@ -141,7 +141,7 @@
 
         <property
             name="defineLater"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="define_later"
@@ -195,6 +195,25 @@
 
         </set>
 
+        <set
+            name="scribeHeadings"
+            lazy="true"
+            inverse="false"
+            cascade="all-delete-orphan"
+            sort="unsorted"
+        >
+
+            <key
+                column="scribe_uid"
+            >
+            </key>
+
+            <one-to-many
+                  class="org.lamsfoundation.lams.tool.scribe.model.ScribeHeading"
+            />
+
+        </set>
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Scribe.xml
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.hbm.xml
===================================================================
diff -u
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.hbm.xml	(revision 0)
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.hbm.xml	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.tool.scribe.model.ScribeHeading"
+        table="tl_lascrb11_heading"
+    >
+
+        <id
+            name="uid"
+            column="uid"
+            type="java.lang.Long"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-ScribeHeading.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="headingText"
+            type="text"
+            update="true"
+            insert="true"
+            column="heading"
+        />
+
+        <many-to-one
+            name="scribe"
+            class="org.lamsfoundation.lams.tool.scribe.model.Scribe"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="scribe_uid" 
+            />
+        </many-to-one>
+
+        <property
+            name="displayOrder"
+            type="int"
+            update="true"
+            insert="true"
+            column="display_order"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-ScribeHeading.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeReportEntry.hbm.xml
===================================================================
diff -u
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeReportEntry.hbm.xml	(revision 0)
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeReportEntry.hbm.xml	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.tool.scribe.model.ScribeReportEntry"
+        table="tl_lascrb11_report_entry"
+    >
+
+        <id
+            name="uid"
+            column="uid"
+            type="java.lang.Long"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-ScribeReportEntry.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="entryText"
+            type="text"
+            update="true"
+            insert="true"
+            column="entry_text"
+        />
+
+        <many-to-one
+            name="scribeHeading"
+            class="org.lamsfoundation.lams.tool.scribe.model.ScribeHeading"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="scribe_heading_uid" 
+            />
+        </many-to-one>
+
+        <many-to-one
+            name="scribeSession"
+            class="org.lamsfoundation.lams.tool.scribe.model.ScribeSession"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="scribe_session_uid" 
+            />
+        </many-to-one>
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-ScribeReportEntry.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml	(.../ScribeSession.hbm.xml)	(revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml	(.../ScribeSession.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -100,6 +100,46 @@
 
         </set>
 
+        <set
+            name="scribeReportEntries"
+            lazy="true"
+            inverse="false"
+            cascade="all-delete-orphan"
+            sort="unsorted"
+        >
+
+            <key
+                column="scribe_session_uid"
+            >
+            </key>
+
+            <one-to-many
+                  class="org.lamsfoundation.lams.tool.scribe.model.ScribeReportEntry"
+            />
+
+        </set>
+
+        <many-to-one
+            name="appointedScribe"
+            class="org.lamsfoundation.lams.tool.scribe.model.ScribeUser"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="appointed_scribe_uid" 
+            />
+        </many-to-one>
+
+        <property
+            name="forceComplete"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="force_complete"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ScribeSession.xml
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeUser.hbm.xml
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeUser.hbm.xml	(.../ScribeUser.hbm.xml)	(revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeUser.hbm.xml	(.../ScribeUser.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -63,7 +63,7 @@
 
         <property
             name="finishedActivity"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="finishedActivity"
@@ -82,6 +82,22 @@
             />
         </many-to-one>
 
+        <property
+            name="reportApproved"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="report_approved"
+        />
+
+        <property
+            name="startedActivity"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="started_activity"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ScribeUser.xml
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml
===================================================================
diff -u -ra2c091a27056e7b41531ca140012603bf027d5b8 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml	(.../SurveyAnswer.hbm.xml)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml	(.../SurveyAnswer.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SurveyAnswer.xml 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java	(.../SurveyAnswer.java)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java	(.../SurveyAnswer.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -63,7 +63,7 @@
 	}
 	
 	/**
-	 * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+	 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 	 * @return Returns the log Uid.
 	 */
 	public Long getUid() {
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyItem.hbm.xml
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyItem.hbm.xml	(.../SurveyItem.hbm.xml)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyItem.hbm.xml	(.../SurveyItem.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SurveyItem.xml 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyItemInstruction.hbm.xml
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyItemInstruction.hbm.xml	(.../SurveyItemInstruction.hbm.xml)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyItemInstruction.hbm.xml	(.../SurveyItemInstruction.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SurveyItemInstruction.xml 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyItemVisitLog.hbm.xml
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyItemVisitLog.hbm.xml	(.../SurveyItemVisitLog.hbm.xml)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyItemVisitLog.hbm.xml	(.../SurveyItemVisitLog.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SurveyItemVisitLog.xml 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml
===================================================================
diff -u -r0b9b61d67c2dcf6f83c513325afca117cb1967f2 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml	(.../SurveyOption.hbm.xml)	(revision 0b9b61d67c2dcf6f83c513325afca117cb1967f2)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml	(.../SurveyOption.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SurveyOption.xml 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.java
===================================================================
diff -u -r6a5d35ec57dde95eae93fb628d669af257d36949 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.java	(.../SurveyOption.java)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.java	(.../SurveyOption.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -60,7 +60,7 @@
 	  	//		Get/Set methods
 //	  **********************************************************
 		/**
-		 * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+		 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 		 * @return Returns the uid.
 		 */
 		public Long getUid() {
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml
===================================================================
diff -u -ra2c091a27056e7b41531ca140012603bf027d5b8 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml	(.../SurveyQuestion.hbm.xml)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml	(.../SurveyQuestion.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SurveyQuestion.xml 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java
===================================================================
diff -u -rde91e6d736e56d514d840e128bd06c9238b5871b -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java	(.../SurveyQuestion.java)	(revision de91e6d736e56d514d840e128bd06c9238b5871b)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java	(.../SurveyQuestion.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -93,7 +93,7 @@
 	  	//		Get/Set methods
 //	  **********************************************************
 		/**
-		 * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+		 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 		 * @return Returns the uid.
 		 */
 		public Long getUid() {
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml
===================================================================
diff -u -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml	(.../SurveySession.hbm.xml)	(revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml	(.../SurveySession.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SurveySession.xml 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.java
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.java	(.../SurveySession.java)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.java	(.../SurveySession.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -49,7 +49,7 @@
   	//		Get/Set methods
 //  **********************************************************
 	/**
-	 * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+	 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 	 * @return Returns the learnerID.
 	 */
 	public Long getUid() {
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml	(.../SurveyUser.hbm.xml)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml	(.../SurveyUser.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SurveyUser.xml 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r920894ca746cba5e080023c5cc80167d64d1653d
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java	(.../SurveyUser.java)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java	(.../SurveyUser.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
@@ -92,7 +92,7 @@
   	//		Get/Set methods
 //  **********************************************************
 	/**
-	 * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+	 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 	 * @return Returns the uid.
 	 */
 	public Long getUid() {