Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml,v
diff -u -r1.26 -r1.27
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	9 Aug 2006 01:32:22 -0000	1.26
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	23 Oct 2006 23:58:55 -0000	1.27
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml,v
diff -u -r1.9 -r1.10
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml	24 Sep 2006 02:40:32 -0000	1.9
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml	23 Oct 2006 23:58:54 -0000	1.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml,v
diff -u -r1.15 -r1.16
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	24 Sep 2006 02:40:32 -0000	1.15
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	23 Oct 2006 23:58:54 -0000	1.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml,v
diff -u -r1.15 -r1.16
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml	21 Aug 2006 05:39:13 -0000	1.15
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml	23 Oct 2006 23:58:54 -0000	1.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml,v
diff -u -r1.4 -r1.5
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml	9 Jan 2006 04:58:56 -0000	1.4
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml	23 Oct 2006 23:58:54 -0000	1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/License.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/License.hbm.xml	6 Oct 2005 06:31:25 -0000	1.2
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/License.hbm.xml	23 Oct 2006 23:58:54 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml,v
diff -u -r1.7 -r1.8
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml	6 Oct 2005 06:31:25 -0000	1.7
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml	23 Oct 2006 23:58:55 -0000	1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml,v
diff -u -r1.14 -r1.15
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml	8 Jun 2006 01:03:35 -0000	1.14
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml	23 Oct 2006 23:58:55 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml,v
diff -u -r1.21 -r1.22
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	24 Sep 2006 02:40:31 -0000	1.21
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	23 Oct 2006 23:58:55 -0000	1.22
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml,v
diff -u -r1.3 -r1.4
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml	10 Mar 2006 16:48:58 -0000	1.3
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml	23 Oct 2006 23:58:53 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml,v
diff -u -r1.9 -r1.10
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml	6 Sep 2006 01:36:13 -0000	1.9
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml	23 Oct 2006 23:58:53 -0000	1.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml,v
diff -u -r1.4 -r1.5
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml	21 Jul 2006 01:01:03 -0000	1.4
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml	23 Oct 2006 23:58:53 -0000	1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Attic/ToolImportSupport.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolImportSupport.hbm.xml	2 Aug 2006 06:15:38 -0000	1.1
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolImportSupport.hbm.xml	23 Oct 2006 23:58:53 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml,v
diff -u -r1.9 -r1.10
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml	7 Feb 2006 23:44:09 -0000	1.9
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml	23 Oct 2006 23:58:53 -0000	1.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml	6 Oct 2005 06:31:25 -0000	1.2
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml	23 Oct 2006 23:58:54 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java,v
diff -u -r1.56 -r1.57
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	13 Oct 2006 05:11:34 -0000	1.56
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	23 Oct 2006 23:58:53 -0000	1.57
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java,v
diff -u -r1.14 -r1.15
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java	17 Sep 2006 06:14:16 -0000	1.14
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java	23 Oct 2006 23:58:54 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java,v
diff -u -r1.10 -r1.11
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java	17 Sep 2006 06:14:16 -0000	1.10
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java	23 Oct 2006 23:58:53 -0000	1.11
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java,v
diff -u -r1.13 -r1.14
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java	17 Sep 2006 06:14:16 -0000	1.13
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java	23 Oct 2006 23:58:53 -0000	1.14
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java,v
diff -u -r1.26 -r1.27
--- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	17 Sep 2006 06:14:17 -0000	1.26
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	23 Oct 2006 23:58:55 -0000	1.27
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java,v
diff -u -r1.19 -r1.20
--- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java	17 Sep 2006 06:14:16 -0000	1.19
+++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java	23 Oct 2006 23:58:53 -0000	1.20
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/ToolContent.java,v
diff -u -r1.6 -r1.7
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolContent.java	17 Sep 2006 06:14:16 -0000	1.6
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolContent.java	23 Oct 2006 23:58:53 -0000	1.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/ToolImportSupport.java,v
diff -u -r1.2 -r1.3
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolImportSupport.java	17 Sep 2006 06:14:16 -0000	1.2
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolImportSupport.java	23 Oct 2006 23:58:53 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java,v
diff -u -r1.17 -r1.18
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java	17 Sep 2006 06:14:16 -0000	1.17
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java	23 Oct 2006 23:58:53 -0000	1.18
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java,v
diff -u -r1.27 -r1.28
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	17 Sep 2006 06:14:17 -0000	1.27
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	23 Oct 2006 23:58:56 -0000	1.28
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/Attic/CrCredential.hbm.xml,v
diff -u -r1.3 -r1.4
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml	6 Oct 2005 06:38:03 -0000	1.3
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml	23 Oct 2006 23:59:36 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/Attic/CrNode.hbm.xml,v
diff -u -r1.5 -r1.6
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml	6 Oct 2005 06:38:03 -0000	1.5
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml	23 Oct 2006 23:59:36 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/Attic/CrNodeVersion.hbm.xml,v
diff -u -r1.6 -r1.7
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml	6 Sep 2006 01:38:25 -0000	1.6
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml	23 Oct 2006 23:59:36 -0000	1.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/Attic/CrNodeVersionProperty.hbm.xml,v
diff -u -r1.4 -r1.5
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.hbm.xml	6 Oct 2005 06:38:03 -0000	1.4
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.hbm.xml	23 Oct 2006 23:59:36 -0000	1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/Attic/CrWorkspace.hbm.xml,v
diff -u -r1.4 -r1.5
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml	6 Oct 2005 06:38:03 -0000	1.4
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml	23 Oct 2006 23:59:36 -0000	1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/Attic/CrWorkspaceCredential.hbm.xml,v
diff -u -r1.3 -r1.4
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml	6 Oct 2005 06:38:03 -0000	1.3
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml	23 Oct 2006 23:59:36 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrCredential.java,v
diff -u -r1.5 -r1.6
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrCredential.java	17 Sep 2006 06:16:10 -0000	1.5
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrCredential.java	23 Oct 2006 23:59:27 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java,v
diff -u -r1.12 -r1.13
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java	17 Sep 2006 06:16:10 -0000	1.12
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java	23 Oct 2006 23:59:27 -0000	1.13
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java,v
diff -u -r1.9 -r1.10
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java	17 Sep 2006 06:16:10 -0000	1.9
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java	23 Oct 2006 23:59:27 -0000	1.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java,v
diff -u -r1.7 -r1.8
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java	17 Sep 2006 06:16:10 -0000	1.7
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java	23 Oct 2006 23:59:27 -0000	1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspace.java,v
diff -u -r1.5 -r1.6
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspace.java	17 Sep 2006 06:16:10 -0000	1.5
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspace.java	23 Oct 2006 23:59:27 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.java,v
diff -u -r1.5 -r1.6
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.java	17 Sep 2006 06:16:10 -0000	1.5
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.java	23 Oct 2006 23:59:27 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attic/ForumToolSession.hbm.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	8 Aug 2006 06:39:36 -0000	1.3
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	24 Oct 2006 00:02:58 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attic/ForumUser.hbm.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	23 Aug 2006 06:54:00 -0000	1.5
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	24 Oct 2006 00:02:58 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/ForumToolSession.hbm.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	8 Aug 2006 06:39:36 -0000	1.3
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	24 Oct 2006 00:02:58 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java,v
diff -u -r1.7 -r1.8
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java	17 Sep 2006 06:22:30 -0000	1.7
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java	24 Oct 2006 00:02:58 -0000	1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/ForumUser.hbm.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	23 Aug 2006 06:54:00 -0000	1.5
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	24 Oct 2006 00:02:57 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java,v
diff -u -r1.11 -r1.12
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java	17 Sep 2006 06:22:30 -0000	1.11
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java	24 Oct 2006 00:02:58 -0000	1.12
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Attic/ResourceItem.hbm.xml,v
diff -u -r1.11 -r1.12
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	25 Aug 2006 02:41:04 -0000	1.11
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	24 Oct 2006 00:05:36 -0000	1.12
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java,v
diff -u -r1.15 -r1.16
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	17 Sep 2006 06:25:37 -0000	1.15
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	24 Oct 2006 00:05:36 -0000	1.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Attic/ResourceItemInstruction.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.hbm.xml	23 Mar 2006 04:07:54 -0000	1.1
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.hbm.xml	24 Oct 2006 00:05:36 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java,v
diff -u -r1.4 -r1.5
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java	17 Sep 2006 06:25:37 -0000	1.4
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java	24 Oct 2006 00:05:36 -0000	1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Attic/ResourceItemVisitLog.hbm.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml	25 Aug 2006 02:41:04 -0000	1.6
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml	24 Oct 2006 00:05:36 -0000	1.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java,v
diff -u -r1.7 -r1.8
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java	17 Sep 2006 06:25:37 -0000	1.7
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java	24 Oct 2006 00:05:36 -0000	1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Attic/ResourceSession.hbm.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml	24 Apr 2006 06:57:51 -0000	1.3
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml	24 Oct 2006 00:05:36 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java,v
diff -u -r1.6 -r1.7
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java	17 Sep 2006 06:25:37 -0000	1.6
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java	24 Oct 2006 00:05:36 -0000	1.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Attic/ResourceUser.hbm.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml	25 Aug 2006 06:04:42 -0000	1.3
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml	24 Oct 2006 00:05:36 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java,v
diff -u -r1.8 -r1.9
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java	17 Sep 2006 06:25:37 -0000	1.8
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java	24 Oct 2006 00:05:36 -0000	1.9
@@ -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_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Attic/SurveyAnswer.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml	21 Sep 2006 07:46:41 -0000	1.2
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml	24 Oct 2006 00:06:52 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java,v
diff -u -r1.5 -r1.6
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java	25 Sep 2006 23:20:03 -0000	1.5
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java	24 Oct 2006 00:06:52 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Attic/SurveyItem.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyItem.hbm.xml	12 Sep 2006 04:15:19 -0000	1.1
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyItem.hbm.xml	24 Oct 2006 00:06:52 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Attic/SurveyItemInstruction.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyItemInstruction.hbm.xml	12 Sep 2006 04:15:19 -0000	1.1
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyItemInstruction.hbm.xml	24 Oct 2006 00:06:52 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Attic/SurveyItemVisitLog.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyItemVisitLog.hbm.xml	12 Sep 2006 04:15:19 -0000	1.1
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyItemVisitLog.hbm.xml	24 Oct 2006 00:06:52 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Attic/SurveyOption.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml	14 Sep 2006 06:44:12 -0000	1.2
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml	24 Oct 2006 00:06:52 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.java,v
diff -u -r1.5 -r1.6
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.java	26 Sep 2006 07:12:41 -0000	1.5
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.java	24 Oct 2006 00:06:52 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Attic/SurveyQuestion.hbm.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml	21 Sep 2006 07:46:41 -0000	1.4
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml	24 Oct 2006 00:06:52 -0000	1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java,v
diff -u -r1.8 -r1.9
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java	27 Sep 2006 04:40:59 -0000	1.8
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java	24 Oct 2006 00:06:52 -0000	1.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Attic/SurveySession.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml	13 Sep 2006 07:20:18 -0000	1.2
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml	24 Oct 2006 00:06:52 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.java,v
diff -u -r1.4 -r1.5
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.java	25 Sep 2006 23:20:03 -0000	1.4
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.java	24 Oct 2006 00:06:52 -0000	1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Attic/SurveyUser.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml	12 Sep 2006 04:15:19 -0000	1.1
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml	24 Oct 2006 00:06:52 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java,v
diff -u -r1.3 -r1.4
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java	25 Sep 2006 23:20:03 -0000	1.3
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java	24 Oct 2006 00:06:52 -0000	1.4
@@ -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() {