Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u -r8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938 -r98e4c9f22a6124646416be2a0194ba4d3d5c7a50
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 98e4c9f22a6124646416be2a0194ba4d3d5c7a50)
@@ -11,324 +11,193 @@
     http://www.hibernate.org/
 -->
 
-<class 
-    name="com.lamsinternational.lams.learningdesign.Activity" 
-    table="lams_learning_activity"
->
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_learning_activity"
-    </meta>
+<class name="com.lamsinternational.lams.learningdesign.Activity" table="lams_learning_activity">
+    <meta attribute="class-description" inherit="false">@hibernate.class table="lams_learning_activity" </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+    <meta attribute="scope-class" inherit="false">public abstract</meta>    
 
-    <id
-        name="activityId"
-        type="java.lang.Long"
-        column="activity_id"
-    >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="assigned"
-            type="java.lang.Long"
-            column="activity_id"
-
-
-        </meta>
+    <id name="activityId" type="java.lang.Long" column="activity_id">
+        <meta attribute="field-description">@hibernate.id generator-class="assigned" type="java.lang.Long" column="activity_id" </meta>
         <generator class="assigned" />
     </id>
-
-    <property
-        name="id"
-        type="java.lang.Integer"
-        column="id"
-        length="11"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="id"
-            length="11"
-        </meta>    
+    <discriminator column = "learning_activity_type_id" insert="false"/>
+    
+    <property name="id" type="java.lang.Integer" column="id" length="11" >
+        <meta attribute="field-description">@hibernate.property column="id" length="11" </meta>
+        <meta attribute="use-in-toString">true</meta>    
     </property>
-    <property
-        name="description"
-        type="java.lang.String"
-        column="description"
-        length="65535"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="description"
-            length="65535"
-        </meta>    
+    <property name="description" type="java.lang.String" column="description" length="65535" >
+        <meta attribute="field-description">@hibernate.property column="description" length="65535"</meta>    
+        <meta attribute="use-in-toString">true</meta>
     </property>
-    <property
-        name="title"
-        type="java.lang.String"
-        column="title"
-        length="255"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="title"
-            length="255"
-        </meta>    
+    <property name="title" type="java.lang.String" column="title" length="255">
+        <meta attribute="field-description">@hibernate.property column="title" length="255"</meta>   
+        <meta attribute="use-in-toString">true</meta> 
     </property>
-    <property
-        name="xcoord"
-        type="java.lang.Integer"
-        column="xcoord"
-        length="11"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="xcoord"
-            length="11"
-        </meta>    
+    <property name="xcoord" type="java.lang.Integer" column="xcoord" length="11" >
+        <meta attribute="field-description">@hibernate.property column="xcoord" length="11"</meta>    
+        <meta attribute="use-in-toString">true</meta>
     </property>
-    <property
-        name="ycoord"
-        type="java.lang.Integer"
-        column="ycoord"
-        length="11"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="ycoord"
-            length="11"
-        </meta>    
+    <property name="ycoord" type="java.lang.Integer" column="ycoord" length="11">
+        <meta attribute="field-description">@hibernate.property column="ycoord" length="11" </meta>    
+        <meta attribute="use-in-toString">true</meta>
     </property>
-    <property
-        name="orderId"
-        type="java.lang.Integer"
-        column="order_id"
-        length="11"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="order_id"
-            length="11"
-        </meta>    
+    <property name="orderId" type="java.lang.Integer" column="order_id" length="11">
+    	<meta attribute="field-description">@hibernate.property column="order_id" length="11"</meta>    
+    	<meta attribute="use-in-toString">true</meta>
     </property>
-    <property
-        name="defineLaterFlag"
-        type="byte"
-        column="define_later_flag"
-        not-null="true"
-        length="4"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="define_later_flag"
-            length="4"
-            not-null="true"
-        </meta>    
+    <property name="defineLater" type="java.lang.Boolean" column="define_later_flag" not-null="true" length="4">
+        <meta attribute="field-description"> @hibernate.property column="define_later_flag" length="4" not-null="true" </meta>    
+        <meta attribute="use-in-toString">true</meta>
     </property>
-    <property
-        name="createDateTime"
-        type="java.sql.Timestamp"
-        column="create_date_time"
-        not-null="true"
-        length="19"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="create_date_time"
-            length="19"
-            not-null="true"
-        </meta>    
+    <property name="createDateTime" type="java.sql.Timestamp" column="create_date_time" not-null="true" length="19">
+    	<meta attribute="field-description">@hibernate.property column="create_date_time" length="19" not-null="true" </meta>    
+    	<meta attribute="use-in-toString">true</meta>
     </property>
