Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938)
@@ -11,53 +11,192 @@
     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>
-    <meta attribute="implement-equals" inherit="false">true</meta>
-    <meta attribute="scope-class" inherit="false">public abstract</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>
 
-    <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>
-        <meta attribute="use-in-toString">true</meta>    
+    <property
+        name="id"
+        type="java.lang.Integer"
+        column="id"
+        length="11"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="id"
+            length="11"
+        </meta>    
     </property>
-    <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
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="65535"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="description"
+            length="65535"
+        </meta>    
     </property>
-    <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
+        name="title"
+        type="java.lang.String"
+        column="title"
+        length="255"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="title"
+            length="255"
+        </meta>    
     </property>
-    <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
+        name="xcoord"
+        type="java.lang.Integer"
+        column="xcoord"
+        length="11"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="xcoord"
+            length="11"
+        </meta>    
     </property>
-    <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
+        name="ycoord"
+        type="java.lang.Integer"
+        column="ycoord"
+        length="11"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="ycoord"
+            length="11"
+        </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>    
-    	<meta attribute="use-in-toString">true</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>    
     </property>
-    <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
+        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>
-    <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
+        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>
-    <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
+        name="offlineInstructions"
+        type="java.lang.String"
+        column="offline_instructions"
+        length="65535"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="offline_instructions"
+            length="65535"
+        </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 -->
@@ -190,64 +329,6 @@
         </meta>
         <column name="parent_activity_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/Grouping.hbm.xml
===================================================================
diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938)
@@ -19,7 +19,6 @@
        @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 -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938)
@@ -19,7 +19,6 @@
        @hibernate.class
         table="lams_learning_design"
     </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id
         name="learningDesignId"
@@ -98,8 +97,8 @@
         </meta>    
     </property>
     <property
-        name="validDesign"
-        type="java.lang.Boolean"
+        name="validDesignFlag"
+        type="byte"
         column="valid_design_flag"
         not-null="true"
         length="4"
@@ -112,8 +111,8 @@
         </meta>    
     </property>
     <property
-        name="readOnly"
-        type="java.lang.Boolean"
+        name="readOnlyFlag"
+        type="byte"
         column="read_only_flag"
         not-null="true"
         length="4"
@@ -174,8 +173,8 @@
         </meta>    
     </property>
     <property
-        name="lessonCopy"
-        type="java.lang.Boolean"
+        name="lessonCopyFlag"
+        type="byte"
         column="lesson_copy_flag"
         not-null="true"
         length="4"
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml
===================================================================
diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision 8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938)
@@ -19,7 +19,6 @@
        @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/Transition.hbm.xml
===================================================================
diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision 8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938)
@@ -19,7 +19,6 @@
        @hibernate.class
         table="lams_learning_transition"
     </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id
         name="transitionId"
Index: lams_common/lib/middlegen/velocity-1.4-dev.jar
===================================================================
diff -u -r973345232eba3d5a7ad51d731e0af3835b246620 -r8e71ee480dcaf1a2e4a6ec0cd58a25e41d70a938
Binary files differ