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.1 -r1.2
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	28 Jan 2005 04:08:30 -0000	1.1
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	1 Feb 2005 23:40:32 -0000	1.2
@@ -11,7 +11,7 @@
     http://www.hibernate.org/
 -->
 
-<class name="org.lamsfoundation.lams.learningdesign.Activity" table="lams_learning_activity" discriminator-value="0">
+<class name="org.lamsfoundation.lams.learningdesign.Activity" table="lams_learning_activity" discriminator-value="0" >
     <meta attribute="class-description" inherit="false">@hibernate.class table="lams_learning_activity"</meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
@@ -22,6 +22,7 @@
     
     <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>    
     </property>
@@ -54,24 +55,23 @@
         <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" >
+    <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="activityTypeId" type="java.lang.Integer" column="learning_activity_type_id" length="11">
+    <property name="activityTypeId" type="java.lang.Integer" column="learning_activity_type_id" length="11" not-null="true">
     	        <meta attribute="field-description">@hibernate.property column="learning_activity_type_id" length="11"</meta>    
    	</property>
     <property name="libraryActivityUiImage" type="java.lang.String" column="library_activity_ui_image" length="255">
         <meta attribute="field-description">@hibernate.property column="library_activity_ui_image" length="255"</meta>    
-    </property>
+    </property>    
     
 
     <!-- Associations -->
-  
+    
     <!-- bi-directional many-to-one association to LearningLibrary -->
-    <many-to-one name="learningLibrary" class="org.lamsfoundation.lams.learningdesign.LearningLibrary" not-null="true">
-        <meta attribute="field-description">@hibernate.many-to-one not-null="true" 
-        									@hibernate.column name="learning_library_id"         
+    <many-to-one name="learningLibrary" class="org.lamsfoundation.lams.learningdesign.LearningLibrary">
+        <meta attribute="field-description">@hibernate.column name="learning_library_id"         
         </meta>
         <column name="learning_library_id" />
     </many-to-one>
@@ -97,55 +97,55 @@
     </set>
     
     <!-- bi-directional many-to-one association to Activity -->
-    <many-to-one name="parentActivity" class="org.lamsfoundation.lams.learningdesign.Activity" not-null="true">
-        <meta attribute="field-description">@hibernate.many-to-one not-null="true"
-									        @hibernate.column name="parent_activity_id"         
+    <many-to-one name="parentActivity" class="org.lamsfoundation.lams.learningdesign.Activity">
+        <meta attribute="field-description">@hibernate.column name="parent_activity_id"         
         </meta>
         <column name="parent_activity_id" />
     </many-to-one>
         
     <!-- bi-directional many-to-one association to LearningDesign -->
-    <many-to-one name="learningDesign" class="org.lamsfoundation.lams.learningdesign.LearningDesign" not-null="true">
-        <meta attribute="field-description">@hibernate.many-to-one not-null="true" 
-        									@hibernate.column name="learning_design_id"         
+    <many-to-one name="learningDesign" class="org.lamsfoundation.lams.learningdesign.LearningDesign">
+        <meta attribute="field-description">@hibernate.column name="learning_design_id"         
         </meta>
         <column name="learning_design_id" />
     </many-to-one>
     
     <!-- bi-directional many-to-one association to Grouping -->
-    <many-to-one name="grouping" class="org.lamsfoundation.lams.learningdesign.Grouping" not-null="true">
-        <meta attribute="field-description">@hibernate.many-to-one not-null="true"
-        									@hibernate.column name="grouping_id"         
+    <many-to-one name="grouping" class="org.lamsfoundation.lams.learningdesign.Grouping">
+        <meta attribute="field-description">@hibernate.column name="grouping_id"         
         </meta>
         <column name="grouping_id" />
     </many-to-one>
     
     <!-- Subclass definations for polymorphic persistence -->
-    <subclass name="org.lamsfoundation.lams.learningdesign.SimpleActivity">
+    <subclass name="org.lamsfoundation.lams.learningdesign.SimpleActivity" >
      	 <meta attribute="class-description" inherit="false">@hibernate.class </meta>
          <meta attribute="scope-class" inherit="false">public abstract</meta>
-			<subclass name="org.lamsfoundation.lams.learningdesign.ToolActivity" discriminator-value="1">
+         
+			<subclass name="org.lamsfoundation.lams.learningdesign.ToolActivity" discriminator-value="1" >
 				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 				<property name="toolContentId" type="java.lang.Long" column="tool_content_id" length="20" />
                  