-    <property
-        name="offlineInstructions"
-        type="java.lang.String"
-        column="offline_instructions"
-        length="65535"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="offline_instructions"
-            length="65535"
-        </meta>    
+    <property name="offlineInstructions" type="java.lang.String" column="offline_instructions" length="65535">
+        <meta attribute="field-description">@hibernate.property column="offline_instructions" length="65535"</meta>    
+        <meta attribute="use-in-toString">true</meta>
     </property>
-    <property
-        name="maxNumberOfOptions"
-        type="java.lang.Integer"
-        column="max_number_of_options"
-        length="5"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="max_number_of_options"
-            length="5"
-        </meta>    
-    </property>
-    <property
-        name="minNumberOfOptions"
-        type="java.lang.Integer"
-        column="min_number_of_options"
-        length="5"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="min_number_of_options"
-            length="5"
-        </meta>    
-    </property>
-    <property
-        name="gateStartDateTime"
-        type="java.sql.Timestamp"
-        column="gate_start_date_time"
-        length="19"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="gate_start_date_time"
-            length="19"
-        </meta>    
-    </property>
-    <property
-        name="gateEndDateTime"
-        type="java.sql.Timestamp"
-        column="gate_end_date_time"
-        length="19"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="gate_end_date_time"
-            length="19"
-        </meta>    
-    </property>
-
+    
     <!-- Associations -->
   
     <!-- bi-directional many-to-one association to Grouping -->
-    <many-to-one
-        name="grouping"
-        class="com.lamsinternational.lams.learningdesign.Grouping"
-        not-null="true"
-    >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="grouping_id"         
-        </meta>
+    <many-to-one name="grouping" class="com.lamsinternational.lams.learningdesign.Grouping" not-null="true" >
+        <meta attribute="field-description">@hibernate.many-to-one not-null="true" @hibernate.column name="grouping_id"</meta>
         <column name="grouping_id" />
     </many-to-one>
+    
     <!-- bi-directional many-to-one association to LearningLibrary -->
-    <many-to-one
-        name="learningLibrary"
-        class="com.lamsinternational.lams.learningdesign.LearningLibrary"
-        not-null="true"
-    >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="learning_library_id"         
-        </meta>
+    <many-to-one name="learningLibrary" class="com.lamsinternational.lams.learningdesign.LearningLibrary" not-null="true">
+        <meta attribute="field-description">@hibernate.many-to-one not-null="true" @hibernate.column name="learning_library_id"</meta>
         <column name="learning_library_id" />
     </many-to-one>
+    
     <!-- bi-directional many-to-one association to LearningDesign -->
-    <many-to-one
-        name="learningDesign"
-        class="com.lamsinternational.lams.learningdesign.LearningDesign"
-        not-null="true"
-    >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="learning_design_id"         
-        </meta>
+    <many-to-one name="learningDesign" class="com.lamsinternational.lams.learningdesign.LearningDesign" not-null="true">
+        <meta attribute="field-description">@hibernate.many-to-one not-null="true" @hibernate.column name="learning_design_id"</meta>
         <column name="learning_design_id" />
     </many-to-one>
+    
     <!-- bi-directional one-to-many association to Transition -->
-    <set
-        name="transitionsByToActivityId"
-        lazy="true"
-        inverse="true"
-		cascade="none"
-    >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="to_activity_id"
-
-           @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.learningdesign.Transition"
+    <set name="transitionsByToActivityId" lazy="true" inverse="true" cascade="none" >
+        <meta attribute="field-description">@hibernate.set lazy="true" inverse="true" cascade="none"
+        						            @hibernate.collection-key column="to_activity_id"
+        						            @hibernate.collection-one-to-many class="com.lamsinternational.lams.learningdesign.Transition"
         </meta>
-        <key>
-            <column name="to_activity_id" />
-        </key>
-        <one-to-many 
-            class="com.lamsinternational.lams.learningdesign.Transition"
-        />
+        <key><column name="to_activity_id" /></key>
+        <one-to-many class="com.lamsinternational.lams.learningdesign.Transition"/>
     </set>
+    
     <!-- bi-directional one-to-many association to Transition -->
