Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Group.hbm.xml
===================================================================
diff -u -r458989afcf25da4299995396ac4cb606f65a9ac6 -reae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 458989afcf25da4299995396ac4cb606f65a9ac6)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision eae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e)
@@ -28,13 +28,13 @@
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="assigned"
+            generator-class="identity"
             type="java.lang.Long"
             column="group_id"
 
 
         </meta>
-        <generator class="assigned" />
+        <generator class="identity" />
     </id>
 
     <property
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml
===================================================================
diff -u -r458989afcf25da4299995396ac4cb606f65a9ac6 -reae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 458989afcf25da4299995396ac4cb606f65a9ac6)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision eae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e)
@@ -28,13 +28,13 @@
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="assigned"
+            generator-class="identity"
             type="java.lang.Long"
             column="grouping_id"
 
 
         </meta>
-        <generator class="assigned" />
+        <generator class="identity" />
     </id>
 
     <property
@@ -73,6 +73,10 @@
             length="20"
         </meta>    
     </property>
+    
+    <property name="maxNumberOfGroups" type="java.lang.Integer" column="max_number_of_groups" length="3">
+        <meta attribute="field-description">@hibernate.property column="max_number_of_groups" length="3"</meta>    
+    </property>
 
     <!-- Associations -->
   
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml
===================================================================
diff -u -r458989afcf25da4299995396ac4cb606f65a9ac6 -reae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 458989afcf25da4299995396ac4cb606f65a9ac6)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision eae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e)
@@ -28,13 +28,13 @@
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="assigned"
+            generator-class="identity"
             type="java.lang.Long"
             column="learning_design_id"
 
 
         </meta>
-        <generator class="assigned" />
+        <generator class="identity" />
     </id>
 
     <property
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml
===================================================================
diff -u -r98e4c9f22a6124646416be2a0194ba4d3d5c7a50 -reae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision 98e4c9f22a6124646416be2a0194ba4d3d5c7a50)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision eae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e)
@@ -28,13 +28,13 @@
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="assigned"
+            generator-class="identity"
             type="java.lang.Long"
             column="learning_library_id"
 
 
         </meta>
-        <generator class="assigned" />
+        <generator class="identity" />
     </id>
 
     <property
Fisheye: Tag eae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Tool.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/ToolContent.hbm.xml
===================================================================
diff -u -r98e4c9f22a6124646416be2a0194ba4d3d5c7a50 -reae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/ToolContent.hbm.xml	(.../ToolContent.hbm.xml)	(revision 98e4c9f22a6124646416be2a0194ba4d3d5c7a50)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/ToolContent.hbm.xml	(.../ToolContent.hbm.xml)	(revision eae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e)
@@ -28,13 +28,13 @@
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="assigned"
+            generator-class="identity"
             type="java.lang.Long"
             column="tool_content_id"
 
 
         </meta>
-        <generator class="assigned" />
+        <generator class="identity" />
     </id>
 
     <property
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Transition.hbm.xml
===================================================================
diff -u -r458989afcf25da4299995396ac4cb606f65a9ac6 -reae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision 458989afcf25da4299995396ac4cb606f65a9ac6)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision eae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e)
@@ -28,13 +28,13 @@
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="assigned"
+            generator-class="identity"
             type="java.lang.Long"
             column="transition_id"
 
 
         </meta>
-        <generator class="assigned" />
+        <generator class="identity" />
     </id>
 
     <property
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/lesson/LearnerProgress.hbm.xml
===================================================================
diff -u -r458989afcf25da4299995396ac4cb606f65a9ac6 -reae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/lesson/LearnerProgress.hbm.xml	(.../LearnerProgress.hbm.xml)	(revision 458989afcf25da4299995396ac4cb606f65a9ac6)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/lesson/LearnerProgress.hbm.xml	(.../LearnerProgress.hbm.xml)	(revision eae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e)
@@ -28,13 +28,13 @@
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="assigned"
+            generator-class="identity"
             type="java.lang.Long"
             column="learner_progress_id"
 
 
         </meta>
-        <generator class="assigned" />
+        <generator class="identity" />
     </id>
 
 
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/tool/Tool.hbm.xml
===================================================================
diff -u -r458989afcf25da4299995396ac4cb606f65a9ac6 -reae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/tool/Tool.hbm.xml	(.../Tool.hbm.xml)	(revision 458989afcf25da4299995396ac4cb606f65a9ac6)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/tool/Tool.hbm.xml	(.../Tool.hbm.xml)	(revision eae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e)
@@ -28,13 +28,13 @@
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="assigned"
+            generator-class="identity"
             type="java.lang.Long"
             column="tool_id"
 
 
         </meta>
-        <generator class="assigned" />
+        <generator class="identity" />
     </id>
 
     <property
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/tool/ToolSession.hbm.xml
===================================================================
diff -u -r458989afcf25da4299995396ac4cb606f65a9ac6 -reae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/tool/ToolSession.hbm.xml	(.../ToolSession.hbm.xml)	(revision 458989afcf25da4299995396ac4cb606f65a9ac6)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/tool/ToolSession.hbm.xml	(.../ToolSession.hbm.xml)	(revision eae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e)
@@ -28,13 +28,13 @@
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="assigned"
+            generator-class="identity"
             type="java.lang.Long"
             column="tool_session_id"
 
 
         </meta>
-        <generator class="assigned" />
+        <generator class="identity" />
     </id>
 
     <property