-                 <!-- bi-directional many-to-one association to Tool -->
+                 <!-- bi-directional many-to-one association to Tool-->
                  <many-to-one name="tool" class="org.lamsfoundation.lams.tool.Tool" >
-                 	<column name="tool_id" />
+                 	<column name="tool_id" not-null="false"/>
                  </many-to-one>
 			</subclass>
 			
-			<subclass name="org.lamsfoundation.lams.learningdesign.GroupingActivity">
+			<subclass name="org.lamsfoundation.lams.learningdesign.GroupingActivity" >
 				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 				
-				 <!-- bi-directional many-to-one association to Grouping >
-                  <many-to-one name="createGrouping" class="org.lamsfoundation.lams.learningdesign.Grouping" not-null="true">
-                  	<column name="grouping_id" />
-                  </many-to-one-->					                  
+				 <!-- bi-directional many-to-one association to Grouping-->
+                  <many-to-one name="createGrouping" class="org.lamsfoundation.lams.learningdesign.Grouping" >
+                  	<column name="create_grouping_id" />
+                  </many-to-one>					                  
 			</subclass>
-			<subclass name="org.lamsfoundation.lams.learningdesign.GateActivity">
+			<subclass name="org.lamsfoundation.lams.learningdesign.GateActivity" >
 				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
-				<property name="gateActivityLevelId" type="java.lang.Integer" column="gate_activity_level_id" length="11"/>
-				<subclass name="org.lamsfoundation.lams.learningdesign.ScheduleGateActivity" discriminator-value="5">
+				
+				<property name="gateActivityLevelId" type="java.lang.Integer" column="gate_activity_level_id" length="11" />
+				
+				<subclass name="org.lamsfoundation.lams.learningdesign.ScheduleGateActivity" discriminator-value="5" >
 					<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>    
@@ -156,16 +156,16 @@
 			    		<meta attribute="use-in-toString">true</meta>
 				    </property>
 				</subclass>
-				<subclass name="org.lamsfoundation.lams.learningdesign.SynchGateActivity" discriminator-value="4">
+				<subclass name="org.lamsfoundation.lams.learningdesign.SynchGateActivity" discriminator-value="4" >
 					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 				</subclass>
-				<subclass name="org.lamsfoundation.lams.learningdesign.PermissionGateActivity" discriminator-value="6">
+				<subclass name="org.lamsfoundation.lams.learningdesign.PermissionGateActivity" discriminator-value="6" >
 					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 				</subclass>
 			</subclass>			
 	</subclass>
 
-	<subclass name="org.lamsfoundation.lams.learningdesign.ComplexActivity">
+	<subclass name="org.lamsfoundation.lams.learningdesign.ComplexActivity" >
 		<meta attribute="class-description" inherit="false">@hibernate.class </meta>			
 	    <meta attribute="scope-class" inherit="false">public abstract</meta>
 	    
@@ -179,21 +179,23 @@
             <one-to-many class="org.lamsfoundation.lams.learningdesign.Activity"/>
 		</set>
 		
-         <subclass name="org.lamsfoundation.lams.learningdesign.OptionsActivity" discriminator-value="8">
+         <subclass name="org.lamsfoundation.lams.learningdesign.OptionsActivity" discriminator-value="8"  >
 				<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="org.lamsfoundation.lams.learningdesign.SequenceActivity" discriminator-value="9">
+			<subclass name="org.lamsfoundation.lams.learningdesign.SequenceActivity" discriminator-value="9" >
 				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 			</subclass>
-			<subclass name="org.lamsfoundation.lams.learningdesign.ParallelActivity" discriminator-value="7">
+			<subclass name="org.lamsfoundation.lams.learningdesign.ParallelActivity" discriminator-value="7"  >
 				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 			</subclass>
 	</subclass>
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.1 -r1.2
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	28 Jan 2005 04:08:30 -0000	1.1
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	1 Feb 2005 23:41:49 -0000	1.2
@@ -24,7 +24,14 @@
     <property name="maxNumberOfGroups" type="java.lang.Integer" column="max_number_of_groups" length="3"/>
 
     <!-- Associations -->