-    <set
-        name="transitionsByFromActivityId"
-        lazy="true"
-        inverse="true"
-		cascade="none"
-    >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="from_activity_id"
-
-           @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.learningdesign.Transition"
+    <set name="transitionsByFromActivityId" lazy="true" inverse="true" cascade="none">
+        <meta attribute="field-description">@hibernate.set lazy="true" inverse="true" cascade="none" 
+        						            @hibernate.collection-key column="from_activity_id"
+        						            @hibernate.collection-one-to-many class="com.lamsinternational.lams.learningdesign.Transition"
         </meta>
-        <key>
-            <column name="from_activity_id" />
-        </key>
-        <one-to-many 
-            class="com.lamsinternational.lams.learningdesign.Transition"
-        />
+        <key><column name="from_activity_id" /></key>
+        <one-to-many class="com.lamsinternational.lams.learningdesign.Transition"/>
     </set>
+    
     <!-- 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="parent_activity_id"
-
-           @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.learningdesign.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="parent_activity_id"
+        						            @hibernate.collection-one-to-many class="com.lamsinternational.lams.learningdesign.Activity"
         </meta>
-        <key>
-            <column name="parent_activity_id" />
-        </key>
-        <one-to-many 
-            class="com.lamsinternational.lams.learningdesign.Activity"
-        />
+        <key><column name="parent_activity_id" /></key>
+        <one-to-many class="com.lamsinternational.lams.learningdesign.Activity"/>
     </set>
+    
     <!-- bi-directional many-to-one association to Activity -->
-    <many-to-one
-        name="activity"
-        class="com.lamsinternational.lams.learningdesign.Activity"
-        not-null="true"
-    >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="parent_activity_id"         
-        </meta>
+    <many-to-one name="activity" class="com.lamsinternational.lams.learningdesign.Activity" not-null="true">
+        <meta attribute="field-description">@hibernate.many-to-one not-null="true" @hibernate.column name="parent_activity_id"</meta>
         <column name="parent_activity_id" />
     </many-to-one>
+    
+    <!-- bi-directional many-to-one association to ActivityType --> 
+    <many-to-one name="activityType" class="com.lamsinternational.lams.learningdesign.ActivityType" not-null="true">
+        <meta attribute="field-description">@hibernate.many-to-one not-null="true" @hibernate.column name="learning_activity_type_id"</meta>
+        <column name ="learning_activity_type_id" />
+    </many-to-one>
+    
+    <!-- bi-directional many-to-one association to GateActivityLevel -->
+    <many-to-one name="gateActivityLevel" class="com.lamsinternational.lams.learningdesign.GateActivityLevel" not-null="true">
+        <meta attribute="field-description">@hibernate.many-to-one not-null="true" @hibernate.column name="gate_activity_level_id"</meta>
+        <column name="gate_activity_level_id" />
+    </many-to-one>
+    
+    <!-- bi-directional many-to-one association to ToolContent -->
+    <many-to-one name="toolContent" class="com.lamsinternational.lams.learningdesign.ToolContent" not-null="true">
+        <meta attribute="field-description">@hibernate.many-to-one not-null="true" @hibernate.column name="tool_content_id"</meta>
+        <column name="tool_content_id" />
+    </many-to-one>
+    
+    <!-- bi-directional many-to-one association to Tool -->
+    <many-to-one name="tool" class="com.lamsinternational.lams.learningdesign.Tool" not-null="true">
+        <meta attribute="field-description">@hibernate.many-to-one not-null="true" @hibernate.column name="tool_id"</meta>
+        <column name="tool_id" />
+    </many-to-one>    
+    
+    
+     <subclass name="com.lamsinternational.lams.learningdesign.SimpleActivity">
+     	 <meta attribute="class-description" inherit="false">@hibernate.class </meta>
+         <meta attribute="scope-class" inherit="false">public abstract</meta>
+			<subclass name="com.lamsinternational.lams.learningdesign.ToolActivity">
+				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+			</subclass>
+			<subclass name="com.lamsinternational.lams.learningdesign.GroupingActivity">
+				<meta attribute="class-description" inherit="false">@hibernate.class </meta>				
+				<subclass name="com.lamsinternational.lams.learningdesign.ChosenGroupingActivity">
+					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				</subclass>
+				<subclass name="com.lamsinternational.lams.learningdesign.RandomGroupingActivity">
+					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				</subclass>				
+			</subclass>
+			<subclass name="com.lamsinternational.lams.learningdesign.GateActivity">
+				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+							
+				<property name="gateStartDateTime" type="java.sql.Timestamp" column="gate_start_date_time" length="19">
+        			<meta attribute="field-description">@hibernate.property column="gate_start_date_time" length="19"</meta>    
+        			<meta attribute="use-in-toString">true</meta>
+			    </property>
+			    <property name="gateEndDateTime" type="java.sql.Timestamp" column="gate_end_date_time" length="19" >
+			    	<meta attribute="field-description">@hibernate.property column="gate_end_date_time" length="19" </meta>    
+			    	<meta attribute="use-in-toString">true</meta>
+			    </property>				
+				<subclass name="com.lamsinternational.lams.learningdesign.ScheduleGateActivity">
+					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				</subclass>
+				<subclass name="com.lamsinternational.lams.learningdesign.SynchGateActivity">
+					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				</subclass>
+				<subclass name="com.lamsinternational.lams.learningdesign.PermissionGateActivity">
+					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				</subclass>
+			</subclass>			
+	</subclass>
 
