Index: lams_common/conf/hibernate/mappings/learningdesign/Grouping.hbm.xml
===================================================================
diff -u -r7be08bdc387f5f78514d44a89caab0ba1eea7655 -r75c68086ca1df84b98d4f53ca4e152071ceb8b06
--- lams_common/conf/hibernate/mappings/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 7be08bdc387f5f78514d44a89caab0ba1eea7655)
+++ lams_common/conf/hibernate/mappings/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 75c68086ca1df84b98d4f53ca4e152071ceb8b06)
@@ -9,20 +9,18 @@
 
     http://boss.bekk.no/boss/middlegen/
     http://www.hibernate.org/
-    
-    Modified by Chris Perfect
 -->
 
 <class 
     name="com.lamsinternational.lams.learningdesign.Grouping" 
-    table="lams_learning_grouping"
+    table="lams_grouping"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
-        table="lams_learning_grouping"
+        table="lams_grouping"
     </meta>
-    <discriminator column="grouping_type_id" type="int"/>
-    
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
     <id
         name="groupingId"
         type="java.lang.Long"
@@ -34,6 +32,7 @@
             type="java.lang.Long"
             column="grouping_id"
 
+
         </meta>
         <generator class="assigned" />
     </id>
@@ -62,18 +61,30 @@
             length="11"
         </meta>    
     </property>
+    <property
+        name="staffGroupId"
+        type="java.lang.Long"
+        column="staff_group_id"
+        length="20"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="staff_group_id"
+            length="20"
+        </meta>    
+    </property>
 
     <!-- Associations -->
   
-    <!-- bi-directional one-to-many association to LamsLearningGroup -->
+    <!-- bi-directional one-to-many association to Group -->
     <set
         name="groups"
         lazy="true"
         inverse="true"
-	cascade="none"
+		cascade="none"
     >
         <meta attribute="field-description">
-           @hibernate.list
+           @hibernate.set
             lazy="true"
             inverse="true"
             cascade="none"
@@ -84,21 +95,39 @@
            @hibernate.collection-one-to-many
             class="com.lamsinternational.lams.learningdesign.Group"
         </meta>
-        <index>
-            <column name="order_id"/>
-        <index>
         <key>
             <column name="grouping_id" />
         </key>
         <one-to-many 
             class="com.lamsinternational.lams.learningdesign.Group"
         />
     </set>
-    
-    <subclass name="com.lamsinternational.lams.lesson.Class" discriminator-value="2">
-        <many-to-one name="staffGroup" class="com.lamsinternational.lams.learningdesign.Group" column="staff_group_id" unique="true"/>
-    </sublcass>
-    
+    <!-- bi-directional one-to-many association to Activity -->
+    <set
+        name="activities"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
 
+           @hibernate.collection-key
+            column="grouping_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        </meta>
+        <key>
+            <column name="grouping_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        />
+    </set>
+
 </class>
 </hibernate-mapping>