Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
diff -u -r8e764cef94c3501df91598521080a8bf2c5160b2 -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 8e764cef94c3501df91598521080a8bf2c5160b2)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -264,32 +264,34 @@
             not-null="true"
         </meta>    
     </property>
+    
+    <property name="userOrganisationID" type="java.lang.Integer" column="user_organisation_id" length="11" not-null="true">
+        <meta attribute="field-description">@hibernate.property column="user_organisation_id" length="11" </meta>    
+    </property>
 
     <!-- Associations -->
   
     <!-- bi-directional many-to-one association to Workspace -->
     <many-to-one
         name="workspace"
-        class="org.lamsfoundation.lams.usermanagement.Workspace"
-        not-null="true"
+        class="org.lamsfoundation.lams.usermanagement.Workspace"     
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
-            not-null="true"
            @hibernate.column name="workspace_id"         
         </meta>
         <column name="workspace_id" />
     </many-to-one>
     <!-- bi-directional one-to-many association to UserOrganisation -->
     <set
         name="userOrganisations"
-        lazy="true"
+        lazy="false"
         inverse="true"
 		cascade="all-delete-orphan"
     >
         <meta attribute="field-description">
            @hibernate.set
-            lazy="true"
+            lazy="false"
             inverse="true"
             cascade="all-delete-orphan"
 
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml
===================================================================
diff -u -r2db1c52567bf8f79ccb7589d1d8785be4ed1118c -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml	(.../Workspace.hbm.xml)	(revision 2db1c52567bf8f79ccb7589d1d8785be4ed1118c)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml	(.../Workspace.hbm.xml)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -37,6 +37,10 @@
         <meta attribute="use-in-equals">true</meta>
         <generator class="native" />
     </id>
+    
+    <property name="name" type="java.lang.String" column="name" length="65535">
+        <meta attribute="field-description">@hibernate.property column="name" length="65535" </meta>    
+    </property>
 
 
     <!-- Associations -->
@@ -95,7 +99,7 @@
     </set>
     <!-- bi-directional many-to-one association to WorkspaceFolder -->
     <many-to-one
-        name="workspaceFolder"
+        name="rootFolder"
         class="org.lamsfoundation.lams.usermanagement.WorkspaceFolder"
         not-null="true"
     >
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml
===================================================================
diff -u -r8e764cef94c3501df91598521080a8bf2c5160b2 -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision 8e764cef94c3501df91598521080a8bf2c5160b2)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -51,8 +51,22 @@
             not-null="true"
         </meta>    
     </property>
+    
+    <property name="userID" type="java.lang.Integer" column="user_id" length="11" >
+        <meta attribute="field-description">@hibernate.property column="user_id" length="11" </meta>    
+    </property>
+    <property name="workspaceFolderType" type="java.lang.Integer" column="lams_workspace_folder_type_id" length="11" >
+        <meta attribute="field-description">@hibernate.property column="lams_workspace_folder_type_id" length="11" </meta>    
+    </property>
+    <property name="creationDate" 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="lastModifiedDate" type="java.sql.Timestamp" column="last_modified_date_time" not-null="true" length="19">
+        <meta attribute="field-description">@hibernate.property column="last_modified_date_time" length="19" not-null="true"</meta>    
+    </property>
+    
     <property
-        name="workspaceId"
+        name="workspaceID"
         type="int"
         column="workspace_id"
         not-null="true"
Index: lams_common/lib/lams/lams-authoring.jar
===================================================================
diff -u
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
diff -u -r30ab6476156472b1a4f65aa75999d78cb2d0b545 -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision 30ab6476156472b1a4f65aa75999d78cb2d0b545)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -24,6 +24,7 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
@@ -32,8 +33,12 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO;
 import org.lamsfoundation.lams.learningdesign.dto.MonitoringActivityDTO;
 import org.lamsfoundation.lams.learningdesign.dto.ProgressActivityDTO;
+import org.lamsfoundation.lams.learningdesign.strategy.ComplexActivityStrategy;
+import org.lamsfoundation.lams.learningdesign.strategy.SimpleActivityStrategy;
+import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.util.Nullable;
 /**
@@ -64,8 +69,16 @@
 	public static final int CATEGORY_ASSESSMENT = 3;
 	public static final int CATEGORY_CONTENT = 4;
 	public static final int CATEGORY_SPLIT = 5;
-    /*******************************************************************/
+	/******************************************************************/
 	
+	/**
+	 * static final variables indicating the grouping_support of activities
+	 *******************************************************************/
+	public static final int GROUPING_SUPPORT_NONE = 1;
+	public static final int GROUPING_SUPPORT_OPTIONAL = 2;
+	public static final int GROUPING_SUPPORT_REQUIRED = 3;
+	/******************************************************************/
+	
 	/** WDDX packet specific attribute created to identify the
 	 * type of object being passed.*/
 	public static final String OBJECT_TYPE ="Activity";
@@ -187,6 +200,9 @@
 	public void setGroupingSupportType(Integer groupingSupportType) {
 		this.groupingSupportType = groupingSupportType;
 	}