-    <!-- bi-directional one-to-many association to Group -->
+    
+    <!-- list name="groups" lazy="true" inverse="true" cascade="none">
+        <key><column name="grouping_id" /></key>
+        <index column="order_id"/>
+        <one-to-many class="org.lamsfoundation.lams.learningdesign.Group"/>        
+    </list-->
+    
+    <!-- bi-directional one-to-many association to Group-->
     <set name="groups" lazy="true" inverse="true" cascade="none">
     	<meta attribute="field-description">@hibernate.set lazy="true" inverse="true" cascade="none"
     										@hibernate.collection-key column="grouping_id" 
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.1 -r1.2
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml	28 Jan 2005 04:08:30 -0000	1.1
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml	1 Feb 2005 23:41:55 -0000	1.2
@@ -90,26 +90,6 @@
        
     </property>
     <property
-        name="readAccess"
-        type="java.lang.Long"
-        column="read_access"
-        length="20"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="read_access"
-            length="20"
-        </meta>    
-    </property>
-    <property
-        name="writeAccess"
-        type="java.lang.Long"
-        column="write_access"
-        length="20"
-    >
-         
-    </property>
-    <property
         name="helpText"
         type="java.lang.String"
         column="help_text"
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java,v
diff -u -r1.1 -r1.2
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java	28 Jan 2005 04:20:46 -0000	1.1
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java	1 Feb 2005 23:48:24 -0000	1.2
@@ -23,7 +23,7 @@
 	 * @param parentActivityId The activityId of the parent activity
 	 * @return Activity populated Activity object
 	 */
-	public Activity getActivityByParentActivityId(Long parentActivityId);
+	public List getActivitiesByParentActivityId(Long parentActivityId);
 	
 	/**
 	 * @return List of all the activities
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java,v
diff -u -r1.1 -r1.2
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java	28 Jan 2005 04:20:47 -0000	1.1
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java	1 Feb 2005 23:49:28 -0000	1.2
@@ -5,15 +5,22 @@
 
 import java.util.List;
 import org.lamsfoundation.lams.learningdesign.Activity;
+import org.lamsfoundation.lams.learningdesign.OptionsActivity;
 import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO;
 
 /**
  * @author MMINHAS 
  */
 public class ActivityDAO extends BaseDAO implements IActivityDAO {
 	
-	private static final String FIND_BY_PARENT = "from lams_learning_activity activity where activity.parent_activity_id=?" ;	
-	private static final String FIND_BY_LEARNING_DESIGN_ID ="from lams_learning_activity activity where activity.learning_design_id=?" ;
+	private static final String TABLENAME ="lams_learning_activity";
+		
+	private static final String FIND_BY_PARENT = "from " + TABLENAME +" in class " + Activity.class.getName() + " where parent_activity_id=?" ;
+	
+	private static final String FIND_BY_LEARNING_DESIGN_ID = "from " + TABLENAME +
+															 " in class " + Activity.class.getName() +
+															 " where learning_design_id=?" ;
+	
 
 	/* 
 	 * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IActivityDAO#getActivityById(java.lang.Long)
@@ -25,12 +32,9 @@
 	/* 
 	 * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IActivityDAO#getActivityByParentActivityId(java.lang.Long)
 	 */
-	public Activity getActivityByParentActivityId(Long parentActivityId) {
+	public List getActivitiesByParentActivityId(Long parentActivityId) {
 		List list = this.getHibernateTemplate().find(FIND_BY_PARENT,parentActivityId);
-		if(list.size()==0)
-			return null;
-		else
-			return (Activity) list.get(0);
+		return list;
 	}
 
 	/* 
@@ -53,7 +57,11 @@
 	public void insertActivity(Activity activity) {
 		this.getHibernateTemplate().save(activity);
 	}
+	public void insertOptActivity(OptionsActivity activity) {
+		this.getHibernateTemplate().save(activity);
+	}
 
+
 	/* 
 	 * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IActivityDAO#updateActivity(org.lamsfoundation.lams.learningdesign.Activity)
 	 */
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java,v
diff -u -r1.1 -r1.2
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java	28 Jan 2005 04:20:47 -0000	1.1
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java	1 Feb 2005 23:49:28 -0000	1.2
@@ -21,8 +21,7 @@
 	 * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IGroupingDAO#getGroupingById(java.lang.Long)
 	 */
 	public Grouping getGroupingById(Long groupingID) {
-		// TODO Auto-generated method stub
-		return null;
+		return (Grouping)super.find(Grouping.class,groupingID);
 	}
 
 }