+	<subclass name="com.lamsinternational.lams.learningdesign.ComplexActivity">
+		<meta attribute="class-description" inherit="false">@hibernate.class </meta>			
+	    <meta attribute="scope-class" inherit="false">public abstract</meta>
+			<subclass name="com.lamsinternational.lams.learningdesign.OptionsActivity">
+				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				<property name="maxNumberOfOptions" type="java.lang.Integer" column="max_number_of_options" length="5">
+					<meta attribute="field-description">@hibernate.property column="max_number_of_options" length="5"</meta>    
+					<meta attribute="use-in-toString">true</meta>
+				</property>
+			    <property name="minNumberOfOptions" type="java.lang.Integer" column="min_number_of_options" length="5">
+					<meta attribute="field-description">@hibernate.property column="min_number_of_options" length="5"</meta> 
+					<meta attribute="use-in-toString">true</meta>
+			    </property>
+			</subclass>
+			<subclass name="com.lamsinternational.lams.learningdesign.SequenceActivity">
+				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+			</subclass>
+			<subclass name="com.lamsinternational.lams.learningdesign.ParallelActivity">
+				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+			</subclass>
+	</subclass>
 </class>
 </hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/ActivityType.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/ActivityType.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/ActivityType.hbm.xml	(revision 98e4c9f22a6124646416be2a0194ba4d3d5c7a50)
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class name="com.lamsinternational.lams.learningdesign.ActivityType" table="lams_learning_activity_type">
+    <meta attribute="class-description" inherit="false">@hibernate.class table="lams_learning_activity_type" </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+    <id name="learningActivityTypeId" type="java.lang.Integer" column="learning_activity_type_id" >
+        <meta attribute="field-description">@hibernate.id generator-class="assigned" type="java.lang.Integer" column="learning_activity_type_id"</meta>
+        <generator class="assigned" />
+    </id>
+
+    <property name="description" type="java.lang.String" column="description" not-null="true" length="255">
+        <meta attribute="field-description">@hibernate.property column="description" length="255" not-null="true" </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- 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="learning_activity_type_id"
+        									@hibernate.collection-one-to-many class="com.lamsinternational.lams.learningdesign.Activity"
+        </meta>
+        <key><column name="learning_activity_type_id" /></key>
+        <one-to-many class="com.lamsinternational.lams.learningdesign.Activity"/>
+    </set>
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/GateActivityLevel.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/GateActivityLevel.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/GateActivityLevel.hbm.xml	(revision 98e4c9f22a6124646416be2a0194ba4d3d5c7a50)
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.learningdesign.GateActivityLevel" 
+    table="lams_gate_activity_level"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_gate_activity_level"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="gateActivityLevelId"
+        type="java.lang.Integer"
+        column="gate_activity_level_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="assigned"
+            type="java.lang.Integer"
+            column="gate_activity_level_id"
+
+
+        </meta>
+        <generator class="assigned" />
+    </id>
+
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        not-null="true"
+        length="128"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="description"
+            length="128"
+            not-null="true"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- 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="gate_activity_level_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        </meta>
+        <key>
+            <column name="gate_activity_level_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Group.hbm.xml
===================================================================
diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r98e4c9f22a6124646416be2a0194ba4d3d5c7a50
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 98e4c9f22a6124646416be2a0194ba4d3d5c7a50)
@@ -19,6 +19,7 @@
        @hibernate.class
         table="lams_group"
     </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id
         name="groupId"
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml
===================================================================
diff -u -r8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938 -r98e4c9f22a6124646416be2a0194ba4d3d5c7a50
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 98e4c9f22a6124646416be2a0194ba4d3d5c7a50)
@@ -19,6 +19,7 @@
        @hibernate.class
         table="lams_grouping"
     </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id
         name="groupingId"
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml
===================================================================
diff -u -r8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938 -r98e4c9f22a6124646416be2a0194ba4d3d5c7a50
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 98e4c9f22a6124646416be2a0194ba4d3d5c7a50)
@@ -19,6 +19,7 @@
        @hibernate.class
         table="lams_learning_design"
     </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id
         name="learningDesignId"