+	protected ComplexActivityStrategy complexActivityStrategy;
+	protected SimpleActivityStrategy simpleActivityStrategy;
+	
 	/** full constructor */
 	public Activity(
 			Long activityId,
@@ -635,10 +651,13 @@
 	public void setActivityCategoryID(Integer activityCategoryID) {
 		this.activityCategoryID = activityCategoryID;
 	}
-
+		
 	public MonitoringActivityDTO getMonitoringActivityDTO(){
-		return new MonitoringActivityDTO(this);
+		return new MonitoringActivityDTO(this); 
 	}
+	public MonitoringActivityDTO getMonitoringActivityDTO(Integer contributionType,Boolean required){
+		return new MonitoringActivityDTO(this,contributionType,required);
+	}	
 	public MonitoringActivityDTO getMonitoringActivityDTO(Activity activity){
 		Integer contributionType[]= null;
 		if(activity.isGateActivity() || activity.isToolActivity() || activity.isGroupingActivity()){
@@ -657,6 +676,9 @@
 		}
 		return children;
 	}	
+	public AuthoringActivityDTO getAuthoringActivityDTO(){
+		return new AuthoringActivityDTO(this);
+	}
 	/**
 	 * @return Returns the onlineInstructions.
 	 */
@@ -678,4 +700,24 @@
 	{
 	    return new ProgressActivityDTO(this.activityId);
 	}
+	public static Object getActivityInstance(int activityType){
+		switch(activityType){
+			case TOOL_ACTIVITY_TYPE:
+				return new ToolActivity();
+			case OPTIONS_ACTIVITY_TYPE:
+				return new OptionsActivity();
+			case PARALLEL_ACTIVITY_TYPE:
+				return new ParallelActivity();
+			case SEQUENCE_ACTIVITY_TYPE:
+				return new SequenceActivity();
+			case SYNCH_GATE_ACTIVITY_TYPE:
+				return new SynchGateActivity();
+			case SCHEDULE_GATE_ACTIVITY_TYPE:
+				return new ScheduleGateActivity();
+			case PERMISSION_GATE_ACTIVITY_TYPE:
+				return new PermissionGateActivity();
+			default:
+				return new GroupingActivity();
+		}
+	}
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
===================================================================
diff -u -r85592985e7c0ff8c521939c92f1a3da4639c5f73 -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java	(.../Grouping.java)	(revision 85592985e7c0ff8c521939c92f1a3da4639c5f73)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java	(.../Grouping.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -11,6 +11,7 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.lamsfoundation.lams.learningdesign.dto.GroupingDTO;
 import org.lamsfoundation.lams.lesson.LessonClass;
 import org.lamsfoundation.lams.usermanagement.User;
 
@@ -297,4 +298,15 @@
 	{
 	    return !getGroupBy(learner).isNull();
 	}
+	public GroupingDTO getGroupingDTO(){
+		return new GroupingDTO(this);
+	}
+	public static Object getGroupingInstance(Integer groupingType){
+		if(groupingType.equals(RANDOM_GROUPING_TYPE))
+			return new RandomGrouping();
+		else if(groupingType.equals(CHOSEN_GROUPING_TYPE))
+			return new ChosenGrouping();
+		else
+			return new LessonClass();
+	}
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
===================================================================
diff -u -r0c87ef82b228f2c4e0593ce7884ea252799a114d -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java	(.../LearningDesign.java)	(revision 0c87ef82b228f2c4e0593ce7884ea252799a114d)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java	(.../LearningDesign.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -1,7 +1,10 @@
 package org.lamsfoundation.lams.learningdesign;
 
+import org.lamsfoundation.lams.learningdesign.dto.DesignDetailDTO;
+import org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
+import org.lamsfoundation.lams.workspace.dto.FolderContentDTO;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -409,7 +412,7 @@
 	public Long getDuration() {
 		return duration;
 	}
-	public void setDuration(Long duration) {
+	public void setDuration(Long duration) {		
 		this.duration = duration;
 	}
 	public String getLicenseText() {
@@ -465,5 +468,14 @@
 	}
 	public void setLastModifiedDateTime(Date lastModifiedDateTime) {
 		this.lastModifiedDateTime = lastModifiedDateTime;
-	}	
+	}
+	public LearningDesignDTO getLearningDesignDTO(){
+		return new LearningDesignDTO(this);
+	}
+	public DesignDetailDTO getDesignDetailDTO(){
+		return new DesignDetailDTO(this);
+	}
+	public FolderContentDTO getFolderContentDTO(){
+		return new FolderContentDTO();
+	}
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java
===================================================================
diff -u -ra5b4601019a9f53dedc59404b3baadadd819c159 -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java	(.../LearningLibrary.java)	(revision a5b4601019a9f53dedc59404b3baadadd819c159)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java	(.../LearningLibrary.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -6,6 +6,7 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.lamsfoundation.lams.learningdesign.dto.LearningLibraryDTO;
 
 
 /** 
@@ -162,4 +163,7 @@
 	public void setValidLibrary(Boolean validLibrary) {
 		this.validLibrary = validLibrary;
 	}
+	public LearningLibraryDTO getLearningLibraryDTO(){
+		return new LearningLibraryDTO(this);
+	}
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java
===================================================================
diff -u -r4c43b6fe5f48045c572b50bb279484abd09dcdda -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java	(.../Transition.java)	(revision 4c43b6fe5f48045c572b50bb279484abd09dcdda)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java	(.../Transition.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -5,6 +5,7 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.lamsfoundation.lams.learningdesign.dto.TransitionDTO;
 
 /**
  * @hibernate.class table="lams_learning_transition"
@@ -239,4 +240,7 @@
 	public void setToUIID(Integer toUIID) {
 		this.toUIID = toUIID;
 	}
+	public TransitionDTO getTransitionDTO(){
+		return new TransitionDTO(this);
+	}
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java	(.../ILearningDesignDAO.java)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java	(.../ILearningDesignDAO.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -33,4 +33,26 @@
 	 * @return List of learning designs with given userID
 	 */
 	public List getLearningDesignByUserId(Long userID);
+	
+	/**
+	 * This method returns a list of all designs that are valid in 
+	 * the given workspaceFolder.
+	 * 
+	 * @param workspaceFolderID The workspace_folder_id of the WorkspaceFolder
+	 * 							from where the designs have to be fetched.
+	 * @return List The List of all available designs
+	 */
+	public List getAllValidLearningDesignsInFolder(Integer workspaceFolderID);
+	
+	/**
+	 * This method returns a list of all available designs in 
+	 * the given workspaceFolder.
+	 * 
+	 * @param workspaceFolderID The workspace_folder_id of the WorkspaceFolder
+	 * 							from where the designs have to be fetched.
+	 * @return List The List of all available designs
+	 */
+	public List getAllLearningDesignsInFolder(Integer workspaceFolderID);
+	
+	
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
===================================================================
diff -u -r174fa126cd5cc9d88eb39d6596af0453a2b77e49 -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java	(.../ActivityDAO.java)	(revision 174fa126cd5cc9d88eb39d6596af0453a2b77e49)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java	(.../ActivityDAO.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -93,7 +93,10 @@
 	public Activity getActivityByUIID(Integer id, LearningDesign design) {
 		Long designID = design.getLearningDesignId();
 		List list = this.getHibernateTemplate().find(FIND_BY_UI_ID,new Object[]{id,designID},new Type[]{Hibernate.INTEGER,Hibernate.LONG});
-		return (Activity) list.get(0);		
+		if(list!=null && list.size()!=0)
+			return (Activity) list.get(0);
+		else
+			return null;
 	}
 	/**
 	 * @see org.lamsfoundation.lams.learningdesign.dao.IActivityDAO#getActivitiesByLibraryID(java.lang.Long)
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java	(.../LearningDesignDAO.java)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java	(.../LearningDesignDAO.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -22,6 +22,12 @@
 
 	private static final String TABLENAME ="lams_learning_design";
 	private static final String FIND_BY_USERID = "from " + TABLENAME +" in class " + LearningDesign.class.getName()+ " where user_id =?";
+	
+	private static final String VALID_IN_FOLDER ="from " + TABLENAME +" in class " + LearningDesign.class.getName()+
+												 " where valid_design_flag=true AND workspace_folder_id=?";
+	
+	private static final String ALL_IN_FOLDER ="from " + TABLENAME +" in class " + LearningDesign.class.getName()+
+												" where workspace_folder_id=?";
 		
 	
 	/* 
@@ -53,4 +59,21 @@
 			/*TODO Exception Handling*/
 		}		
 	}
+
+	/**
+	 * (non-Javadoc)
+	 * @see org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO#getAllValidLearningDesignsInFolder(java.lang.Integer)
+	 */
+	public List getAllValidLearningDesignsInFolder(Integer workspaceFolderID) {		
+		return this.getHibernateTemplate().find(VALID_IN_FOLDER,workspaceFolderID);		
+	}
+
+	/**
+	 * (non-Javadoc)
+	 * @see org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO#getAllLearningDesignsInFolder(java.lang.Integer)
+	 */
+	public List getAllLearningDesignsInFolder(Integer workspaceFolderID) {
+		return this.getHibernateTemplate().find(ALL_IN_FOLDER,workspaceFolderID);
+	}
+	
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
===================================================================
diff -u -rafbd2486f479295afe9a177d7bd3f9dcb71927a8 -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java	(.../AuthoringActivityDTO.java)	(revision afbd2486f479295afe9a177d7bd3f9dcb71927a8)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java	(.../AuthoringActivityDTO.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -7,15 +7,27 @@
 package org.lamsfoundation.lams.learningdesign.dto;
 
 import java.util.Date;
+import java.util.Hashtable;
+
+import org.lamsfoundation.lams.learningdesign.Activity;
+import org.lamsfoundation.lams.learningdesign.GateActivity;
+import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.GroupingActivity;
+import org.lamsfoundation.lams.learningdesign.OptionsActivity;
+import org.lamsfoundation.lams.learningdesign.ParallelActivity;
+import org.lamsfoundation.lams.learningdesign.PermissionGateActivity;
+import org.lamsfoundation.lams.learningdesign.ScheduleGateActivity;
+import org.lamsfoundation.lams.learningdesign.SequenceActivity;
+import org.lamsfoundation.lams.learningdesign.SynchGateActivity;
+import org.lamsfoundation.lams.learningdesign.ToolActivity;
 import org.lamsfoundation.lams.util.wddx.WDDXTAGS;
 /**
  * @author Minhas
  *
  * TODO To change the template for this generated type comment go to
  * Window - Preferences - Java - Code Style - Code Templates
  */
-public class AuthoringActivityDTO {
+public class AuthoringActivityDTO extends BaseDTO{
 	
 	/*****************************************************************************
 	 * Attributes
@@ -89,6 +101,9 @@
 	/** Offline Instruction for this activity*/
 	private String offlineInstructions;
 	
+	/** Online Instruction for this activity*/
+	private String onlineInstructions;
+	
 	/** Maximum number of activities to be attempted */
 	private Integer maxOptions;
 	
@@ -111,15 +126,21 @@
 	
 	private Boolean gateOpen;
 	
-	private Date gateStartTimeOffset;
+	private Long gateStartTimeOffset;
 	
-	private Date gateEndTimeOffset;
+	private Long gateEndTimeOffset;
 	
 	private Date gateStartDateTime;
 	
 	private Date gateEndDateTime;
 	
+	private Boolean applyGrouping;
+	
+	private Integer groupingSupportType;
+	
+	private Integer groupingType;
 
+	
 	/** The image that represents the icon of this 
 	 * activity in the UI*/
 	private String libraryActivityUiImage;
@@ -128,7 +149,9 @@
 	
 	private Integer createGroupingUIID;
 	
+	private GroupingDTO groupingDTO;
 	
+	
 	/** Single Library can have one or more activities
 	 * defined inside it. This field indicates which
 	 * activity is this.*/
@@ -143,13 +166,16 @@
 			Integer activityTypeId, Long groupingID, Integer groupingUIID,
 			Integer orderID, Boolean defineLater, Long learningDesignID,
 			Long learningLibraryID, Date createDateTime, Boolean runOffline,
-			String offlineInstructions, Integer maxOptions, Integer minOptions,
+			String offlineInstructions, String onlineInstructions,
+			Integer maxOptions, Integer minOptions,
 			String optionsInstructions, Long toolID, Long toolContentID,
 			Integer activityCategoryID, Integer gateActivityLevelID,
-			Boolean gateOpen, Date gateStartTimeOffset, Date gateEndTimeOffset,
+			Boolean gateOpen, Long gateStartTimeOffset, Long gateEndTimeOffset,
 			Date gateStartDateTime, Date gateEndDateTime,
 			String libraryActivityUiImage, Long createGroupingID,
-			Integer createGroupingUIID, Long libraryActivityID) {
+			Integer createGroupingUIID, Long libraryActivityID,
+			Boolean applyGrouping,Integer groupingSupportType,
+			Integer groupingType,GroupingDTO groupingDTO) {
 		super();
 		this.activityId = activityId;
 		this.activityUIID = activityUIID;
@@ -170,6 +196,7 @@
 		this.createDateTime = createDateTime;
 		this.runOffline = runOffline;
 		this.offlineInstructions = offlineInstructions;
+		this.onlineInstructions = onlineInstructions;
 		this.maxOptions = maxOptions;
 		this.minOptions = minOptions;
 		this.optionsInstructions = optionsInstructions;
@@ -186,10 +213,202 @@
 		this.createGroupingID = createGroupingID;
 		this.createGroupingUIID = createGroupingUIID;
 		this.libraryActivityID = libraryActivityID;
+		this.applyGrouping = applyGrouping;
+		this.groupingSupportType = groupingSupportType;
+		this.groupingType = groupingType;
+		this.groupingDTO = groupingDTO;
 	}
-	public AuthoringActivityDTO(Object activity){
+	public AuthoringActivityDTO(Object object){
+		processActivityType(object);
+		Activity activity = (Activity)object;
+		this.activityId = activity.getActivityId();
+		this.activityUIID = activity.getActivityUIID();
+		this.description = activity.getDescription();
+		this.title = activity.getTitle();
+		this.helpText = activity.getHelpText();
+		this.xcoord = activity.getXcoord();
+		this.ycoord = activity.getYcoord();
+		this.parentActivityID = activity.getParentActivity()!=null?
+								activity.getParentActivity().getActivityId():
+								WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+		this.parentUIID = activity.getParentUIID();
+		this.activityTypeId = activity.getActivityTypeId();
 		
+		this.groupingID = activity.getGrouping()!=null?
+						  activity.getGrouping().getGroupingId():
+						  WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+		
+		this.groupingUIID = activity.getGroupingUIID();
+		this.orderID = activity.getOrderId();
+		this.defineLater = activity.getDefineLater();
+		this.learningDesignID = activity.getLearningDesign()!=null?
+								activity.getLearningDesign().getLearningDesignId():
+								WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+		this.learningLibraryID = activity.getLearningLibrary()!=null?
+								 activity.getLearningLibrary().getLearningLibraryId():
+								 WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+		this.createDateTime = activity.getCreateDateTime();
+		this.runOffline = activity.getRunOffline();
+		this.offlineInstructions = activity.getOfflineInstructions();	
+		this.onlineInstructions = activity.getOnlineInstructions();
+		this.activityCategoryID = activity.getActivityCategoryID();		
+		this.libraryActivityUiImage = activity.getLibraryActivityUiImage();		
+		this.libraryActivityID = activity.getLibraryActivity()!=null?
+								 activity.getLibraryActivity().getActivityId():
+								 WDDXTAGS.NUMERIC_NULL_VALUE_LONG;	
+		this.applyGrouping = activity.getApplyGrouping();
+		this.groupingSupportType = activity.getGroupingSupportType();
 	}
+	public AuthoringActivityDTO(Hashtable activityDetails){
+		if(activityDetails.containsKey("activityUIID"))
+			this.activityUIID =convertToInteger(activityDetails.get("activityUIID"));
+		if(activityDetails.containsKey("description"))
+			this.description =(String)activityDetails.get("description");
+		if(activityDetails.containsKey("title"))
+			this.title = (String)activityDetails.get("title");			
+		if(activityDetails.containsKey("helpText"))
+			this.helpText =(String)activityDetails.get("helpText");
+		if(activityDetails.containsKey("xcoord"))
+			this.xcoord = convertToInteger(activityDetails.get("xcoord"));
+		if(activityDetails.containsKey("ycoord"))
+			this.ycoord = convertToInteger(activityDetails.get("ycoord"));
+		
+		if(activityDetails.containsKey("parentActivityID"))
+			this.parentActivityID = convertToLong(activityDetails.get("parentActivityID"));
+		
+		if(activityDetails.containsKey("parentUIID"))
+			this.parentUIID =convertToInteger(activityDetails.get("parentUIID"));
+		
+		if(activityDetails.containsKey("activityTypeId"))
+			this.activityTypeId = convertToInteger(activityDetails.get("activityTypeId"));
+		if(activityDetails.containsKey("groupingID"))
+			this.groupingID = convertToLong(activityDetails.get("groupingID"));
+		if(activityDetails.containsKey("groupingUIID"))
+			this.groupingUIID = convertToInteger(activityDetails.get("groupingUIID"));
+		if(activityDetails.containsKey("orderID"))
+			this.orderID = convertToInteger(activityDetails.get("orderID"));
+		if(activityDetails.containsKey("defineLater"))
+			this.defineLater = (Boolean) activityDetails.get("defineLater");
+		if(activityDetails.containsKey("learningDesignID"))
+			this.learningDesignID = convertToLong(activityDetails.get("learningDesignID"));
+		if(activityDetails.containsKey("learningLibraryID"))
+			this.learningLibraryID = convertToLong(activityDetails.get("learningLibraryID"));
+		if(activityDetails.containsKey("createDateTime"))
+			this.createDateTime = (Date)activityDetails.get("createDateTime");
+		if(activityDetails.containsKey("runOffline"))
+			this.runOffline = (Boolean) activityDetails.get("runOffline");
+		if(activityDetails.containsKey("offlineInstructions"))
+			this.offlineInstructions= (String) activityDetails.get("offlineInstructions");
+		if(activityDetails.containsKey("onlineInstructions"))
+			this.onlineInstructions =(String) activityDetails.get("onlineInstructions");
+		if(activityDetails.containsKey("maxOptions"))
+			this.maxOptions = convertToInteger(activityDetails.get("maxOptions"));
+		if(activityDetails.containsKey("minOptions"))
+			this.minOptions = convertToInteger(activityDetails.get("minOptions"));
+		if(activityDetails.containsKey("optionsInstructions"))
+			this.optionsInstructions =(String)activityDetails.get("optionsInstructions");
+		if(activityDetails.containsKey("toolID"))
+			this.toolID =convertToLong(activityDetails.get("toolID"));
+		if(activityDetails.containsKey("toolContentID"))
+			this.toolContentID = convertToLong(activityDetails.get("toolContentID"));
+		if(activityDetails.containsKey("activityCategoryID"))
+			this. activityCategoryID = convertToInteger(activityDetails.get("activityCategoryID"));
+		
+		if(activityDetails.containsKey("gateActivityLevelID"))
+			this.gateActivityLevelID = convertToInteger(activityDetails.get("gateActivityLevelID"));
+		if(activityDetails.containsKey("gateOpen"))
+			this.gateOpen = (Boolean)activityDetails.get("gateOpen");
+		if(activityDetails.containsKey("gateEndTimeOffset"))
+			this.gateEndTimeOffset = convertToLong(activityDetails.get("gateEndTimeOffset"));
+		if(activityDetails.containsKey("gateStartTimeOffset"))
+			this.gateStartTimeOffset = convertToLong(activityDetails.get("gateStartTimeOffset"));
+		if(activityDetails.containsKey("gateEndDateTime"))
+			this.gateEndDateTime = (Date)activityDetails.get("gateEndDateTime");
+		if(activityDetails.containsKey("gateStartDateTime"))
+			this.gateStartDateTime = (Date)activityDetails.get("gateStartDateTime");
+		
+		if(activityDetails.containsKey("libraryActivityUiImage"))
+			this.libraryActivityUiImage=(String)activityDetails.get("libraryActivityUiImage");
+		if(activityDetails.containsKey("createGroupingID"))
+			this.createGroupingID= convertToLong(activityDetails.get("createGroupingID"));
+		if(activityDetails.containsKey("createGroupingUIID"))
+			this.createGroupingUIID=convertToInteger(activityDetails.get("createGroupingUIID"));
+		if(activityDetails.containsKey("libraryActivityID"))
+			this.libraryActivityID=convertToLong(activityDetails.get("libraryActivityID"));
+		if(activityDetails.containsKey("applyGrouping"))
+			this.applyGrouping=(Boolean)activityDetails.get("applyGrouping");
+		if(activityDetails.containsKey("groupingSupportType"))
+			this.groupingSupportType=convertToInteger(activityDetails.get("groupingSupportType"));
+		if(activityDetails.containsKey("groupingType"))
+			this.groupingType=convertToInteger(activityDetails.get("groupingType"));
+		if(activityDetails.containsKey("groupingDTO")){
+			Hashtable groupingDetails = (Hashtable) activityDetails.get("groupingDTO");			
+			this.groupingDTO = new GroupingDTO(groupingDetails);
+		}
+	}
+	private  void processActivityType(Object activity){
+		if(activity instanceof GroupingActivity)
+			 addGroupingActivityAttributes((GroupingActivity)activity);
+		else if(activity instanceof ToolActivity)
+			 addToolActivityAttributes((ToolActivity)activity);
+		else if(activity instanceof GateActivity)
+			 addGateActivityAttributes(activity);
+		else 			
+			 addComplexActivityAttributes(activity);		
+	}
+	private void addComplexActivityAttributes(Object activity){		
+		if(activity instanceof OptionsActivity)
+			addOptionsActivityAttributes((OptionsActivity)activity);
+		else if (activity instanceof ParallelActivity)
+			addParallelActivityAttributes((ParallelActivity)activity);
+		else
+			addSequenceActivityAttributes((SequenceActivity)activity);
+		
+	}
+	private void addGroupingActivityAttributes(GroupingActivity groupingActivity){
+		Grouping grouping = groupingActivity.getCreateGrouping();
+		
+		this.groupingDTO = grouping.getGroupingDTO();
+		this.createGroupingID = grouping.getGroupingId();
+		this.createGroupingUIID = grouping.getGroupingUIID();
+		this.groupingType = grouping.getGroupingTypeId();
+	}
+	private void addOptionsActivityAttributes(OptionsActivity optionsActivity){
+		this.maxOptions = optionsActivity.getMaxNumberOfOptions();
+		this.minOptions = optionsActivity.getMinNumberOfOptions();
+		this.optionsInstructions = optionsActivity.getOptionsInstructions();		
+	}
+	private void addParallelActivityAttributes(ParallelActivity activity){		
+	}
+	private void addSequenceActivityAttributes(SequenceActivity activity){
+		
+	}
+	private void addToolActivityAttributes(ToolActivity toolActivity){
+		this.toolContentID = toolActivity.getToolContentId();
+		this.toolID = toolActivity.getTool().getToolId();													 
+	}
+	private void addGateActivityAttributes(Object activity){
+		if(activity instanceof SynchGateActivity)
+			addSynchGateActivityAttributes((SynchGateActivity)activity);
+		else if (activity instanceof PermissionGateActivity)
+			addPermissionGateActivityAttributes((PermissionGateActivity)activity);
+		else
+			addScheduleGateActivityAttributes((ScheduleGateActivity)activity);
+		GateActivity gateActivity = (GateActivity)activity ;
+		this.gateActivityLevelID = gateActivity.getGateActivityLevelId();
+		this.gateOpen = gateActivity.getGateOpen();
+				
+	}
+	private void addSynchGateActivityAttributes(SynchGateActivity activity){	
+	}
+	private void addPermissionGateActivityAttributes(PermissionGateActivity activity){		
+	}
+	private void addScheduleGateActivityAttributes(ScheduleGateActivity activity){
+		this.gateStartDateTime = activity.getGateStartDateTime();
+		this.gateStartTimeOffset = activity.getGateStartTimeOffset();
+		this.gateEndDateTime = activity.getGateEndDateTime();
+		this.gateEndTimeOffset = activity.getGateEndTimeOffset();		
+	}
 	
 	/*****************************************************************************
 	 * Getters
@@ -264,8 +483,8 @@
 	/**
 	 * @return Returns the gateEndTimeOffset.
 	 */
-	public Date getGateEndTimeOffset() {
-		return gateEndTimeOffset!=null?gateEndTimeOffset:WDDXTAGS.DATE_NULL_VALUE;
+	public Long getGateEndTimeOffset() {
+		return gateEndTimeOffset!=null?gateEndTimeOffset:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
 	}
 	/**
 	 * @return Returns the gateOpen.
@@ -277,13 +496,13 @@
 	 * @return Returns the gateStartDateTime.
 	 */
 	public Date getGateStartDateTime() {
-		return gateStartDateTime!=null?gateStartTimeOffset:WDDXTAGS.DATE_NULL_VALUE;
+		return gateStartDateTime!=null?gateStartDateTime:WDDXTAGS.DATE_NULL_VALUE;
 	}
 	/**
 	 * @return Returns the gateStartTimeOffset.
 	 */
-	public Date getGateStartTimeOffset() {
-		return gateStartTimeOffset!=null?gateStartTimeOffset:WDDXTAGS.DATE_NULL_VALUE;
+	public Long getGateStartTimeOffset() {
+		return gateStartTimeOffset!=null?gateStartTimeOffset:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
 	}
 	/**
 	 * @return Returns the groupingID.
@@ -404,30 +623,313 @@
 	 */
 	public Integer getYcoord() {
 		return ycoord!=null?ycoord:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}	
+	/*************************************************
+	 * Setters
+	 ************************************************/
+	/**
+	 * @param activityCategoryID The activityCategoryID to set.
+	 */
+	public void setActivityCategoryID(Integer activityCategoryID) {
+		if(!activityCategoryID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.activityCategoryID = activityCategoryID;
 	}
-	/*****************************************************************************
-	 * Utility Methods
-	 **************************************************************************/
-	 
-	private  void processActivityType(Object activity){		
-		String className = activity.getClass().getName();
-		if(activity instanceof GroupingActivity)
-			buildGroupingActivityObject(activity);
-	/*	else if(activity instanceof ToolActivity)
-			//buildToolActivity(activities,(ToolActivity)activity);
-		else if(activity instanceof GateActivity)
-			//buildGateActivityObject(activities,activity);
-		else 			
-			buildComplexActivityObject(activities,activity);*/		
+	/**
+	 * @param activityId The activityId to set.
+	 */
+	public void setActivityId(Long activityId) {
+		if(!activityId.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.activityId = activityId;
 	}
-	private  void buildGroupingActivityObject(Object activity){
-		
-		GroupingActivity groupingActivity = (GroupingActivity)activity;
-		this.createGroupingID = groupingActivity.getCreateGrouping()!=null?
-								groupingActivity.getCreateGrouping().getGroupingId():
-								WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
-		this.createGroupingUIID = groupingActivity.getCreateGrouping()!=null?
-								  groupingActivity.getCreateGrouping().getGroupingUIID():
-								  WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	/**
+	 * @param activityTypeId The activityTypeId to set.
+	 */
+	public void setActivityTypeId(Integer activityTypeId) {
+		if(!activityTypeId.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.activityTypeId = activityTypeId;
 	}
+	/**
+	 * @param activityUIID The activityUIID to set.
+	 */
+	public void setActivityUIID(Integer activityUIID) {
+		if(!activityUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.activityUIID = activityUIID;
+	}
+	/**
+	 * @param createDateTime The createDateTime to set.
+	 */
+	public void setCreateDateTime(Date createDateTime) {
+		if(!createDateTime.equals(WDDXTAGS.DATE_NULL_VALUE))
+			this.createDateTime = createDateTime;
+	}
+	/**
+	 * @param createGroupingID The createGroupingID to set.
+	 */
+	public void setCreateGroupingID(Long createGroupingID) {
+		if(!createGroupingID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.createGroupingID = createGroupingID;
+	}
+	/**
+	 * @param createGroupingUIID The createGroupingUIID to set.
+	 */
+	public void setCreateGroupingUIID(Integer createGroupingUIID) {
+		if(!createGroupingUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.createGroupingUIID = createGroupingUIID;
+	}
+	/**
+	 * @param defineLater The defineLater to set.
+	 */
+	public void setDefineLater(Boolean defineLater) {		
+		this.defineLater = defineLater;
+	}
+	/**
+	 * @param description The description to set.
+	 */
+	public void setDescription(String description) {
+		if(!description.equals(WDDXTAGS.STRING_NULL_VALUE))
+			this.description = description;
+	}
+	/**
+	 * @param gateActivityLevelID The gateActivityLevelID to set.
+	 */
+	public void setGateActivityLevelID(Integer gateActivityLevelID) {
+		if(!gateActivityLevelID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.gateActivityLevelID = gateActivityLevelID;
+	}
+	/**
+	 * @param gateEndDateTime The gateEndDateTime to set.
+	 */
+	public void setGateEndDateTime(Date gateEndDateTime) {
+		if(!gateEndDateTime.equals(WDDXTAGS.DATE_NULL_VALUE))
+			this.gateEndDateTime = gateEndDateTime;
+	}
+	/**
+	 * @param gateEndTimeOffset The gateEndTimeOffset to set.
+	 */
+	public void setGateEndTimeOffset(Long gateEndTimeOffset) {
+		if(!gateEndTimeOffset.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.gateEndTimeOffset = gateEndTimeOffset;
+	}
+	/**
+	 * @param gateOpen The gateOpen to set.
+	 */
+	public void setGateOpen(Boolean gateOpen) {
+		this.gateOpen = gateOpen;
+	}
+	/**
+	 * @param gateStartDateTime The gateStartDateTime to set.
+	 */
+	public void setGateStartDateTime(Date gateStartDateTime) {
+		if(!gateStartDateTime.equals(WDDXTAGS.DATE_NULL_VALUE))
+			this.gateStartDateTime = gateStartDateTime;
+	}
+	/**
+	 * @param gateStartTimeOffset The gateStartTimeOffset to set.
+	 */
+	public void setGateStartTimeOffset(Long gateStartTimeOffset) {
+		if(!gateStartTimeOffset.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.gateStartTimeOffset = gateStartTimeOffset;
+	}
+	/**
+	 * @param groupingID The groupingID to set.
+	 */
+	public void setGroupingID(Long groupingID) {
+		if(!groupingID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.groupingID = groupingID;
+	}
+	/**
+	 * @param groupingUIID The groupingUIID to set.
+	 */
+	public void setGroupingUIID(Integer groupingUIID) {
+		if(!groupingUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.groupingUIID = groupingUIID;
+	}
+	/**
+	 * @param helpText The helpText to set.
+	 */
+	public void setHelpText(String helpText) {
+		if(!helpText.equals(WDDXTAGS.STRING_NULL_VALUE))
+			this.helpText = helpText;
+	}
+	/**
+	 * @param learningDesignID The learningDesignID to set.
+	 */
+	public void setLearningDesignID(Long learningDesignID) {
+		if(!learningDesignID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.learningDesignID = learningDesignID;
+	}
+	/**
+	 * @param learningLibraryID The learningLibraryID to set.
+	 */
+	public void setLearningLibraryID(Long learningLibraryID) {
+		if(!learningLibraryID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.learningLibraryID = learningLibraryID;
+	}
+	/**
+	 * @param libraryActivityID The libraryActivityID to set.
+	 */
+	public void setLibraryActivityID(Long libraryActivityID) {
+		if(!libraryActivityID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.libraryActivityID = libraryActivityID;
+	}
+	/**
+	 * @param libraryActivityUiImage The libraryActivityUiImage to set.
+	 */
+	public void setLibraryActivityUiImage(String libraryActivityUiImage) {
+		if(!libraryActivityUiImage.equals(WDDXTAGS.STRING_NULL_VALUE))
+			this.libraryActivityUiImage = libraryActivityUiImage;
+	}
+	/**
+	 * @param maxOptions The maxOptions to set.
+	 */
+	public void setMaxOptions(Integer maxOptions) {
+		if(!maxOptions.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.maxOptions = maxOptions;
+	}
+	/**
+	 * @param minOptions The minOptions to set.
+	 */
+	public void setMinOptions(Integer minOptions) {
+		if(!minOptions.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.minOptions = minOptions;
+	}
+	/**
+	 * @param offlineInstructions The offlineInstructions to set.
+	 */
+	public void setOfflineInstructions(String offlineInstructions) {
+		if(!offlineInstructions.equals(WDDXTAGS.STRING_NULL_VALUE))
+			this.offlineInstructions = offlineInstructions;
+	}
+	/**
+	 * @param optionsInstructions The optionsInstructions to set.
+	 */
+	public void setOptionsInstructions(String optionsInstructions) {
+		if(!optionsInstructions.equals(WDDXTAGS.STRING_NULL_VALUE))
+			this.optionsInstructions = optionsInstructions;
+	}
+	/**
+	 * @param orderID The orderID to set.
+	 */
+	public void setOrderID(Integer orderID) {
+		if(!orderID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.orderID = orderID;
+	}
+	/**
+	 * @param parentActivityID The parentActivityID to set.
+	 */
+	public void setParentActivityID(Long parentActivityID) {
+		if(!parentActivityID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.parentActivityID = parentActivityID;
+	}
+	/**
+	 * @param parentUIID The parentUIID to set.
+	 */
+	public void setParentUIID(Integer parentUIID) {
+		if(!parentUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.parentUIID = parentUIID;
+	}
+	/**
+	 * @param runOffline The runOffline to set.
+	 */
+	public void setRunOffline(Boolean runOffline) {
+		this.runOffline = runOffline;
+	}
+	/**
+	 * @param title The title to set.
+	 */
+	public void setTitle(String title) {
+		if(!title.equals(WDDXTAGS.STRING_NULL_VALUE))
+			this.title = title;
+	}
+	/**
+	 * @param toolContentID The toolContentID to set.
+	 */
+	public void setToolContentID(Long toolContentID) {
+		if(!toolContentID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.toolContentID = toolContentID;
+	}
+	/**
+	 * @param toolID The toolID to set.
+	 */
+	public void setToolID(Long toolID) {
+		if(!toolID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.toolID = toolID;
+	}
+	/**
+	 * @param xcoord The xcoord to set.
+	 */
+	public void setXcoord(Integer xcoord) {
+		if(!xcoord.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.xcoord = xcoord;
+	}
+	/**
+	 * @param ycoord The ycoord to set.
+	 */
+	public void setYcoord(Integer ycoord) {
+		if(!xcoord.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.ycoord = ycoord;
+	}	
+	/**
+	 * @return Returns the onlineInstructions.
+	 */
+	public String getOnlineInstructions() {
+		return onlineInstructions!=null?onlineInstructions:WDDXTAGS.STRING_NULL_VALUE;
+	}
+	/**
+	 * @param onlineInstructions The onlineInstructions to set.
+	 */
+	public void setOnlineInstructions(String onlineInstructions) {
+		if(!onlineInstructions.equals(WDDXTAGS.STRING_NULL_VALUE))
+			this.onlineInstructions = onlineInstructions;
+	}
+	/**
+	 * @return Returns the applyGrouping.
+	 */
+	public Boolean getApplyGrouping() {
+		return applyGrouping!=null?applyGrouping:WDDXTAGS.BOOLEAN_NULL_VALUE;
+	}
+	/**
+	 * @param applyGrouping The applyGrouping to set.
+	 */
+	public void setApplyGrouping(Boolean applyGrouping) {
+		this.applyGrouping = applyGrouping;
+	}
+	/**
+	 * @return Returns the groupingSupportType.
+	 */
+	public Integer getGroupingSupportType() {
+		return groupingSupportType!=null?groupingSupportType:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @param groupingSupportType The groupingSupportType to set.
+	 */
+	public void setGroupingSupportType(Integer groupingSupportType) {
+		if(!groupingSupportType.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.groupingSupportType = groupingSupportType;
+	}
+	/**
+	 * @return Returns the groupingType.
+	 */
+	public Integer getGroupingType() {
+		return groupingType!=null?groupingType:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @param groupingType The groupingType to set.
+	 */
+	public void setGroupingType(Integer groupingType) {
+		if(!groupingType.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.groupingType = groupingType;
+	}
+	/**
+	 * @return Returns the groupingDTO.
+	 */
+	public GroupingDTO getGroupingDTO() {
+		return groupingDTO;
+	}
+	/**
+	 * @param groupingDTO The groupingDTO to set.
+	 */
+	public void setGroupingDTO(GroupingDTO groupingDTO) {
+		this.groupingDTO = groupingDTO;
+	}	
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/BaseDTO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/BaseDTO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/BaseDTO.java	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -0,0 +1,35 @@
+/*
+ * Created on Apr 8, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.learningdesign.dto;
+
+import org.lamsfoundation.lams.util.wddx.WDDXTAGS;
+
+/**
+ * @author Minhas
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class BaseDTO {
+	
+	public Integer convertToInteger(Object ob){
+		Double doub = (Double)ob;
+		Integer integer = new Integer(doub.intValue());
+		if(!integer.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			return integer;
+		else
+			return null;
+	}
+	public Long convertToLong(Object ob){
+		Double doub = (Double)ob;
+		Long longValue = new Long(doub.longValue());
+		if(!longValue.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			return longValue;
+		else
+			return null;
+	}
+}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/DesignDetailDTO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/DesignDetailDTO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/DesignDetailDTO.java	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -0,0 +1,165 @@
+/*
+ * Created on Apr 11, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.learningdesign.dto;
+
+import java.util.Date;
+
+import org.lamsfoundation.lams.learningdesign.LearningDesign;
+import org.lamsfoundation.lams.util.wddx.WDDXTAGS;
+
+/**
+ * @author Minhas
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class DesignDetailDTO extends BaseDTO {
+	
+	private Long learningDesignId;
+	private Integer learningDesignUIID;
+	private String description;
+	private String title;	
+	private Long firstActivityID;		
+	private Boolean validDesign;
+	private Boolean readOnly;	
+	private Date dateReadOnly;
+	private Integer userID;
+	private String helpText;
+	private Integer copyTypeID;	
+	private String version;	
+	private Long parentLearningDesignID;
+	private Integer workspaceFolderID;
+	
+	public DesignDetailDTO(){
+		
+	}
+	public DesignDetailDTO(Long learningDesignId, Integer learningDesignUIID,
+			String description, String title, Long firstActivityID,
+			Boolean validDesign, Boolean readOnly,
+			Date dateReadOnly, Integer userID, String helpText,
+			Integer copyTypeID, String version, Long parentLearningDesignID,
+			Integer workspaceFolderID) {		
+		this.learningDesignId = learningDesignId;
+		this.learningDesignUIID = learningDesignUIID;
+		this.description = description;
+		this.title = title;
+		this.firstActivityID = firstActivityID;		
+		this.validDesign = validDesign;
+		this.readOnly = readOnly;
+		this.dateReadOnly = dateReadOnly;
+		this.userID = userID;
+		this.helpText = helpText;
+		this.copyTypeID = copyTypeID;
+		this.version = version;
+		this.parentLearningDesignID = parentLearningDesignID;
+		this.workspaceFolderID = workspaceFolderID;
+	}
+	public DesignDetailDTO(LearningDesign learningDesign){
+		this.learningDesignId = learningDesign.getLearningDesignId();
+		this.learningDesignUIID = learningDesign.getLearningDesignUIID();
+		this.description = learningDesign.getDescription();
+		this.title = learningDesign.getTitle();		
+		this.firstActivityID = learningDesign.getFirstActivity()!=null?
+							   learningDesign.getFirstActivity().getActivityId():
+							   WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+		this.validDesign = learningDesign.getValidDesign();
+		this.readOnly = learningDesign.getReadOnly();
+		this.dateReadOnly = learningDesign.getDateReadOnly();
+		this.userID = learningDesign.getUser().getUserId();
+		this.helpText = learningDesign.getHelpText();
+		this.copyTypeID = learningDesign.getCopyTypeID();
+		this.version = learningDesign.getVersion();
+		this.parentLearningDesignID = learningDesign.getParentLearningDesign()!=null?
+									  learningDesign.getParentLearningDesign().getLearningDesignId():
+									  WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+		this.workspaceFolderID = learningDesign.getWorkspaceFolder().getWorkspaceFolderId();
+	}
+	/**
+	 * @return Returns the copyTypeID.
+	 */
+	public Integer getCopyTypeID() {
+		return copyTypeID!=null?copyTypeID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @return Returns the dateReadOnly.
+	 */
+	public Date getDateReadOnly() {
+		return dateReadOnly!=null?dateReadOnly:WDDXTAGS.DATE_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the description.
+	 */
+	public String getDescription() {
+		return description!=null?description:WDDXTAGS.STRING_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the firstActivityID.
+	 */
+	public Long getFirstActivityID() {
+		return firstActivityID!=null?firstActivityID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+	}
+	/**
+	 * @return Returns the helpText.
+	 */
+	public String getHelpText() {
+		return helpText!=null?helpText:WDDXTAGS.STRING_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the learningDesignId.
+	 */
+	public Long getLearningDesignId() {
+		return learningDesignId!=null?learningDesignId:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+	}
+	/**
+	 * @return Returns the learningDesignUIID.
+	 */
+	public Integer getLearningDesignUIID() {
+		return learningDesignUIID!=null?learningDesignUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @return Returns the parentLearningDesignID.
+	 */
+	public Long getParentLearningDesignID() {
+		return parentLearningDesignID!=null?parentLearningDesignID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+	}
+	/**
+	 * @return Returns the readOnly.
+	 */
+	public Boolean getReadOnly() {
+		return readOnly!=null?readOnly:WDDXTAGS.BOOLEAN_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the title.
+	 */
+	public String getTitle() {
+		return title!=null?title:WDDXTAGS.STRING_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the userID.
+	 */
+	public Integer getUserID() {
+		return userID!=null?userID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @return Returns the validDesign.
+	 */
+	public Boolean getValidDesign() {
+		return validDesign!=null?validDesign:WDDXTAGS.BOOLEAN_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the version.
+	 */
+	public String getVersion() {
+		return version!=null?version:WDDXTAGS.STRING_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the workspaceFolderID.
+	 */
+	public Integer getWorkspaceFolderID() {
+		return workspaceFolderID!=null?workspaceFolderID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -0,0 +1,181 @@
+/*
+ * Created on Apr 7, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.learningdesign.dto;
+
+import java.util.Hashtable;
+
+import org.lamsfoundation.lams.learningdesign.ChosenGrouping;
+import org.lamsfoundation.lams.learningdesign.Grouping;
+import org.lamsfoundation.lams.learningdesign.RandomGrouping;
+import org.lamsfoundation.lams.lesson.LessonClass;
+import org.lamsfoundation.lams.util.wddx.WDDXTAGS;
+
+/**
+ * @author Minhas
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class GroupingDTO extends BaseDTO{
+	
+	private Long groupingID;
+	private Integer groupingUIID;
+	private Integer groupingType;
+	private Integer numberOfGroups;
+	private Integer learnersPerGroup;
+	private Long staffGroupID;
+	private Integer maxNumberOfGroups;
+	
+	
+
+	public GroupingDTO(Long groupingID, Integer groupingUIID,
+			Integer groupingType, Integer numberOfGroups,
+			Integer learnersPerGroup, Long staffGroupID,
+			Integer maxNumberOfGroups) {		
+		this.groupingID = groupingID;
+		this.groupingUIID = groupingUIID;
+		this.groupingType = groupingType;
+		this.numberOfGroups = numberOfGroups;
+		this.learnersPerGroup = learnersPerGroup;
+		this.staffGroupID = staffGroupID;
+		this.maxNumberOfGroups = maxNumberOfGroups;
+	}
+	public GroupingDTO(Grouping grouping){
+		this.groupingID = grouping.getGroupingId();
+		this.groupingUIID = grouping.getGroupingUIID();
+		this.maxNumberOfGroups = grouping.getMaxNumberOfGroups();		
+		this.groupingType = grouping.getGroupingTypeId();
+		Object object = Grouping.getGroupingInstance(groupingType);
+		processGroupingActivity(object);
+	}
+	public GroupingDTO(Hashtable groupingDetails){
+		if(groupingDetails.containsKey("groupingID"))
+			this.groupingID =convertToLong(groupingDetails.get("groupingID"));
+		if(groupingDetails.containsKey("groupingUIID"))
+			this.groupingUIID =convertToInteger(groupingDetails.get("groupingUIID"));
+		if(groupingDetails.containsKey("maxNumberOfGroups"))
+			this.maxNumberOfGroups =convertToInteger(groupingDetails.get("maxNumberOfGroups"));
+		if(groupingDetails.containsKey("groupingType"))
+			this.groupingType =convertToInteger(groupingDetails.get("groupingType"));		
+		if(groupingDetails.containsKey("staffGroupID"))
+				this.staffGroupID =convertToLong(groupingDetails.get("staffGroupID"));
+		if(groupingDetails.containsKey("numberOfGroups"))
+				this.numberOfGroups =convertToInteger(groupingDetails.get("numberOfGroups"));
+		if(groupingDetails.containsKey("learnersPerGroup"))
+				this.learnersPerGroup =convertToInteger(groupingDetails.get("learnersPerGroup"));
+		
+	}
+	public void processGroupingActivity(Object object){
+		if(object instanceof RandomGrouping)
+			addRandomGroupingAttributes((RandomGrouping)object);
+		else if (object instanceof ChosenGrouping)
+			addChosenGroupingAttributes((ChosenGrouping)object);
+		else
+			addLessonClassAttributes((LessonClass)object);
+	}
+	private void addRandomGroupingAttributes(RandomGrouping grouping){
+		this.learnersPerGroup = grouping.getLearnersPerGroup();
+		this.numberOfGroups = grouping.getNumberOfGroups();		
+	}
+	private void addChosenGroupingAttributes(ChosenGrouping grouping){
+		
+	}
+	private void addLessonClassAttributes(LessonClass grouping){
+		this.staffGroupID = grouping.getStaffGroup().getGroupId();
+	}
+	/**
+	 * @return Returns the groupingID.
+	 */
+	public Long getGroupingID() {
+		return groupingID!=null?groupingID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+	}
+	/**
+	 * @param groupingID The groupingID to set.
+	 */
+	public void setGroupingID(Long groupingID) {
+		if(!groupingID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.groupingID = groupingID;
+	}
+	/**
+	 * @return Returns the groupingType.
+	 */
+	public Integer getGroupingType() {
+		return groupingType!=null?groupingType:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @param groupingType The groupingType to set.
+	 */
+	public void setGroupingType(Integer groupingType) {
+		if(!groupingType.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.groupingType = groupingType;
+	}
+	/**
+	 * @return Returns the groupingUIID.
+	 */
+	public Integer getGroupingUIID() {
+		return groupingUIID!=null?groupingUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @param groupingUIID The groupingUIID to set.
+	 */
+	public void setGroupingUIID(Integer groupingUIID) {
+		if(!groupingUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.groupingUIID = groupingUIID;
+	}
+	/**
+	 * @return Returns the learnersPerGroup.
+	 */
+	public Integer getLearnersPerGroup() {
+		return learnersPerGroup!=null?learnersPerGroup:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @param learnersPerGroup The learnersPerGroup to set.
+	 */
+	public void setLearnersPerGroup(Integer learnersPerGroup) {
+		if(!learnersPerGroup.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.learnersPerGroup = learnersPerGroup;
+	}
+	/**
+	 * @return Returns the maxNumberOfGroups.
+	 */
+	public Integer getMaxNumberOfGroups() {
+		return maxNumberOfGroups!=null?maxNumberOfGroups:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @param maxNumberOfGroups The maxNumberOfGroups to set.
+	 */
+	public void setMaxNumberOfGroups(Integer maxNumberOfGroups) {
+		if(!maxNumberOfGroups.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.maxNumberOfGroups = maxNumberOfGroups;
+	}
+	/**
+	 * @return Returns the numberOfGroups.
+	 */
+	public Integer getNumberOfGroups() {
+		return numberOfGroups!=null?numberOfGroups:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @param numberOfGroups The numberOfGroups to set.
+	 */
+	public void setNumberOfGroups(Integer numberOfGroups) {
+		if(!numberOfGroups.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.numberOfGroups = numberOfGroups;
+	}
+	/**
+	 * @return Returns the staffGroupID.
+	 */
+	public Long getStaffGroupID() {
+		return staffGroupID!=null?staffGroupID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+	}
+	/**
+	 * @param staffGroupID The staffGroupID to set.
+	 */
+	public void setStaffGroupID(Long staffGroupID) {
+		if(!staffGroupID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.staffGroupID = staffGroupID;
+	}
+}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
===================================================================
diff -u -rafbd2486f479295afe9a177d7bd3f9dcb71927a8 -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java	(.../LearningDesignDTO.java)	(revision afbd2486f479295afe9a177d7bd3f9dcb71927a8)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java	(.../LearningDesignDTO.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -6,9 +6,14 @@
  */
 package org.lamsfoundation.lams.learningdesign.dto;
 
-import java.util.Date;
 
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.Iterator;
+import org.lamsfoundation.lams.learningdesign.Activity;
+import org.lamsfoundation.lams.learningdesign.ComplexActivity;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
+import org.lamsfoundation.lams.learningdesign.Transition;
 import org.lamsfoundation.lams.util.wddx.WDDXTAGS;
 
 /**
@@ -24,6 +29,7 @@
 	private String description;
 	private String title;	
 	private Long firstActivityID;
+	private Integer firstActivityUIID;
 	private Integer maxID;	
 	private Boolean validDesign;
 	private Boolean readOnly;	
@@ -45,49 +51,44 @@
 	private Date lessonStartDateTime;
 	private Date lastModifiedDateTime;
 	
-	/**
-	 * @param learningDesignId
-	 * @param learningDesignUIID
-	 * @param description
-	 * @param title
-	 * @param firstActivityID
-	 * @param maxID
-	 * @param validDesign
-	 * @param readOnly
-	 * @param dateReadOnly
-	 * @param userID
-	 * @param helpText
-	 * @param copyTypeID
-	 * @param createDateTime
-	 * @param version
-	 * @param parentLearningDesignID
-	 * @param workspaceFolderID
-	 * @param duration
-	 * @param licenseText
-	 * @param licenseID
-	 * @param lessonOrgID
-	 * @param lessonOrgName
-	 * @param lessonID
-	 * @param lessonName
-	 * @param lessonStartDateTime
-	 * @param lastModifiedDateTime
-	 */
-	public LearningDesignDTO(Long learningDesignId, Integer learningDesignUIID,
-			String description, String title, Long firstActivityID,
-			Integer maxId, Boolean validDesign, Boolean readOnly,
-			Date dateReadOnly, Integer userID, String helpText,
-			Integer copyTypeID, Date createDateTime, String version,
-			Long parentLearningDesignID, Integer workspaceFolderID,
-			Long duration, String licenseText, Long licenseID,
-			Long lessonOrgID, String lessonOrgName, Long lessonID,
-			String lessonName, Date lessonStartDateTime,
-			Date lastModifiedDateTime) {
+	private Hashtable activities;
+	private Hashtable transitions;
+	
+	public LearningDesignDTO(){		
+	}
+	public LearningDesignDTO(Long learningDesignId,
+							 Integer learningDesignUIID,
+							 String description,
+							 String title,
+							 Long firstActivityID,
+							 Integer firstActivityUIID,
+							 Integer maxId,
+							 Boolean validDesign, 
+							 Boolean readOnly,
+							 Date dateReadOnly,
+							 Integer userID,
+							 String helpText,
+							 Integer copyTypeID,
+							 Date createDateTime,
+							 String version,
+							 Long parentLearningDesignID,
+							 Integer workspaceFolderID,
+							 Long duration, 
+							 String licenseText,
+							 Long licenseID,
+							 Long lessonOrgID,
+							 String lessonOrgName,
+							 Long lessonID,
+							 String lessonName, 
+							 Date lessonStartDateTime,
+							 Date lastModifiedDateTime) {
 		super();
 		this.learningDesignId = learningDesignId;
 		this.learningDesignUIID = learningDesignUIID;
 		this.description = description;
 		this.title = title;
 		this.firstActivityID = firstActivityID;
+		this.firstActivityUIID = firstActivityUIID;
 		this.maxID = maxId;
 		this.validDesign = validDesign;
 		this.readOnly = readOnly;
@@ -108,10 +109,9 @@
 		this.lessonName = lessonName;
 		this.lessonStartDateTime = lessonStartDateTime;
 		this.lastModifiedDateTime = lastModifiedDateTime;
-	}
-	public LearningDesignDTO(){	
-		
-	}
+		this.activities = new Hashtable();
+		this.transitions = new Hashtable();
+	}	
 	public LearningDesignDTO(LearningDesign learningDesign){
 		this.learningDesignId = learningDesign.getLearningDesignId();
 		this.learningDesignUIID = learningDesign.getLearningDesignUIID();
@@ -120,6 +120,9 @@
 		this.firstActivityID = learningDesign.getFirstActivity()!=null?
 							   learningDesign.getFirstActivity().getActivityId():
 							   WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+		this.firstActivityUIID = learningDesign.getFirstActivity()!=null?
+								 learningDesign.getFirstActivity().getActivityUIID():
+								 WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
 		this.maxID = learningDesign.getMaxId();
 		this.validDesign = learningDesign.getValidDesign();
 		this.readOnly = learningDesign.getReadOnly();
@@ -156,7 +159,9 @@
 		this.lessonName = learningDesign.getLessonName();
 		this.lessonStartDateTime = learningDesign.getLessonStartDateTime();
 		this.lastModifiedDateTime = learningDesign.getLastModifiedDateTime();
-	}
+		this.activities = populateActivities(learningDesign);
+		this.transitions = populateTransitions(learningDesign);
+	}	
 	/**
 	 * @return Returns the copyTypeID.
 	 */
@@ -307,4 +312,289 @@
 	public Integer getWorkspaceFolderID() {
 		return workspaceFolderID!=null?workspaceFolderID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
 	}	
+	public Hashtable getActivities(){
+		return activities;
+	}
+	/**
+	 * @return Returns the activities.
+	 */
+
+	public Hashtable populateActivities(LearningDesign design) {
+		Hashtable activities = new Hashtable();		
+		Hashtable childActivities = null;
+		Iterator parentIterator = design.getParentActivities().iterator();
+		while(parentIterator.hasNext()){
+			Object object = parentIterator.next();
+			
+			if(object instanceof ComplexActivity){
+				ComplexActivity complexActivity = (ComplexActivity)object;
+				Iterator childIterator = complexActivity.getActivities().iterator();
+				childActivities = new Hashtable();
+				while(childIterator.hasNext()){
+					Activity activity =(Activity)childIterator.next();
+					childActivities.put(activity.getActivityId(),activity.getAuthoringActivityDTO());					
+				}				
+				activities.put(((Activity)complexActivity).getActivityId(),((Activity)complexActivity).getAuthoringActivityDTO());
+				activities.putAll(childActivities);
+			}else{
+				Activity activity = (Activity)object;
+				activities.put(activity.getActivityId(),activity.getAuthoringActivityDTO());
+			}			
+		}
+		return activities;
+	}	
+	public Hashtable populateTransitions(LearningDesign design){
+		Hashtable transitions = new Hashtable();
+		if(design.getTransitions()!=null){
+			Iterator iterator = design.getTransitions().iterator();
+			while(iterator.hasNext()){
+				Transition trans  =(Transition) iterator.next();
+				transitions.put(trans.getTransitionId(),trans.getTransitionDTO());
+			}
+		}
+		return transitions;
+	}
+	public Hashtable getTransitions(){
+		return this.transitions;
+	}	
+	/**
+	 * @param activities The activities to set.
+	 */
+	public void setActivities(Hashtable activities) {
+		this.activities = activities;
+	}
+	/**
+	 * @param copyTypeID The copyTypeID to set.
+	 */
+	public void setCopyTypeID(Integer copyTypeID) {		
+		this.copyTypeID = copyTypeID;
+	}
+	/**
+	 * @param createDateTime The createDateTime to set.
+	 */
+	public void setCreateDateTime(Date createDateTime) {
+		if(!createDateTime.equals(WDDXTAGS.DATE_NULL_VALUE))
+			this.createDateTime = createDateTime;
+	}
+	/**
+	 * @param dateReadOnly The dateReadOnly to set.
+	 */
+	public void setDateReadOnly(Date dateReadOnly) {
+		if(!dateReadOnly.equals(WDDXTAGS.DATE_NULL_VALUE))
+			this.dateReadOnly = dateReadOnly;
+	}
+	/**
+	 * @param description The description to set.
+	 */
+	public void setDescription(String description) {
+		if(!description.equals(WDDXTAGS.STRING_NULL_VALUE))
+			this.description = description;
+	}
+	/**
+	 * @param duration The duration to set.
+	 */
+	public void setDuration(Long duration) {
+		if(!duration.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.duration = duration;
+	}
+	/**
+	 * @param firstActivityID The firstActivityID to set.
+	 */
+	public void setFirstActivityID(Long firstActivityID) {
+		if(!firstActivityID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.firstActivityID = firstActivityID;
+	}
+	/**
+	 * @param helpText The helpText to set.
+	 */
+	public void setHelpText(String helpText) {
+		if(!helpText.equals(WDDXTAGS.STRING_NULL_VALUE))
+			this.helpText = helpText;
+	}
+	/**
+	 * @param lastModifiedDateTime The lastModifiedDateTime to set.
+	 */
+	public void setLastModifiedDateTime(Date lastModifiedDateTime) {
+		if(!lastModifiedDateTime.equals(WDDXTAGS.DATE_NULL_VALUE))
+			this.lastModifiedDateTime = lastModifiedDateTime;
+	}
+	/**
+	 * @param learningDesignId The learningDesignId to set.
+	 */
+	public void setLearningDesignId(Long learningDesignId) {
+		if(!learningDesignId.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.learningDesignId = learningDesignId;
+	}
+	/**
+	 * @param learningDesignUIID The learningDesignUIID to set.
+	 */
+	public void setLearningDesignUIID(Integer learningDesignUIID) {
+		if(!learningDesignUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.learningDesignUIID = learningDesignUIID;
+	}
+	/**
+	 * @param lessonID The lessonID to set.
+	 */
+	public void setLessonID(Long lessonID) {
+		if(!lessonID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+		this.lessonID = lessonID;
+	}
+	/**
+	 * @param lessonName The lessonName to set.
+	 */
+	public void setLessonName(String lessonName) {
+		if(!lessonName.equals(WDDXTAGS.STRING_NULL_VALUE))
+			this.lessonName = lessonName;
+	}
+	/**
+	 * @param lessonOrgID The lessonOrgID to set.
+	 */
+	public void setLessonOrgID(Long lessonOrgID) {
+		if(!lessonOrgID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.lessonOrgID = lessonOrgID;
+	}
+	/**
+	 * @param lessonOrgName The lessonOrgName to set.
+	 */
+	public void setLessonOrgName(String lessonOrgName) {
+		if(!lessonOrgName.equals(WDDXTAGS.STRING_NULL_VALUE))
+			this.lessonOrgName = lessonOrgName;
+	}
+	/**
+	 * @param lessonStartDateTime The lessonStartDateTime to set.
+	 */
+	public void setLessonStartDateTime(Date lessonStartDateTime) {
+		if(!lessonStartDateTime.equals(WDDXTAGS.DATE_NULL_VALUE))
+			this.lessonStartDateTime = lessonStartDateTime;
+	}
+	/**
+	 * @param licenseID The licenseID to set.
+	 */
+	public void setLicenseID(Long licenseID) {
+		if(!licenseID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.licenseID = licenseID;
+	}
+	/**
+	 * @param licenseText The licenseText to set.
+	 */
+	public void setLicenseText(String licenseText) {
+		if(!licenseText.equals(WDDXTAGS.STRING_NULL_VALUE))
+			this.licenseText = licenseText;
+	}
+	/**
+	 * @param maxID The maxID to set.
+	 */
+	public void setMaxID(Integer maxID) {
+		if(!maxID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.maxID = maxID;
+	}
+	/**
+	 * @param parentLearningDesignID The parentLearningDesignID to set.
+	 */
+	public void setParentLearningDesignID(Long parentLearningDesignID) {
+		if(!parentLearningDesignID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.parentLearningDesignID = parentLearningDesignID;
+	}
+	/**
+	 * @param readOnly The readOnly to set.
+	 */
+	public void setReadOnly(Boolean readOnly) {
+		this.readOnly = readOnly;
+	}
+	/**
+	 * @param title The title to set.
+	 */
+	public void setTitle(String title) {
+		if(!title.equals(WDDXTAGS.STRING_NULL_VALUE))
+			this.title = title;
+	}
+	/**
+	 * @param transitions The transitions to set.
+	 */
+	public void setTransitions(Hashtable transitions) {
+		this.transitions = transitions;
+	}
+	/**
+	 * @param userID The userID to set.
+	 */
+	public void setUserID(Integer userID) {
+		if(!userID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.userID = userID;
+	}
+	/**
+	 * @param validDesign The validDesign to set.
+	 */
+	public void setValidDesign(Boolean validDesign) {
+		this.validDesign = validDesign;
+	}
+	/**
+	 * @param version The version to set.
+	 */
+	public void setVersion(String version) {
+		if(!version.equals(WDDXTAGS.STRING_NULL_VALUE))
+			this.version = version;
+	}
+	/**
+	 * @param workspaceFolderID The workspaceFolderID to set.
+	 */
+	public void setWorkspaceFolderID(Integer workspaceFolderID) {
+		if(!workspaceFolderID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.workspaceFolderID = workspaceFolderID;
+	}
+	/**
+	 * @return Returns the firstActivityUIID.
+	 */
+	public Integer getFirstActivityUIID() {		
+		return firstActivityUIID!=null?firstActivityUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @param firstActivityUIID The firstActivityUIID to set.
+	 */
+	public void setFirstActivityUIID(Integer firstActivityUIID) {
+		if(!firstActivityUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.firstActivityUIID = firstActivityUIID;
+	}	
+	public static LearningDesign extractLearningDesign(LearningDesignDTO learningDesignDTO){
+		LearningDesign learningDesign = new LearningDesign();
+		if(!learningDesignDTO.getLearningDesignUIID().equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			learningDesign.setLearningDesignUIID(learningDesignDTO.getLearningDesignUIID());
+		if(!learningDesignDTO.getDescription().equals(WDDXTAGS.STRING_NULL_VALUE))
+			learningDesign.setDescription(learningDesignDTO.getDescription());
+		if(!learningDesignDTO.getTitle().equals(WDDXTAGS.STRING_NULL_VALUE))
+			learningDesign.setTitle(learningDesignDTO.getTitle());
+		if(!learningDesignDTO.getMaxID().equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			learningDesign.setMaxId(learningDesignDTO.getMaxID());
+		
+		learningDesign.setValidDesign(learningDesignDTO.getValidDesign());
+		learningDesign.setReadOnly(learningDesignDTO.getReadOnly());
+			
+		if(!learningDesignDTO.getCopyTypeID().equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			learningDesign.setCopyTypeID(learningDesignDTO.getCopyTypeID());		
+		if(!learningDesignDTO.getHelpText().equals(WDDXTAGS.STRING_NULL_VALUE))
+			learningDesign.setHelpText(learningDesignDTO.getHelpText());
+		if(!learningDesignDTO.getVersion().equals(WDDXTAGS.STRING_NULL_VALUE))
+			learningDesign.setVersion(learningDesignDTO.getVersion());
+		if(!learningDesignDTO.getLicenseText().equals(WDDXTAGS.STRING_NULL_VALUE))
+			learningDesign.setLicenseText(learningDesignDTO.getLicenseText());
+		if(!learningDesignDTO.getLessonOrgName().equals(WDDXTAGS.STRING_NULL_VALUE))
+			learningDesign.setLessonOrgName(learningDesignDTO.getLessonOrgName());
+		if(!learningDesignDTO.getLessonName().equals(WDDXTAGS.STRING_NULL_VALUE))
+			learningDesign.setLessonName(learningDesignDTO.getLessonName());					
+		if(!learningDesignDTO.getDateReadOnly().equals(WDDXTAGS.DATE_NULL_VALUE))
+			learningDesign.setDateReadOnly(learningDesignDTO.getDateReadOnly());
+		if(!learningDesignDTO.getCreateDateTime().equals(WDDXTAGS.DATE_NULL_VALUE))
+			learningDesign.setCreateDateTime(learningDesignDTO.getCreateDateTime());
+		if(!learningDesignDTO.getLessonStartDateTime().equals(WDDXTAGS.DATE_NULL_VALUE))
+			learningDesign.setLessonStartDateTime(learningDesignDTO.getLessonStartDateTime());
+		if(!learningDesignDTO.getLastModifiedDateTime().equals(WDDXTAGS.DATE_NULL_VALUE))
+			learningDesign.setLastModifiedDateTime(learningDesignDTO.getLastModifiedDateTime());
+		if(!learningDesignDTO.getLessonID().equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			learningDesign.setLessonID(learningDesignDTO.getLessonID());
+		if(!learningDesignDTO.getLessonOrgID().equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			learningDesign.setLessonOrgID(learningDesignDTO.getLessonOrgID());
+		if(!learningDesignDTO.getDuration().equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			learningDesign.setDuration(learningDesignDTO.getDuration());
+		
+		return learningDesign;
+	}
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -0,0 +1,76 @@
+/*
+ * Created on Apr 11, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.learningdesign.dto;
+
+import java.util.Date;
+
+import org.lamsfoundation.lams.learningdesign.LearningLibrary;
+import org.lamsfoundation.lams.util.wddx.WDDXTAGS;
+
+/**
+ * @author Minhas
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class LearningLibraryDTO extends BaseDTO {
+	
+	private Long learningLibraryID;
+	private String description;
+	private String title;
+	private Boolean validFlag;
+	private Date createDateTime;
+	
+	public LearningLibraryDTO(){
+		
+	}
+	public LearningLibraryDTO(Long learningLibraryID, String description,
+			String title, Boolean validFlag, Date createDateTime) {		
+		this.learningLibraryID = learningLibraryID;
+		this.description = description;
+		this.title = title;
+		this.validFlag = validFlag;
+		this.createDateTime = createDateTime;
+	}
+	public LearningLibraryDTO(LearningLibrary learningLibrary){
+		this.learningLibraryID = learningLibrary.getLearningLibraryId();
+		this.description = learningLibrary.getDescription();
+		this.title = learningLibrary.getTitle();
+		this.validFlag = learningLibrary.getValidLibrary();
+		this.createDateTime = learningLibrary.getCreateDateTime();		
+	}
+	/**
+	 * @return Returns the createDateTime.
+	 */
+	public Date getCreateDateTime() {
+		return createDateTime!=null?createDateTime:WDDXTAGS.DATE_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the description.
+	 */
+	public String getDescription() {
+		return description!=null?description:WDDXTAGS.STRING_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the learningLibraryID.
+	 */
+	public Long getLearningLibraryID() {
+		return learningLibraryID!=null?learningLibraryID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+	}
+	/**
+	 * @return Returns the title.
+	 */
+	public String getTitle() {
+		return title!=null?title:WDDXTAGS.STRING_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the validFlag.
+	 */
+	public Boolean getValidFlag() {
+		return validFlag!=null?validFlag:WDDXTAGS.BOOLEAN_NULL_VALUE;
+	}
+}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java
===================================================================
diff -u -rafbd2486f479295afe9a177d7bd3f9dcb71927a8 -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java	(.../MonitoringActivityDTO.java)	(revision afbd2486f479295afe9a177d7bd3f9dcb71927a8)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java	(.../MonitoringActivityDTO.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -21,24 +21,26 @@
 	private String description;
 	private Long activityID;
 	private Integer activityTypeID;	
-	private Integer contributionTypeID[];
 	private Integer orderID;
+	private Integer contributionType;
+	private Boolean isRequired;
 	
+	
 	public MonitoringActivityDTO(Activity activity){
 		this.title = activity.getTitle();
 		this.description = activity.getDescription();
 		this.activityID = activity.getActivityId();
-		this.activityTypeID = activity.getActivityTypeId();
-		this.contributionTypeID = new Integer[1];
+		this.activityTypeID = activity.getActivityTypeId();		
 		this.orderID = activity.getOrderId();		
-	}
-	public MonitoringActivityDTO(Activity activity,Integer[] contributionTypeID){
+	}	
+	public MonitoringActivityDTO(Activity activity,Integer contributionType,Boolean required){
 		this.title = activity.getTitle();
 		this.description = activity.getDescription();
 		this.activityID = activity.getActivityId();
 		this.activityTypeID = activity.getActivityTypeId();
-		this.contributionTypeID = contributionTypeID;
+		this.contributionType = contributionType;
 		this.orderID = activity.getOrderId();		
+		this.isRequired = required;
 	}
 	/**
 	 * @return Returns the activityID.
@@ -51,14 +53,8 @@
 	 */
 	public Integer getActivityTypeID() {
 		return activityTypeID!=null?activityTypeID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
-	}
+	}	
 	/**
-	 * @return Returns the contributionTypeID.
-	 */
-	public Integer[] getContributionTypeID() {
-		return contributionTypeID!=null?contributionTypeID:new Integer[1];
-	}
-	/**
 	 * @return Returns the description.
 	 */
 	public String getDescription() {
@@ -75,5 +71,17 @@
 	 */
 	public String getTitle() {
 		return title!=null?title:WDDXTAGS.STRING_NULL_VALUE;
-	}	
+	}
+	/**
+	 * @return Returns the contributionType.
+	 */
+	public Integer getContributionType() {
+		return contributionType!=null?contributionType:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @return Returns the isRequired.
+	 */
+	public Boolean getIsRequired() {
+		return isRequired!=null?isRequired:new Boolean(false);
+	}
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/TransitionDTO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/TransitionDTO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/TransitionDTO.java	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -0,0 +1,218 @@
+/*
+ * Created on Mar 30, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.learningdesign.dto;
+
+import java.util.Date;
+import java.util.Hashtable;
+
+import org.lamsfoundation.lams.learningdesign.Transition;
+import org.lamsfoundation.lams.util.wddx.WDDXTAGS;
+
+
+/**
+ * @author Minhas
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class TransitionDTO extends BaseDTO{
+	
+	private Long transitionId;	
+	private Integer transitionUIID;
+	private Integer toUIID;
+	private Integer fromUIID;
+	private String description;
+	private String title;
+	private Date createDateTime;
+	private Long toActivityID;
+	private Long fromActivityID;
+	private Long learningDesignID;
+	
+	public TransitionDTO(){
+		
+	}
+	public TransitionDTO(Long transitionId, Integer transitionUIID,
+			Integer toUIID, Integer fromUIID, String description, String title,
+			Date createDateTime, Long toActivityID, Long fromActivityID,
+			Long learningDesignID) {
+		super();
+		this.transitionId = transitionId;
+		this.transitionUIID = transitionUIID;
+		this.toUIID = toUIID;
+		this.fromUIID = fromUIID;
+		this.description = description;
+		this.title = title;
+		this.createDateTime = createDateTime;
+		this.toActivityID = toActivityID;
+		this.fromActivityID = fromActivityID;
+		this.learningDesignID = learningDesignID;
+	}
+	public TransitionDTO(Transition transition){
+		this.transitionId = transition.getTransitionId();
+		this.transitionUIID = transition.getTransitionUIID();
+		this.toUIID = transition.getToUIID();
+		this.fromUIID = transition.getFromUIID();
+		this.description = transition.getDescription();
+		this.title = transition.getTitle();
+		this.createDateTime = transition.getCreateDateTime();
+		this.toActivityID = transition.getToActivity().getActivityId();
+		this.fromActivityID = transition.getFromActivity().getActivityId();							  
+		this.learningDesignID = transition.getLearningDesign().getLearningDesignId();
+	}
+	public TransitionDTO(Hashtable transitionDetails){
+		if(transitionDetails.containsKey("transitionId"))
+			transitionId= convertToLong(transitionDetails.get("transitionId"));
+		if(transitionDetails.containsKey("transitionUIID"))
+			transitionUIID=convertToInteger(transitionDetails.get("transitionUIID"));
+		if(transitionDetails.containsKey("toUIID"))
+			toUIID=convertToInteger(transitionDetails.get("toUIID"));
+		if(transitionDetails.containsKey("fromUIID"))
+			fromUIID=convertToInteger(transitionDetails.get("fromUIID"));
+		if(transitionDetails.containsKey("description"))
+			description=(String)transitionDetails.get("description");
+		if(transitionDetails.containsKey("title"))
+			title=(String)transitionDetails.get("title");
+		if(transitionDetails.containsKey("createDateTime"))
+			createDateTime=(Date)transitionDetails.get("createDateTime");
+		if(transitionDetails.containsKey("toActivityID"))
+			toActivityID=convertToLong(transitionDetails.get("toActivityID"));
+		if(transitionDetails.containsKey("fromActivityID"))
+			fromActivityID=convertToLong(transitionDetails.get("fromActivityID"));
+		if(transitionDetails.containsKey("learningDesignID"))
+			learningDesignID=convertToLong(transitionDetails.get("learningDesignID"));
+	}
+	/**
+	 * @return Returns the createDateTime.
+	 */
+	public Date getCreateDateTime() {
+		return createDateTime!=null?createDateTime:WDDXTAGS.DATE_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the description.
+	 */
+	public String getDescription() {
+		return description!=null?description:WDDXTAGS.STRING_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the fromActivityID.
+	 */
+	public Long getFromActivityID() {
+		return fromActivityID!=null?fromActivityID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+	}
+	/**
+	 * @return Returns the fromUIID.
+	 */
+	public Integer getFromUIID() {
+		return fromUIID!=null?fromUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @return Returns the learningDesignID.
+	 */
+	public Long getLearningDesignID() {
+		return learningDesignID!=null?learningDesignID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+	}
+	/**
+	 * @return Returns the title.
+	 */
+	public String getTitle() {
+		return title!=null?title:WDDXTAGS.STRING_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the toActivityID.
+	 */
+	public Long getToActivityID() {
+		return toActivityID!=null?toActivityID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+	}
+	/**
+	 * @return Returns the toUIID.
+	 */
+	public Integer getToUIID() {
+		return toUIID!=null?toUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @return Returns the transitionId.
+	 */
+	public Long getTransitionId() {
+		return transitionId!=null?transitionId:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+	}
+	/**
+	 * @return Returns the transitionUIID.
+	 */
+	public Integer getTransitionUIID() {
+		return transitionUIID!=null?transitionUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @param createDateTime The createDateTime to set.
+	 */
+	public void setCreateDateTime(Date createDateTime) {
+		if(!createDateTime.equals(WDDXTAGS.DATE_NULL_VALUE))
+			this.createDateTime = createDateTime;
+	}
+	/**
+	 * @param description The description to set.
+	 */
+	public void setDescription(String description) {
+		if(!description.equals(WDDXTAGS.STRING_NULL_VALUE))
+			this.description = description;
+	}
+	/**
+	 * @param fromActivityID The fromActivityID to set.
+	 */
+	public void setFromActivityID(Long fromActivityID) {
+		if(!fromActivityID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.fromActivityID = fromActivityID;
+	}
+	/**
+	 * @param fromUIID The fromUIID to set.
+	 */
+	public void setFromUIID(Integer fromUIID) {
+		if(!fromUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.fromUIID = fromUIID;
+	}
+	/**
+	 * @param learningDesignID The learningDesignID to set.
+	 */
+	public void setLearningDesignID(Long learningDesignID) {
+		if(!learningDesignID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.learningDesignID = learningDesignID;
+	}
+	/**
+	 * @param title The title to set.
+	 */
+	public void setTitle(String title) {
+		if(!title.equals(WDDXTAGS.STRING_NULL_VALUE))
+			this.title = title;
+	}
+	/**
+	 * @param toActivityID The toActivityID to set.
+	 */
+	public void setToActivityID(Long toActivityID) {
+		if(!toActivityID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.toActivityID = toActivityID;
+	}
+	/**
+	 * @param toUIID The toUIID to set.
+	 */
+	public void setToUIID(Integer toUIID) {
+		if(!toUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.toUIID = toUIID;
+	}
+	/**
+	 * @param transitionId The transitionId to set.
+	 */
+	public void setTransitionId(Long transitionId) {
+		if(!transitionId.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
+			this.transitionId = transitionId;
+	}
+	/**
+	 * @param transitionUIID The transitionUIID to set.
+	 */
+	public void setTransitionUIID(Integer transitionUIID) {
+		if(!transitionUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER))
+			this.transitionUIID = transitionUIID;
+	}
+}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/exception/LearningDesignException.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/exception/LearningDesignException.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/exception/LearningDesignException.java	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -0,0 +1,24 @@
+/*
+ * Created on Apr 12, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.learningdesign.exception;
+
+/**
+ * @author Minhas
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class LearningDesignException extends Exception {
+	
+	public LearningDesignException(){
+		
+	}
+	public LearningDesignException(String message){
+		super(message);
+	}
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java
===================================================================
diff -u -r2f7b6de2551d46e34718915fb9918b8e70811d4a -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	(.../Lesson.java)	(revision 2f7b6de2551d46e34718915fb9918b8e70811d4a)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	(.../Lesson.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -23,6 +23,7 @@
 
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.lesson.dto.LessonDTO;
+import org.lamsfoundation.lams.lesson.dto.LessonDetailsDTO;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.User;
 import java.io.Serializable;
@@ -434,4 +435,7 @@
                              this.getLessonDescription(),
                              this.lessonStateId);
     }
+    public LessonDetailsDTO getLessonDetails(){
+    	return new LessonDetailsDTO(this);
+    }
 }
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -0,0 +1,164 @@
+/*
+ * Created on Mar 15, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.lesson.dto;
+
+import java.util.Date;
+import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.util.wddx.WDDXTAGS;
+
+/**
+ * @author Minhas
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class LessonDetailsDTO {
+	
+	private Long lessonID;
+	private Integer lessonStateID;
+	private Date createDateTime;
+	private Date startDateTime;
+	private Long duration;	
+	private Integer organisationID;
+	private String organisationName;
+	private String organisationDescription;	
+	private Integer workspaceFolderID;	
+	private Long licenseID;
+	private String licenseText;	
+	
+	private Long learningDesignID;
+	
+	
+	/** Full constructor */
+	public LessonDetailsDTO(Long lessonID, Long duration, Date createDateTime,
+			Date startDateTime, Integer organisationID,
+			String organisationName, String organisationDescription,
+			Integer workspaceFolderID, Long licenseID, String licenseText,
+			Integer lessonStateID, Long learningDesignID) {		
+		this.lessonID = lessonID;
+		this.duration = duration;
+		this.createDateTime = createDateTime;
+		this.startDateTime = startDateTime;
+		this.organisationID = organisationID;
+		this.organisationName = organisationName;
+		this.organisationDescription = organisationDescription;
+		this.workspaceFolderID = workspaceFolderID;
+		this.licenseID = licenseID;
+		this.licenseText = licenseText;
+		this.lessonStateID = lessonStateID;
+		this.learningDesignID = learningDesignID;
+	}
+	public LessonDetailsDTO(Lesson lesson){
+		this.lessonID = lesson.getLessonId();
+		
+		this.duration = lesson.getLearningDesign().getDuration();
+		
+		this.createDateTime = lesson.getCreateDateTime();
+		
+		this.startDateTime = lesson.getStartDateTime();
+		
+		this.organisationID = lesson.getOrganisation()!=null?
+							  lesson.getOrganisation().getOrganisationId():
+							  WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+		
+        this.organisationName = lesson.getOrganisation()!=null?
+								lesson.getOrganisation().getName():
+								WDDXTAGS.STRING_NULL_VALUE;
+		
+		this.organisationDescription = lesson.getOrganisation()!=null?
+									   lesson.getOrganisation().getDescription():
+									   WDDXTAGS.STRING_NULL_VALUE;
+		
+		this.workspaceFolderID = lesson.getLearningDesign().getWorkspaceFolder()!=null?
+								 lesson.getLearningDesign().getWorkspaceFolder().getWorkspaceFolderId():
+								 WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+		
+		this.licenseID = lesson.getLearningDesign().getLicense()!=null?
+						 lesson.getLearningDesign().getLicense().getLicenseID():
+					     WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+		
+		this.licenseText = lesson.getLearningDesign().getLicenseText()!=null?
+						   lesson.getLearningDesign().getLicenseText():
+					       WDDXTAGS.STRING_NULL_VALUE;
+		
+		this.lessonStateID = lesson.getLessonStateId();
+		
+		this.learningDesignID = lesson.getLearningDesign().getLearningDesignId();		
+	}	
+	/**
+	 * @return Returns the createDateTime.
+	 */
+	public Date getCreateDateTime() {
+		return createDateTime!=null?createDateTime:WDDXTAGS.DATE_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the duration.
+	 */
+	public Long getDuration() {
+		return duration!=null?duration:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+	}
+	/**
+	 * @return Returns the learningDesignID.
+	 */
+	public Long getLearningDesignID() {
+		return learningDesignID!=null?learningDesignID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+	}
+	/**
+	 * @return Returns the lessonID.
+	 */
+	public Long getLessonID() {
+		return lessonID!=null?lessonID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+	}
+	/**
+	 * @return Returns the lessonStateID.
+	 */
+	public Integer getLessonStateID() {
+		return lessonStateID!=null?lessonStateID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @return Returns the licenseID.
+	 */
+	public Long getLicenseID() {
+		return licenseID!=null?licenseID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
+	}
+	/**
+	 * @return Returns the licenseText.
+	 */
+	public String getLicenseText() {
+		return licenseText!=null?licenseText:WDDXTAGS.STRING_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the organisationDescription.
+	 */
+	public String getOrganisationDescription() {
+		return organisationDescription!=null?organisationDescription:WDDXTAGS.STRING_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the organisationID.
+	 */
+	public Integer getOrganisationID() {
+		return organisationID!=null?organisationID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+	/**
+	 * @return Returns the organisationName.
+	 */
+	public String getOrganisationName() {
+		return organisationName!=null?organisationName:WDDXTAGS.STRING_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the startDateTime.
+	 */
+	public Date getStartDateTime() {
+		return startDateTime!=null?startDateTime:WDDXTAGS.DATE_NULL_VALUE;
+	}
+	/**
+	 * @return Returns the workspaceFolderID.
+	 */
+	public Integer getWorkspaceFolderID() {
+		return workspaceFolderID!=null?workspaceFolderID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER;
+	}
+}
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	(.../Organisation.java)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	(.../Organisation.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -6,6 +6,7 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO;
 
 /** 
  *        @hibernate.class
@@ -14,6 +15,7 @@
 */
 public class Organisation implements Serializable {
 
+	
     /** identifier field */
     private Integer organisationId;
 
@@ -74,6 +76,16 @@
         this.users = users;
         this.lessons = lessons;
     }
+    public Organisation(String name, 
+    					String description,						
+						Date createDate,						 
+						OrganisationType organisationType) {
+		super();
+		this.name = name;
+		this.description = description;		
+		this.createDate = createDate;		
+		this.organisationType = organisationType;
+	}
 
     /** 
      *            @hibernate.id
@@ -269,5 +281,8 @@
             .append(getOrganisationId())
             .toHashCode();
     }
+    public OrganisationDTO getOrganisationDTO(){
+    	return new OrganisationDTO(this);
+    }
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java	(.../Role.java)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java	(.../Role.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -1,6 +1,7 @@
 package org.lamsfoundation.lams.usermanagement;
 
 import java.io.Serializable;
+import java.util.HashSet;
 import java.util.Set;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -114,7 +115,11 @@
     public void setUserOrganisationRoles(Set userOrganisationRoles) {
         this.userOrganisationRoles = userOrganisationRoles;
     }
-
+    public void addUserOrganisationRole(UserOrganisationRole userOrganisationRole){
+    	if(userOrganisationRoles==null)
+    		userOrganisationRoles = new HashSet();
+    	userOrganisationRoles.add(userOrganisationRole);
+    }
     public String toString() {
         return new ToStringBuilder(this)
             .append("roleId", getRoleId())
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -2,10 +2,14 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
+
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 
 /** 
  *        @hibernate.class
@@ -82,6 +86,9 @@
     
     /** persistent field */
     private Organisation baseOrganisation;
+    
+    /** non-nullable persistent field */
+    private Integer userOrganisationID;
 
     /** persistent field */
     private Set learnerProgresses;
@@ -487,6 +494,12 @@
     public void setUserOrganisations(Set userOrganisations) {
         this.userOrganisations = userOrganisations;
     }
+    /** This methods adds a new membership for the given user*/
+    public void addUserOrganisation(UserOrganisation userOrganisation){
+    	if(this.userOrganisations==null)
+    		userOrganisations = new HashSet();
+    	userOrganisations.add(userOrganisation);    	
+    }
 
     /** 
      *            @hibernate.set
@@ -602,5 +615,50 @@
             .append(getUserId())
             .toHashCode();
     }
+    public UserDTO getUserDTO(){
+    	return new UserDTO(this.userId,
+    						this.firstName,
+							this.lastName,
+							this.login);
+    }
 
+	/**
+	 * @return Returns the userOrganisationID.
+	 */
+	public Integer getUserOrganisationID() {
+		return userOrganisationID;
+	}
+	/**
+	 * @param userOrganisationID The userOrganisationID to set.
+	 */
+	public void setUserOrganisationID(Integer userOrganisationID) {
+		this.userOrganisationID = userOrganisationID;
+	}
+	
+	/**This method checks whether user is a member of the 
+	 * given organisation*/
+	public boolean isMember(Organisation organisation){
+		Iterator iterator = this.userOrganisations.iterator();
+		while(iterator.hasNext()){
+			UserOrganisation userOrganisation = (UserOrganisation)iterator.next();
+			Integer organisationID = userOrganisation.getOrganisation().getOrganisationId();
+			if(organisationID==organisation.getOrganisationId())
+				return true;
+		}
+		return false;		
+	}
+	/** This method checks whether the user has membership access to 
+	 * the given workspaceFolder. Membership access means that the user 
+	 * has read and write access but cannot modify anybody else's content/stuff
+	 **/
+	public boolean hasMemberAccess(WorkspaceFolder workspaceFolder){		
+		Iterator iterator = this.userOrganisations.iterator();
+		while(iterator.hasNext()){
+			UserOrganisation userOrganisation = (UserOrganisation)iterator.next();			
+			Integer folderID = userOrganisation.getOrganisation().getWorkspace().getRootFolder().getWorkspaceFolderId();
+			if(folderID==workspaceFolder.getWorkspaceFolderId())
+				return true;
+		}		
+		return false;
+	}	
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java	(.../UserOrganisation.java)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java	(.../UserOrganisation.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -1,6 +1,7 @@
 package org.lamsfoundation.lams.usermanagement;
 
 import java.io.Serializable;
+import java.util.HashSet;
 import java.util.Set;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -97,6 +98,11 @@
     public void setUserOrganisationRoles(Set userOrganisationRoles) {
         this.userOrganisationRoles = userOrganisationRoles;
     }
+    public void addUserOrganisationRole(UserOrganisationRole userOrganisationRole){
+    	if(userOrganisationRoles==null)
+    		userOrganisationRoles = new HashSet();
+    	userOrganisationRoles.add(userOrganisationRole);
+    }
 
     public String toString() {
         return new ToStringBuilder(this)
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Workspace.java
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Workspace.java	(.../Workspace.java)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Workspace.java	(.../Workspace.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -5,6 +5,7 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.lamsfoundation.lams.usermanagement.dto.WorkspaceDTO;
 
 /** 
  *        @hibernate.class
@@ -17,17 +18,26 @@
     private Integer workspaceId;
 
     /** persistent field */
-    private WorkspaceFolder workspaceFolder;
+    private WorkspaceFolder rootFolder;
 
     /** persistent field */
     private Set users;
 
     /** persistent field */
     private Set organisations;
+    
+    /** nullable persistent field representing the name of the workspace,
+     *  defaults to the name of the Organisation 
+     * */
+    private String name;
 
+	public Workspace(String name) {
+		super();
+		this.name = name;
+	}
     /** full constructor */
     public Workspace(WorkspaceFolder workspaceFolder, Set users, Set organisations) {
-        this.workspaceFolder = workspaceFolder;
+        this.rootFolder = workspaceFolder;
         this.users = users;
         this.organisations = organisations;
     }
@@ -57,12 +67,12 @@
      *            @hibernate.column name="root_folder_id"         
      *         
      */
-    public WorkspaceFolder getWorkspaceFolder() {
-        return this.workspaceFolder;
+    public WorkspaceFolder getRootFolder() {
+        return this.rootFolder;
     }
 
-    public void setWorkspaceFolder(WorkspaceFolder workspaceFolder) {
-        this.workspaceFolder = workspaceFolder;
+    public void setRootFolder(WorkspaceFolder workspaceFolder) {
+        this.rootFolder = workspaceFolder;
     }
 
     /** 
@@ -123,4 +133,20 @@
             .toHashCode();
     }
 
+	/**
+	 * @return Returns the name.
+	 */
+	public String getName() {
+		return name;
+	}
+	/**
+	 * @param name The name to set.
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+	public WorkspaceDTO getWorkspaceDTO(){
+		return new WorkspaceDTO(workspaceId,
+								rootFolder.getWorkspaceFolderId()); 
+	}
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java
===================================================================
diff -u -r8e764cef94c3501df91598521080a8bf2c5160b2 -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java	(.../WorkspaceFolder.java)	(revision 8e764cef94c3501df91598521080a8bf2c5160b2)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java	(.../WorkspaceFolder.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -1,28 +1,67 @@
+/***************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ************************************************************************
+ */
 package org.lamsfoundation.lams.usermanagement;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.Set;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
-/** 
- *        @hibernate.class
- *         table="lams_workspace_folder"
+/**
+ * @hibernate.class table="lams_workspace_folder"
+ * 
+ * @author Fei Yang,Manpreet Minhas
  *     
 */
 public class WorkspaceFolder implements Serializable {
+	
+	/** static final variables indicating the type of workspaceFolder */
+	/******************************************************************/
+	public static final Integer NORMAL = new Integer(1);
+	public static final Integer RUN_SEQUENCES = new Integer(2);
+	/******************************************************************/
+	
+	/** static final variables indicating the permissions on the workspaceFolder */
+	/******************************************************************/
+	public static final Integer READ_ACCESS = new Integer(1);		
+	public static final Integer MEMBERSHIP_ACCESS = new Integer(2);
+	public static final Integer OWNER_ACCESS = new Integer(3);
+	public static final Integer NO_ACCESS = new Integer(4);
+	/******************************************************************/
 
     /** identifier field */
     private Integer workspaceFolderId;
 
     /** persistent field */
     private String name;
+    
+    /** non-nullable persistent field indicating the
+     * workspace which contains this folder*/
+    private Integer workspaceID;
 
     /** persistent field */
-    private int workspaceId;
-
-    /** persistent field */
     private WorkspaceFolder parentWorkspaceFolder;
 
     /** persistent field */
@@ -32,7 +71,55 @@
     private Set childWorkspaceFolders;
     
     private Set learningDesigns;
+    
+    /**
+     * non-nullable persistent field indicating the 
+     * user who created/owns the workspace folder
+     */
+    private Integer userID;
+    
+    /** non-nullable persistent field */
+    private Date creationDate;
+    
+    /** non-nullable persistent field */
+    private Date lastModifiedDate;
+    
+    /** 
+     * non-nullable persistent field indicating 
+     * the type of workspace folder. Can be either 
+     * NORMAL OR RUN_SEQUENCES */
+    private Integer workspaceFolderType;
 
+	public WorkspaceFolder(String name,
+						   Integer workspaceID,
+						   Integer userID,
+						   Date creationDate,
+						   Date lastModifiedDate,
+						   Integer workspaceFolderType) {	
+		this.name = name;	
+		this.workspaceID = workspaceID;
+		this.userID = userID;
+		this.creationDate = creationDate;
+		this.lastModifiedDate = lastModifiedDate;
+		this.workspaceFolderType = workspaceFolderType;
+	}
+	
+	public WorkspaceFolder(String name, 
+						  Integer workspaceID,
+						  WorkspaceFolder parentWorkspaceFolder,
+						  Integer userID,
+						  Date creationDate,
+						  Date lastModifiedDate,
+						  Integer workspaceFolderType) {
+		super();
+		this.name = name;
+		this.workspaceID = workspaceID;
+		this.parentWorkspaceFolder = parentWorkspaceFolder;
+		this.userID = userID;
+		this.creationDate = creationDate;
+		this.lastModifiedDate = lastModifiedDate;
+		this.workspaceFolderType = workspaceFolderType;
+	}
 	/**
 	 * @return Returns the learningDesigns.
 	 */
@@ -46,9 +133,8 @@
 		this.learningDesigns = learningDesigns;
 	}
     /** full constructor */
-    public WorkspaceFolder(String name, int workspaceId, WorkspaceFolder parentWorkspaceFolder, Set workspaces, Set childWorkspaceFolders) {
-        this.name = name;
-        this.workspaceId = workspaceId;
+    public WorkspaceFolder(String name, WorkspaceFolder parentWorkspaceFolder, Set workspaces, Set childWorkspaceFolders) {
+        this.name = name;    
         this.parentWorkspaceFolder = parentWorkspaceFolder;
         this.workspaces = workspaces;
         this.childWorkspaceFolders = childWorkspaceFolders;
@@ -87,23 +173,7 @@
     public void setName(String name) {
         this.name = name;
     }
-
     /** 
-     *            @hibernate.property
-     *             column="workspace_id"
-     *             length="11"
-     *             not-null="true"
-     *         
-     */
-    public int getWorkspaceId() {
-        return this.workspaceId;
-    }
-
-    public void setWorkspaceId(int workspaceId) {
-        this.workspaceId = workspaceId;
-    }
-
-    /** 
      *            @hibernate.many-to-one
      *            @hibernate.column name="parent_folder_id"         
      *         
@@ -174,4 +244,77 @@
             .toHashCode();
     }
 
+	/**
+	 * @return Returns the userID.
+	 */
+	public Integer getUserID() {
+		return userID;
+	}
+	/**
+	 * @param userID The userID to set.
+	 */
+	public void setUserID(Integer userID) {
+		this.userID = userID;
+	}
+	/**
+	 * @return Returns the creationDate.
+	 */
+	public Date getCreationDate() {
+		return creationDate;
+	}
+	/**
+	 * @param creationDate The creationDate to set.
+	 */
+	public void setCreationDate(Date creationDate) {
+		this.creationDate = creationDate;
+	}
+	/**
+	 * @return Returns the lastModifiedDate.
+	 */
+	public Date getLastModifiedDate() {
+		return lastModifiedDate;
+	}
+	/**
+	 * @param lastModifiedDate The lastModifiedDate to set.
+	 */
+	public void setLastModifiedDate(Date lastModifiedDate) {
+		this.lastModifiedDate = lastModifiedDate;
+	}
+	/**
+	 * @return Returns the workspaceFolderType.
+	 */
+	public Integer getWorkspaceFolderType() {
+		return workspaceFolderType;
+	}
+	/**
+	 * @param workspaceFolderType The workspaceFolderType to set.
+	 */
+	public void setWorkspaceFolderType(Integer workspaceFolderType) {
+		this.workspaceFolderType = workspaceFolderType;
+	}
+	/**
+	 * @return Returns the workspaceID.
+	 */
+	public Integer getWorkspaceID() {
+		return workspaceID;
+	}
+	/**
+	 * @param workspaceID The workspaceID to set.
+	 */
+	public void setWorkspaceID(Integer workspaceID) {
+		this.workspaceID = workspaceID;
+	}
+	/**
+	 * This is a utility function which checks if the given 
+	 * workspaceFolder has subFolders defined inside it.
+	 * 
+	 * @return boolean A boolean value indicating whether the 
+	 * 				   current workspaces contains subFolders 
+	 */
+	public boolean hasSubFolders(){
+		if (this.childWorkspaceFolders!=null || childWorkspaceFolders.size()!=0)
+			return true;
+		else
+			return false;
+	}	
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java	(.../IOrganisationDAO.java)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java	(.../IOrganisationDAO.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -81,5 +81,7 @@
      * @param organisationId the organisation's organisationId
      */
     public void deleteOrganisationById(Integer organisationId);
+    
+    public Organisation getOrganisationByWorkspaceID(Integer workspaceID);
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IWorkspaceDAO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IWorkspaceDAO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IWorkspaceDAO.java	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -0,0 +1,44 @@
+/***************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ************************************************************************
+ */
+package org.lamsfoundation.lams.usermanagement.dao;
+
+import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO;
+import org.lamsfoundation.lams.usermanagement.Workspace;
+
+/**
+ * @author Manpreet Minhas
+ *
+ */
+public interface IWorkspaceDAO extends IBaseDAO{
+	
+	/**
+	 * Returns the workspace corresponding to the given
+	 * workspace_id
+	 * 
+	 * @param workspaceID The workspace_id of the workspace being 
+	 * 					  looked for
+	 * @return Workspace The populated workspace object 
+	 */
+	public Workspace getWorkspaceByID(Integer workspaceID);	
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IWorkspaceFolderDAO.java
===================================================================
diff -u -r1197a06ec1722bf2704ebcfe523fb9e36be20ae0 -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IWorkspaceFolderDAO.java	(.../IWorkspaceFolderDAO.java)	(revision 1197a06ec1722bf2704ebcfe523fb9e36be20ae0)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IWorkspaceFolderDAO.java	(.../IWorkspaceFolderDAO.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
@@ -6,15 +6,21 @@
  */
 package org.lamsfoundation.lams.usermanagement.dao;
 
+import java.util.List;
+
+import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO;
 import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
 
 /**
- * @author Minhas
+ * @author Manpreet Minhas
  *
  * TODO To change the template for this generated type comment go to
  * Window - Preferences - Java - Code Style - Code Templates
  */
-public interface IWorkspaceFolderDAO {
+public interface IWorkspaceFolderDAO extends IBaseDAO{	
 	public WorkspaceFolder getWorkspaceFolderByID(Integer workspaceFolderID);
-
+	
+	public WorkspaceFolder getRunSequencesFolderForUser(Integer userID);
+	public List getWorkspaceFolderByParentFolder(Integer parentFolderID);
+	public List getWorkspaceFolderByUser(Integer userID);
 }