@@ -97,8 +98,8 @@
         </meta>    
     </property>
     <property
-        name="validDesignFlag"
-        type="byte"
+        name="validDesign"
+        type="java.lang.Boolean"
         column="valid_design_flag"
         not-null="true"
         length="4"
@@ -111,8 +112,8 @@
         </meta>    
     </property>
     <property
-        name="readOnlyFlag"
-        type="byte"
+        name="readOnly"
+        type="java.lang.Boolean"
         column="read_only_flag"
         not-null="true"
         length="4"
@@ -173,8 +174,8 @@
         </meta>    
     </property>
     <property
-        name="lessonCopyFlag"
-        type="byte"
+        name="lessonCopy"
+        type="java.lang.Boolean"
         column="lesson_copy_flag"
         not-null="true"
         length="4"
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml
===================================================================
diff -u -r8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938 -r98e4c9f22a6124646416be2a0194ba4d3d5c7a50
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision 8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision 98e4c9f22a6124646416be2a0194ba4d3d5c7a50)
@@ -19,6 +19,7 @@
        @hibernate.class
         table="lams_learning_library"
     </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id
         name="learningLibraryId"
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Tool.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Tool.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Tool.hbm.xml	(revision 98e4c9f22a6124646416be2a0194ba4d3d5c7a50)
@@ -0,0 +1,137 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.learningdesign.Tool" 
+    table="lams_tool"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_tool"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="toolId"
+        type="java.lang.Long"
+        column="tool_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="assigned"
+            type="java.lang.Long"
+            column="tool_id"
+
+
+        </meta>
+        <generator class="assigned" />
+    </id>
+
+    <property
+        name="learnerUrl"
+        type="java.lang.String"
+        column="learner_url"
+        not-null="true"
+        length="65535"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="learner_url"
+            length="65535"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="supportsGrouping"
+        type="java.lang.Boolean"
+        column="supports_grouping_flag"
+        not-null="true"
+        length="1"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="supports_grouping_flag"
+            length="1"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="authorUrl"
+        type="java.lang.String"
+        column="author_url"
+        length="65535"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="author_url"
+            length="65535"
+        </meta>    
+    </property>
+    <property
+        name="supportsDefineLater"
+        type="java.lang.Boolean"
+        column="supports_define_later_flag"
+        not-null="true"
+        length="1"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="supports_define_later_flag"
+            length="1"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="defineLaterUrl"
+        type="java.lang.String"
+        column="define_later_url"
+        length="65535"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="define_later_url"
+            length="65535"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- 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="tool_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        </meta>
+        <key>
+            <column name="tool_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/ToolContent.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/ToolContent.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/ToolContent.hbm.xml	(revision 98e4c9f22a6124646416be2a0194ba4d3d5c7a50)
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.learningdesign.ToolContent" 
+    table="lams_tool_content"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_tool_content"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="toolContentId"
+        type="java.lang.Long"
+        column="tool_content_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="assigned"
+            type="java.lang.Long"
+            column="tool_content_id"
+
+
+        </meta>
+        <generator class="assigned" />
+    </id>
+
+    <property
+        name="toolContentKey"
+        type="long"
+        column="tool_content_key"
+        not-null="true"
+        length="20"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="tool_content_key"
+            length="20"
+            not-null="true"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- 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="tool_content_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        </meta>
+        <key>
+            <column name="tool_content_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Transition.hbm.xml
===================================================================
diff -u -r8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938 -r98e4c9f22a6124646416be2a0194ba4d3d5c7a50
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision 8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision 98e4c9f22a6124646416be2a0194ba4d3d5c7a50)
@@ -19,6 +19,7 @@
        @hibernate.class
         table="lams_learning_transition"
     </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id
         name="transitionId"
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/learningdesign/Activity.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/conf/hibernate/mappings/learningdesign/ActivityType.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/learningdesign/ActivityType.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/learningdesign/ActivityType.hbm.xml	(revision 98e4c9f22a6124646416be2a0194ba4d3d5c7a50)
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class name="com.lamsinternational.lams.learningdesign.ActivityType" table="lams_learning_activity_type">
+    <meta attribute="class-description" inherit="false">@hibernate.class table="lams_learning_activity_type" </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+    <id name="learningActivityTypeId" type="java.lang.Integer" column="learning_activity_type_id" >
+        <meta attribute="field-description">@hibernate.id generator-class="assigned" type="java.lang.Integer" column="learning_activity_type_id"</meta>
+        <generator class="assigned" />
+    </id>
+
+    <property name="description" type="java.lang.String" column="description" not-null="true" length="255">
+        <meta attribute="field-description">@hibernate.property column="description" length="255" not-null="true" </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- 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="learning_activity_type_id"
+        									@hibernate.collection-one-to-many class="com.lamsinternational.lams.learningdesign.Activity"
+        </meta>
+        <key><column name="learning_activity_type_id" /></key>
+        <one-to-many class="com.lamsinternational.lams.learningdesign.Activity"/>
+    </set>
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/learningdesign/GateActivityLevel.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/learningdesign/GateActivityLevel.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/learningdesign/GateActivityLevel.hbm.xml	(revision 98e4c9f22a6124646416be2a0194ba4d3d5c7a50)
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.learningdesign.GateActivityLevel" 
+    table="lams_gate_activity_level"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_gate_activity_level"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="gateActivityLevelId"
+        type="java.lang.Integer"
+        column="gate_activity_level_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="assigned"
+            type="java.lang.Integer"
+            column="gate_activity_level_id"
+
+
+        </meta>
+        <generator class="assigned" />
+    </id>
+
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        not-null="true"
+        length="128"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="description"
+            length="128"
+            not-null="true"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- 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="gate_activity_level_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        </meta>
+        <key>
+            <column name="gate_activity_level_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/learningdesign/Group.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/learningdesign/Grouping.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/learningdesign/LearningDesign.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/learningdesign/LearningLibrary.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/conf/hibernate/mappings/learningdesign/Tool.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/learningdesign/Tool.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/learningdesign/Tool.hbm.xml	(revision 98e4c9f22a6124646416be2a0194ba4d3d5c7a50)
@@ -0,0 +1,137 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.learningdesign.Tool" 
+    table="lams_tool"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_tool"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="toolId"
+        type="java.lang.Long"
+        column="tool_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="assigned"
+            type="java.lang.Long"
+            column="tool_id"
+
+
+        </meta>
+        <generator class="assigned" />
+    </id>
+
+    <property
+        name="learnerUrl"
+        type="java.lang.String"
+        column="learner_url"
+        not-null="true"
+        length="65535"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="learner_url"
+            length="65535"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="supportsGrouping"
+        type="java.lang.Boolean"
+        column="supports_grouping_flag"
+        not-null="true"
+        length="1"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="supports_grouping_flag"
+            length="1"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="authorUrl"
+        type="java.lang.String"
+        column="author_url"
+        length="65535"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="author_url"
+            length="65535"
+        </meta>    
+    </property>
+    <property
+        name="supportsDefineLater"
+        type="java.lang.Boolean"
+        column="supports_define_later_flag"
+        not-null="true"
+        length="1"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="supports_define_later_flag"
+            length="1"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="defineLaterUrl"
+        type="java.lang.String"
+        column="define_later_url"
+        length="65535"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="define_later_url"
+            length="65535"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- 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="tool_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        </meta>
+        <key>
+            <column name="tool_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/learningdesign/ToolContent.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/learningdesign/ToolContent.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/learningdesign/ToolContent.hbm.xml	(revision 98e4c9f22a6124646416be2a0194ba4d3d5c7a50)
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.learningdesign.ToolContent" 
+    table="lams_tool_content"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_tool_content"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="toolContentId"
+        type="java.lang.Long"
+        column="tool_content_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="assigned"
+            type="java.lang.Long"
+            column="tool_content_id"
+
+
+        </meta>
+        <generator class="assigned" />
+    </id>
+
+    <property
+        name="toolContentKey"
+        type="long"
+        column="tool_content_key"
+        not-null="true"
+        length="20"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="tool_content_key"
+            length="20"
+            not-null="true"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- 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="tool_content_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        </meta>
+        <key>
+            <column name="tool_content_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/learningdesign/Transition.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?