Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
===================================================================
diff -u -r0badad92963e07de13c104187ca773f8d1abec70 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(.../ObjectExtractor.java)	(revision 0badad92963e07de13c104187ca773f8d1abec70)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(.../ObjectExtractor.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -218,7 +218,7 @@
 			throw new ObjectExtractorException("activityTypeID missing");
 		}
 		
-		Object activityObject = Activity.getActivityInstance(activityTypeID.intValue());
+		Activity activityObject = Activity.getActivityInstance(activityTypeID.intValue());
 		processActivityType(activityObject,activityDetails);
 		Activity activity =(Activity)activityObject;
 		activity.setActivityTypeId(activityTypeID);
@@ -279,13 +279,13 @@
 		activity.setGroupingSupportType(WDDXProcessor.convertToInteger(activityDetails,"groupingSupportType"));
 		return activity;
 	}	 
-	private  void processActivityType(Object activity, Hashtable activityDetails) 
+	private  void processActivityType(Activity activity, Hashtable activityDetails) 
 			throws WDDXProcessorConversionException, ObjectExtractorException {
-		if(activity instanceof GroupingActivity)
+		if(activity.isGroupingActivity())
 			 buildGroupingActivity((GroupingActivity)activity,activityDetails);
-		else if(activity instanceof ToolActivity)
+		else if(activity.isToolActivity())
 			 buildToolActivity((ToolActivity)activity,activityDetails);
-		else if(activity instanceof GateActivity)
+		else if(activity.isGateActivity())
 			 buildGateActivity(activity,activityDetails);
 		else 			
 			 buildComplexActivity(activity,activityDetails);		
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
diff -u -r49de4737694691f60400ecd00745eaa646bcd724 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 49de4737694691f60400ecd00745eaa646bcd724)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -36,21 +36,10 @@
 import org.lamsfoundation.lams.authoring.ObjectExtractorException;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.ActivityOrderComparator;
-import org.lamsfoundation.lams.learningdesign.ChosenGrouping;
-import org.lamsfoundation.lams.learningdesign.ComplexActivity;
-import org.lamsfoundation.lams.learningdesign.GateActivity;
 import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.GroupingActivity;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.learningdesign.LearningLibrary;
-import org.lamsfoundation.lams.learningdesign.OptionsActivity;
-import org.lamsfoundation.lams.learningdesign.ParallelActivity;
-import org.lamsfoundation.lams.learningdesign.PermissionGateActivity;
-import org.lamsfoundation.lams.learningdesign.RandomGrouping;
-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.learningdesign.Transition;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupDAO;
@@ -66,9 +55,9 @@
 import org.lamsfoundation.lams.themes.dao.ICSSThemeDAO;
 import org.lamsfoundation.lams.themes.dto.CSSThemeBriefDTO;
 import org.lamsfoundation.lams.themes.dto.CSSThemeDTO;
-import org.lamsfoundation.lams.tool.dao.hibernate.ToolDAO;
-import org.lamsfoundation.lams.tool.ToolContentIDGenerator;
 import org.lamsfoundation.lams.tool.Tool;
+import org.lamsfoundation.lams.tool.ToolContentIDGenerator;
+import org.lamsfoundation.lams.tool.dao.hibernate.ToolDAO;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
 import org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO;
@@ -281,7 +270,8 @@
 	 * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#copyLearningDesign(org.lamsfoundation.lams.learningdesign.LearningDesign, java.lang.Integer, org.lamsfoundation.lams.usermanagement.User)
 	 */
 	public LearningDesign copyLearningDesign(LearningDesign originalLearningDesign,Integer copyType,User user){
-		WorkspaceFolder runSequencesFolder = workspaceFolderDAO.getRunSequencesFolderForUser(user.getUserId());
+		Integer userId = user.getUserId();
+		WorkspaceFolder runSequencesFolder = workspaceFolderDAO.getRunSequencesFolderForUser(userId);
 		return copyLearningDesign(originalLearningDesign,copyType,user, runSequencesFolder);
 	}
 	
@@ -334,7 +324,7 @@
     	oldParentActivities.addAll(originalLearningDesign.getParentActivities());    	    	
     	Iterator iterator = oldParentActivities.iterator();    	
     	while(iterator.hasNext()){
-    		Object parentActivity = iterator.next();
+    		Activity parentActivity = (Activity)iterator.next();
     		Activity newParentActivity = getActivityCopy(parentActivity);
     		newParentActivity.setLearningDesign(newLearningDesign);
     		activityDAO.insert(newParentActivity);
@@ -391,71 +381,20 @@
      * @param activity The object to be deep-copied
      * @return Activity The new deep-copied Activity object
      */
-    private Activity getActivityCopy(Object activity){
-    	if(activity instanceof GroupingActivity){    		
-    		GroupingActivity newGroupingActivity = GroupingActivity.createCopy((GroupingActivity)activity);
-    		createGroupingForGroupingActivity(newGroupingActivity,(GroupingActivity)activity);
+    private Activity getActivityCopy(Activity activity){
+    	if ( Activity.GROUPING_ACTIVITY_TYPE == activity.getActivityTypeId().intValue() ) {
+    		GroupingActivity newGroupingActivity = (GroupingActivity) activity.createCopy();
+    		// now we need to manually add the grouping to the session, as we can't easily
+    		// set up a cascade
+    		Grouping grouping = newGroupingActivity.getCreateGrouping();
+    		if ( grouping != null )
+    			groupingDAO.insert(grouping);
     		return newGroupingActivity;
     	}
-    	else if(activity instanceof ComplexActivity)
-    		return createComplexActivityCopy(activity);
-    	else if(activity instanceof GateActivity)
-    		return createGateActivityCopy(activity);
     	else 
-    		return ToolActivity.createCopy((ToolActivity)activity);    	
+    		return activity.createCopy();    	
     } 
     /**
-     * This function creates a new Grouping for the new GroupingActivity
-     * based on the grouping type of the old GroupingActivity from
-     * which it has been deep-copied.
-     * 
-     * @param groupingActivity The new GroupingActivity
-     * @param oldActivity The old GroupingActivity
-     */
-    private void createGroupingForGroupingActivity(GroupingActivity groupingActivity, GroupingActivity oldActivity){
-    	Grouping grouping = oldActivity.getCreateGrouping();
-    	
-    	if(grouping.getGroupingTypeId()==Grouping.CHOSEN_GROUPING_TYPE){
-    		ChosenGrouping chosenGrouping = ChosenGrouping.createCopy((ChosenGrouping)grouping);    		
-    		groupingDAO.insert(chosenGrouping);
-    		groupingActivity.setCreateGrouping(chosenGrouping);
-    	}
-    	else{
-    		RandomGrouping randomGrouping = RandomGrouping.createCopy((RandomGrouping)grouping);
-    		groupingDAO.insert(randomGrouping);
-    		groupingActivity.setCreateGrouping(randomGrouping);
-    	}    	
-    }
-    /**
-     * This function creates a deep copy of ComplexActivity object
-     * 
-     * @param activity The object to be deep copied
-     * @return Activity The deep-copied object
-     */
-    private Activity createComplexActivityCopy(Object activity){    	    	
-    	if(activity instanceof OptionsActivity)
-    		return OptionsActivity.createCopy((OptionsActivity)activity);
-    	else if (activity instanceof ParallelActivity)
-    		return ParallelActivity.createCopy((ParallelActivity)activity);
-    	else
-    		return SequenceActivity.createCopy((SequenceActivity)activity);
-    	
-    }
-    /**
-     * This function creates a deep copy of the GateActivity object
-     *  
-     * @param activity The object to be deep copied
-     * @return Activity The deep-copied object
-     */
-    private Activity createGateActivityCopy(Object activity){
-    	if(activity instanceof ScheduleGateActivity)
-    		return ScheduleGateActivity.createCopy((ScheduleGateActivity)activity);
-    	else if (activity instanceof PermissionGateActivity)
-    		return PermissionGateActivity.createCopy((PermissionGateActivity)activity);
-    	else
-    		return SynchGateActivity.createCopy((SynchGateActivity)activity);
-    }
-    /**
      * Returns a set of child activities for the given parent activitity
      * 
      * @param parentActivity The parent activity 
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -254,7 +254,7 @@
 		this.transitionFrom = transitionFrom;
 	}
 	
-	public static Object getActivityInstance(int activityType)
+	public static Activity getActivityInstance(int activityType)
 	{
 		switch(activityType){
 			case TOOL_ACTIVITY_TYPE:
@@ -658,6 +658,16 @@
 	    return getActivityTypeId().intValue()==SEQUENCE_ACTIVITY_TYPE;
 	}
 	
+	public boolean isParallelActivity()
+	{
+		return getActivityTypeId().intValue()== PARALLEL_ACTIVITY_TYPE;
+	}
+
+	public boolean isOptionsActivity()
+	{
+		return getActivityTypeId().intValue()== OPTIONS_ACTIVITY_TYPE;
+	}
+
 	public boolean isComplexActivity()
 	{
 		return getActivityTypeId().intValue()== SEQUENCE_ACTIVITY_TYPE || 
@@ -716,15 +726,16 @@
 	    return new ProgressActivityDTO(this.activityId);
 	}
 	
-	
-	public Set getMonitoringActivityDTO(Integer[] contributionType)
+
+	/** Get the monitoring DTO for this activity. Overridden by SimpleActivity
+	 * to include the contribution types */ 
+	public Set getMonitoringActivityDTO()
 	{
 		HashSet dtoSet = new HashSet();
-		for(int i=0;i<contributionType.length;i++){
-			dtoSet.add(new MonitoringActivityDTO(this,contributionType[i]));
-		}
+		dtoSet.add(new MonitoringActivityDTO(this,null));
 		return dtoSet;
 	}
+
 	
 	public AuthoringActivityDTO getAuthoringActivityDTO()
 	{
@@ -733,4 +744,11 @@
 	public LibraryActivityDTO getLibraryActivityDTO(){
 		return new LibraryActivityDTO((ToolActivity)this);
 	}
+	
+	/** Create a deep copy of the this activity. It should return the same
+	 * subclass as the activity being copied 
+	 * @return deep copy of this object
+	 */
+   public abstract Activity createCopy();
+
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouping.java
===================================================================
diff -u -r55901923afea1cbd769d8daa05051aa050bb99b6 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouping.java	(.../ChosenGrouping.java)	(revision 55901923afea1cbd769d8daa05051aa050bb99b6)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouping.java	(.../ChosenGrouping.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -43,17 +43,14 @@
     }
     
     /**
-     * This method creates a deep copy of the Grouping passed
-     * as an argument.
-     * 
-     * @param originalGrouping The Grouping object to be deep copied
+     * This method creates a deep copy of the Grouping 
      * @return ChosenGrouping The deep copied Grouping object
      */
-    public static ChosenGrouping createCopy(ChosenGrouping originalGrouping)
+    public Grouping createCopy()
     {
     	ChosenGrouping chosenGrouping = new ChosenGrouping();
-    	chosenGrouping.setMaxNumberOfGroups(originalGrouping.getMaxNumberOfGroups());
-    	chosenGrouping.setGroupingUIID(originalGrouping.getGroupingUIID());
+    	chosenGrouping.setMaxNumberOfGroups(this.getMaxNumberOfGroups());
+    	chosenGrouping.setGroupingUIID(this.getGroupingUIID());
     	return chosenGrouping;
     }
 
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
===================================================================
diff -u -r55901923afea1cbd769d8daa05051aa050bb99b6 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java	(.../Grouping.java)	(revision 55901923afea1cbd769d8daa05051aa050bb99b6)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java	(.../Grouping.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -109,6 +109,12 @@
         this.groupingId = groupingId;
     }
     
+	/** Create a deep copy of the this grouping. It should return the same
+	 * subclass as the grouping being copied 
+	 * @return deep copy of this object
+	 */
+    public abstract Grouping createCopy();
+
     /**
      *            
      *
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java	(.../GroupingActivity.java)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java	(.../GroupingActivity.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -124,33 +124,45 @@
         super.simpleActivityStrategy = new GroupingActivityStrategy(this);
     }
     /**
-     * This function creates a deep copy of the GroupingActivity passed
-     * as an argument. However each time a GroupingActivity is deep copied
-     * it would result in creation of new Groups as well.
-     * @param originalActivity
-     * @return
+     * This function creates a deep copy of the GroupingActivity of the current
+     * object. However each time a GroupingActivity is deep copied
+     * it would result in creation of new Groups as well. 
+     * <p>
+     * Note: the grouping
+     * object will be created here but the calling class will need to insert
+     * it into the database otherwise it won't be persisted (can't easily set
+     * it up to cascade). Call getCreateGrouping() to get the grouping object
+     * to be stored via the session.
+     * 
+     * @return GroupActivity, which is copy of this activity. 
      */
-    public static GroupingActivity createCopy(GroupingActivity originalActivity){
+    public Activity createCopy(){
     	GroupingActivity groupingActivity = new GroupingActivity();
     	
-    	groupingActivity.setActivityUIID(originalActivity.getActivityUIID());
-    	groupingActivity.setDescription(originalActivity.getDescription());
-    	groupingActivity.setTitle(originalActivity.getTitle());
-    	groupingActivity.setHelpText(originalActivity.getHelpText());
-    	groupingActivity.setXcoord(originalActivity.getXcoord());
-    	groupingActivity.setYcoord(originalActivity.getYcoord());    	    
-    	groupingActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+    	groupingActivity.setActivityUIID(this.getActivityUIID());
+    	groupingActivity.setDescription(this.getDescription());
+    	groupingActivity.setTitle(this.getTitle());
+    	groupingActivity.setHelpText(this.getHelpText());
+    	groupingActivity.setXcoord(this.getXcoord());
+    	groupingActivity.setYcoord(this.getYcoord());    	    
+    	groupingActivity.setActivityTypeId(this.getActivityTypeId());
     	
-    	groupingActivity.setGroupingSupportType(originalActivity.getGroupingSupportType());
-    	groupingActivity.setApplyGrouping(originalActivity.getApplyGrouping());
-    	groupingActivity.setActivityCategoryID(originalActivity.getActivityCategoryID());
+    	groupingActivity.setGroupingSupportType(this.getGroupingSupportType());
+    	groupingActivity.setApplyGrouping(this.getApplyGrouping());
+    	groupingActivity.setActivityCategoryID(this.getActivityCategoryID());
     	
-    	groupingActivity.setDefineLater(originalActivity.getDefineLater());    	
+    	groupingActivity.setDefineLater(this.getDefineLater());    	
     	groupingActivity.setCreateDateTime(new Date()); 
-    	groupingActivity.setRunOffline(originalActivity.getRunOffline());
-    	groupingActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage());    	
+    	groupingActivity.setRunOffline(this.getRunOffline());
+    	groupingActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());    	
+
+    	Grouping currentGrouping = this.getCreateGrouping();
+    	Grouping newGrouping = currentGrouping.createCopy();
+    	groupingActivity.setCreateGrouping(newGrouping);
+
     	return groupingActivity;    	
     }
+    
     public String toString()
     {
         return new ToStringBuilder(this)
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
===================================================================
diff -u -rb3dbc137e110d79b6aae154a808b7ca6e7de403d -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java	(.../LearningDesign.java)	(revision b3dbc137e110d79b6aae154a808b7ca6e7de403d)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java	(.../LearningDesign.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -402,14 +402,13 @@
 		HashMap parentActivities = new HashMap();
 		Iterator iterator = this.getActivities().iterator();
 		while(iterator.hasNext()){
-			Object object = iterator.next();
-			if(object instanceof ComplexActivity){
-				ComplexActivity complexActivity =(ComplexActivity)object;
+			Activity act = (Activity) iterator.next();
+			if(act.isComplexActivity()){
+				ComplexActivity complexActivity =(ComplexActivity)act;
 				parentActivities.put(complexActivity.getActivityId(),complexActivity.getActivities());
 			}else{
-				Activity activity = (Activity)object;
-				if(activity.getParentActivity()==null)
-					parentActivities.put(activity.getActivityId(),new HashSet());
+				if(act.getParentActivity()==null)
+					parentActivities.put(act.getActivityId(),new HashSet());
 			}
 		}
 		return parentActivities;
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/NullActivity.java
===================================================================
diff -u -r55901923afea1cbd769d8daa05051aa050bb99b6 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/NullActivity.java	(.../NullActivity.java)	(revision 55901923afea1cbd769d8daa05051aa050bb99b6)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/NullActivity.java	(.../NullActivity.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -37,4 +37,12 @@
         return true;
     }
 
+	/** Create a deep copy of the this activity. It should return the same
+	 * subclass as the activity being copied 
+	 * @return deep copy of this object
+	 */
+   public Activity createCopy() {
+   		return new NullActivity();
+   }
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java	(.../OptionsActivity.java)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java	(.../OptionsActivity.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -121,35 +121,35 @@
               activities);
       super.activityStrategy = new OptionsActivityStrategy(this);
     }
-    public static OptionsActivity createCopy(OptionsActivity originalActivity){
+    public Activity createCopy(){
     	OptionsActivity newOptionsActivity = new OptionsActivity();
     	
     	/** OptionsActivity Specific Attributes */
-    	newOptionsActivity.setMaxNumberOfOptions(originalActivity.getMaxNumberOfOptions());
-    	newOptionsActivity.setMinNumberOfOptions(originalActivity.getMinNumberOfOptions());
-    	newOptionsActivity.setOptionsInstructions(originalActivity.getOptionsInstructions());
+    	newOptionsActivity.setMaxNumberOfOptions(this.getMaxNumberOfOptions());
+    	newOptionsActivity.setMinNumberOfOptions(this.getMinNumberOfOptions());
+    	newOptionsActivity.setOptionsInstructions(this.getOptionsInstructions());
     	
     	/** Generic Activity Attributes */
-    	newOptionsActivity.setActivityUIID(originalActivity.getActivityUIID());
-    	newOptionsActivity.setDescription(originalActivity.getDescription());
-    	newOptionsActivity.setTitle(originalActivity.getTitle());
-    	newOptionsActivity.setHelpText(originalActivity.getHelpText());
-    	newOptionsActivity.setXcoord(originalActivity.getXcoord());
-    	newOptionsActivity.setYcoord(originalActivity.getYcoord());
-    	newOptionsActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+    	newOptionsActivity.setActivityUIID(this.getActivityUIID());
+    	newOptionsActivity.setDescription(this.getDescription());
+    	newOptionsActivity.setTitle(this.getTitle());
+    	newOptionsActivity.setHelpText(this.getHelpText());
+    	newOptionsActivity.setXcoord(this.getXcoord());
+    	newOptionsActivity.setYcoord(this.getYcoord());
+    	newOptionsActivity.setActivityTypeId(this.getActivityTypeId());
     	
-    	newOptionsActivity.setGroupingSupportType(originalActivity.getGroupingSupportType());
-    	newOptionsActivity.setApplyGrouping(originalActivity.getApplyGrouping());
-    	newOptionsActivity.setActivityCategoryID(originalActivity.getActivityCategoryID());    	
+    	newOptionsActivity.setGroupingSupportType(this.getGroupingSupportType());
+    	newOptionsActivity.setApplyGrouping(this.getApplyGrouping());
+    	newOptionsActivity.setActivityCategoryID(this.getActivityCategoryID());    	
     	
-    	newOptionsActivity.setGrouping(originalActivity.getGrouping());
-    	newOptionsActivity.setGroupingUIID(originalActivity.getGroupingUIID());
-    	newOptionsActivity.setDefineLater(originalActivity.getDefineLater());
-    	newOptionsActivity.setLearningLibrary(originalActivity.getLearningLibrary());
+    	newOptionsActivity.setGrouping(this.getGrouping());
+    	newOptionsActivity.setGroupingUIID(this.getGroupingUIID());
+    	newOptionsActivity.setDefineLater(this.getDefineLater());
+    	newOptionsActivity.setLearningLibrary(this.getLearningLibrary());
     	newOptionsActivity.setCreateDateTime(new Date());
-    	newOptionsActivity.setRunOffline(originalActivity.getRunOffline());
-    	newOptionsActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage());
-    	newOptionsActivity.setLibraryActivity(originalActivity.getLibraryActivity());
+    	newOptionsActivity.setRunOffline(this.getRunOffline());
+    	newOptionsActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());
+    	newOptionsActivity.setLibraryActivity(this.getLibraryActivity());
     	return newOptionsActivity;
     }
 
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java	(.../ParallelActivity.java)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java	(.../ParallelActivity.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -108,36 +108,34 @@
     }
     /**
      * Makes a copy of the ParallelActivity for authoring, preview and monitoring enviornment 
-     * 
-     * @param originalActivity The activity that needs to be deep-copied
      * @return ParallelActivity Returns a deep-copy of the originalActivity
      */
-    public static ParallelActivity createCopy(ParallelActivity originalActivity){
+    public Activity createCopy(){
     	
     	ParallelActivity newParallelActivity = new ParallelActivity();
     	
-    	newParallelActivity.setActivityUIID(originalActivity.getActivityUIID());
-    	newParallelActivity.setDescription(originalActivity.getDescription());
-    	newParallelActivity.setTitle(originalActivity.getTitle());
-    	newParallelActivity.setHelpText(originalActivity.getHelpText());
-    	newParallelActivity.setXcoord(originalActivity.getXcoord());
-    	newParallelActivity.setYcoord(originalActivity.getYcoord());
-    	newParallelActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+    	newParallelActivity.setActivityUIID(this.getActivityUIID());
+    	newParallelActivity.setDescription(this.getDescription());
+    	newParallelActivity.setTitle(this.getTitle());
+    	newParallelActivity.setHelpText(this.getHelpText());
+    	newParallelActivity.setXcoord(this.getXcoord());
+    	newParallelActivity.setYcoord(this.getYcoord());
+    	newParallelActivity.setActivityTypeId(this.getActivityTypeId());
     	
-    	newParallelActivity.setGroupingSupportType(originalActivity.getGroupingSupportType());
-    	newParallelActivity.setApplyGrouping(originalActivity.getApplyGrouping());
-    	newParallelActivity.setActivityCategoryID(originalActivity.getActivityCategoryID());
+    	newParallelActivity.setGroupingSupportType(this.getGroupingSupportType());
+    	newParallelActivity.setApplyGrouping(this.getApplyGrouping());
+    	newParallelActivity.setActivityCategoryID(this.getActivityCategoryID());
     	
-    	newParallelActivity.setGrouping(originalActivity.getGrouping());
-    	newParallelActivity.setLearningLibrary(originalActivity.getLearningLibrary());
-    	newParallelActivity.setGroupingUIID(originalActivity.getGroupingUIID());
+    	newParallelActivity.setGrouping(this.getGrouping());
+    	newParallelActivity.setLearningLibrary(this.getLearningLibrary());
+    	newParallelActivity.setGroupingUIID(this.getGroupingUIID());
     	
-    	newParallelActivity.setDefineLater(originalActivity.getDefineLater());
+    	newParallelActivity.setDefineLater(this.getDefineLater());
     	newParallelActivity.setCreateDateTime(new Date());
-    	newParallelActivity.setRunOffline(originalActivity.getRunOffline());
+    	newParallelActivity.setRunOffline(this.getRunOffline());
     	
-    	newParallelActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage());    	
-    	newParallelActivity.setLibraryActivity(originalActivity.getLibraryActivity());		
+    	newParallelActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());    	
+    	newParallelActivity.setLibraryActivity(this.getLibraryActivity());		
     	
     	return newParallelActivity;
     }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java	(.../PermissionGateActivity.java)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java	(.../PermissionGateActivity.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -118,36 +118,34 @@
     }
     /**
      * Makes a copy of the PermissionGateActivity for authoring, preview and monitoring enviornment 
-     * 
-     * @param originalActivity The activity that needs to be deep-copied
      * @return PermissionGateActivity Returns a deep-copy of the originalActivity
      */
-    public static PermissionGateActivity createCopy(PermissionGateActivity originalActivity){
+    public Activity createCopy(){
     	PermissionGateActivity newPermissionGateActivity = new PermissionGateActivity();
     	
     	newPermissionGateActivity.setGateOpen(new Boolean(false));
-    	newPermissionGateActivity.setGateActivityLevelId(originalActivity.getGateActivityLevelId());
+    	newPermissionGateActivity.setGateActivityLevelId(this.getGateActivityLevelId());
     	
-    	newPermissionGateActivity.setActivityUIID(originalActivity.getActivityUIID());
-    	newPermissionGateActivity.setDescription(originalActivity.getDescription());
-    	newPermissionGateActivity.setTitle(originalActivity.getTitle());
-    	newPermissionGateActivity.setHelpText(originalActivity.getHelpText());
-    	newPermissionGateActivity.setXcoord(originalActivity.getXcoord());
-    	newPermissionGateActivity.setYcoord(originalActivity.getYcoord());
-    	newPermissionGateActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+    	newPermissionGateActivity.setActivityUIID(this.getActivityUIID());
+    	newPermissionGateActivity.setDescription(this.getDescription());
+    	newPermissionGateActivity.setTitle(this.getTitle());
+    	newPermissionGateActivity.setHelpText(this.getHelpText());
+    	newPermissionGateActivity.setXcoord(this.getXcoord());
+    	newPermissionGateActivity.setYcoord(this.getYcoord());
+    	newPermissionGateActivity.setActivityTypeId(this.getActivityTypeId());
     	
-    	newPermissionGateActivity.setGroupingSupportType(originalActivity.getGroupingSupportType());
-    	newPermissionGateActivity.setApplyGrouping(originalActivity.getApplyGrouping());
-    	newPermissionGateActivity.setActivityCategoryID(originalActivity.getActivityCategoryID());
+    	newPermissionGateActivity.setGroupingSupportType(this.getGroupingSupportType());
+    	newPermissionGateActivity.setApplyGrouping(this.getApplyGrouping());
+    	newPermissionGateActivity.setActivityCategoryID(this.getActivityCategoryID());
     	
-    	newPermissionGateActivity.setGrouping(originalActivity.getGrouping());
-    	newPermissionGateActivity.setGroupingUIID(originalActivity.getGroupingUIID());
-    	newPermissionGateActivity.setLearningLibrary(originalActivity.getLearningLibrary());    	
-    	newPermissionGateActivity.setDefineLater(originalActivity.getDefineLater());
+    	newPermissionGateActivity.setGrouping(this.getGrouping());
+    	newPermissionGateActivity.setGroupingUIID(this.getGroupingUIID());
+    	newPermissionGateActivity.setLearningLibrary(this.getLearningLibrary());    	
+    	newPermissionGateActivity.setDefineLater(this.getDefineLater());
     	newPermissionGateActivity.setCreateDateTime(new Date());
-    	newPermissionGateActivity.setRunOffline(originalActivity.getRunOffline());
-    	newPermissionGateActivity.setLibraryActivity(originalActivity.getLibraryActivity());
-    	newPermissionGateActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage());    	
+    	newPermissionGateActivity.setRunOffline(this.getRunOffline());
+    	newPermissionGateActivity.setLibraryActivity(this.getLibraryActivity());
+    	newPermissionGateActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());    	
     	return newPermissionGateActivity;
     	
     }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java
===================================================================
diff -u -r55901923afea1cbd769d8daa05051aa050bb99b6 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java	(.../RandomGrouping.java)	(revision 55901923afea1cbd769d8daa05051aa050bb99b6)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java	(.../RandomGrouping.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -96,20 +96,17 @@
         return true;
     }
     /**
-     * This method creates a deep copy of the Grouping passed
-     * as an argument.
-     * 
-     * @param originalGrouping The Grouping object to be deep copied
+     * This method creates a deep copy of the Grouping 
      * @return RandomGrouping The deep copied Grouping object
      */
-    public static RandomGrouping createCopy(RandomGrouping originalGrouping){
+    public Grouping createCopy(){
     	RandomGrouping randomGrouping = new RandomGrouping();
     	
-    	randomGrouping.setMaxNumberOfGroups(originalGrouping.getMaxNumberOfGroups());
-    	randomGrouping.setGroupingUIID(originalGrouping.getGroupingUIID());
+    	randomGrouping.setMaxNumberOfGroups(this.getMaxNumberOfGroups());
+    	randomGrouping.setGroupingUIID(this.getGroupingUIID());
     	
-    	randomGrouping.setNumberOfGroups(originalGrouping.getNumberOfGroups());
-    	randomGrouping.setLearnersPerGroup(originalGrouping.getLearnersPerGroup());    	
+    	randomGrouping.setNumberOfGroups(this.getNumberOfGroups());
+    	randomGrouping.setLearnersPerGroup(this.getLearnersPerGroup());    	
     	return randomGrouping;
     }
 
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java	(.../ScheduleGateActivity.java)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java	(.../ScheduleGateActivity.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -176,41 +176,39 @@
     }
     /**
      * Makes a copy of the ScheduleGateActivity for authoring, preview and monitoring enviornment 
-     * 
-     * @param originalActivity The activity that needs to be deep-copied
      * @return ScheduleGateActivity Returns a deep-copy of the originalActivity
      */
-    public static ScheduleGateActivity createCopy(ScheduleGateActivity originalActivity){
+    public Activity createCopy(){
     	ScheduleGateActivity newScheduleGateActivity = new ScheduleGateActivity();
     	
-    	newScheduleGateActivity.setGateActivityLevelId(originalActivity.getGateActivityLevelId());
+    	newScheduleGateActivity.setGateActivityLevelId(this.getGateActivityLevelId());
     	newScheduleGateActivity.setGateOpen(new Boolean(false));
     	
-    	newScheduleGateActivity.setGateEndTimeOffset(originalActivity.getGateEndTimeOffset());
-    	newScheduleGateActivity.setGateStartTimeOffset(originalActivity.getGateStartTimeOffset());
-    	newScheduleGateActivity.setGateEndDateTime(originalActivity.getGateEndDateTime());
-		newScheduleGateActivity.setGateStartDateTime(originalActivity.getGateStartDateTime());
+    	newScheduleGateActivity.setGateEndTimeOffset(this.getGateEndTimeOffset());
+    	newScheduleGateActivity.setGateStartTimeOffset(this.getGateStartTimeOffset());
+    	newScheduleGateActivity.setGateEndDateTime(this.getGateEndDateTime());
+		newScheduleGateActivity.setGateStartDateTime(this.getGateStartDateTime());
 		
-    	newScheduleGateActivity.setActivityUIID(originalActivity.getActivityUIID());
-    	newScheduleGateActivity.setDescription(originalActivity.getDescription());
-    	newScheduleGateActivity.setTitle(originalActivity.getTitle());
-    	newScheduleGateActivity.setHelpText(originalActivity.getHelpText());
-    	newScheduleGateActivity.setXcoord(originalActivity.getXcoord());
-    	newScheduleGateActivity.setYcoord(originalActivity.getYcoord());
-    	newScheduleGateActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+    	newScheduleGateActivity.setActivityUIID(this.getActivityUIID());
+    	newScheduleGateActivity.setDescription(this.getDescription());
+    	newScheduleGateActivity.setTitle(this.getTitle());
+    	newScheduleGateActivity.setHelpText(this.getHelpText());
+    	newScheduleGateActivity.setXcoord(this.getXcoord());
+    	newScheduleGateActivity.setYcoord(this.getYcoord());
+    	newScheduleGateActivity.setActivityTypeId(this.getActivityTypeId());
     	
-    	newScheduleGateActivity.setGroupingSupportType(originalActivity.getGroupingSupportType());
-    	newScheduleGateActivity.setApplyGrouping(originalActivity.getApplyGrouping());
-    	newScheduleGateActivity.setActivityCategoryID(originalActivity.getActivityCategoryID());
+    	newScheduleGateActivity.setGroupingSupportType(this.getGroupingSupportType());
+    	newScheduleGateActivity.setApplyGrouping(this.getApplyGrouping());
+    	newScheduleGateActivity.setActivityCategoryID(this.getActivityCategoryID());
     	
-    	newScheduleGateActivity.setGrouping(originalActivity.getGrouping());
-    	newScheduleGateActivity.setGroupingUIID(originalActivity.getGroupingUIID());
-    	newScheduleGateActivity.setLearningLibrary(originalActivity.getLearningLibrary());    	
-    	newScheduleGateActivity.setDefineLater(originalActivity.getDefineLater());
+    	newScheduleGateActivity.setGrouping(this.getGrouping());
+    	newScheduleGateActivity.setGroupingUIID(this.getGroupingUIID());
+    	newScheduleGateActivity.setLearningLibrary(this.getLearningLibrary());    	
+    	newScheduleGateActivity.setDefineLater(this.getDefineLater());
     	newScheduleGateActivity.setCreateDateTime(new Date());
-    	newScheduleGateActivity.setRunOffline(originalActivity.getRunOffline());
-    	newScheduleGateActivity.setLibraryActivity(originalActivity.getLibraryActivity());
-    	newScheduleGateActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage());
+    	newScheduleGateActivity.setRunOffline(this.getRunOffline());
+    	newScheduleGateActivity.setLibraryActivity(this.getLibraryActivity());
+    	newScheduleGateActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());
     	
     	return newScheduleGateActivity;
     }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java	(.../SequenceActivity.java)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java	(.../SequenceActivity.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -111,34 +111,32 @@
     
     /**
      * Makes a copy of the SequenceActivity for authoring, preview and monitoring enviornment
-     * 
-     * @param originalActivity The activity that needs to be deep-copied
      * @return SequenceActivity Returns a deep-copy of the originalActivity
      */
-    public static SequenceActivity createCopy(SequenceActivity originalActivity){
+    public Activity createCopy(){
     	SequenceActivity newSequenceActivity = new SequenceActivity();
     	
-    	newSequenceActivity.setActivityUIID(originalActivity.getActivityUIID());
-    	newSequenceActivity.setDescription(originalActivity.getDescription());
-    	newSequenceActivity.setTitle(originalActivity.getTitle());
-    	newSequenceActivity.setHelpText(originalActivity.getHelpText());
-    	newSequenceActivity.setXcoord(originalActivity.getXcoord());
-    	newSequenceActivity.setYcoord(originalActivity.getYcoord());
-    	newSequenceActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+    	newSequenceActivity.setActivityUIID(this.getActivityUIID());
+    	newSequenceActivity.setDescription(this.getDescription());
+    	newSequenceActivity.setTitle(this.getTitle());
+    	newSequenceActivity.setHelpText(this.getHelpText());
+    	newSequenceActivity.setXcoord(this.getXcoord());
+    	newSequenceActivity.setYcoord(this.getYcoord());
+    	newSequenceActivity.setActivityTypeId(this.getActivityTypeId());
     	
-    	newSequenceActivity.setGroupingSupportType(originalActivity.getGroupingSupportType());
-    	newSequenceActivity.setApplyGrouping(originalActivity.getApplyGrouping());
-    	newSequenceActivity.setActivityCategoryID(originalActivity.getActivityCategoryID());
+    	newSequenceActivity.setGroupingSupportType(this.getGroupingSupportType());
+    	newSequenceActivity.setApplyGrouping(this.getApplyGrouping());
+    	newSequenceActivity.setActivityCategoryID(this.getActivityCategoryID());
     	
-    	newSequenceActivity.setGrouping(originalActivity.getGrouping());
-    	newSequenceActivity.setGroupingUIID(originalActivity.getGroupingUIID());
-    	newSequenceActivity.setLearningLibrary(originalActivity.getLearningLibrary());
-    	newSequenceActivity.setDefineLater(originalActivity.getDefineLater());
+    	newSequenceActivity.setGrouping(this.getGrouping());
+    	newSequenceActivity.setGroupingUIID(this.getGroupingUIID());
+    	newSequenceActivity.setLearningLibrary(this.getLearningLibrary());
+    	newSequenceActivity.setDefineLater(this.getDefineLater());
     	newSequenceActivity.setCreateDateTime(new Date());
-    	newSequenceActivity.setRunOffline(originalActivity.getRunOffline());
+    	newSequenceActivity.setRunOffline(this.getRunOffline());
     	
-    	newSequenceActivity.setLibraryActivity(originalActivity.getLibraryActivity());
-		newSequenceActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage());    	
+    	newSequenceActivity.setLibraryActivity(this.getLibraryActivity());
+		newSequenceActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());    	
     	
 		return newSequenceActivity;
     }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java	(.../SimpleActivity.java)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java	(.../SimpleActivity.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -24,7 +24,11 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.lamsfoundation.lams.learningdesign.dto.MonitoringActivityDTO;
 import org.lamsfoundation.lams.learningdesign.strategy.SimpleActivityStrategy;
 
 
@@ -109,7 +113,14 @@
     }
 
     
-	public Integer[] getContributionType(){
-		return simpleActivityStrategy.getContributionType();
+	public Set getMonitoringActivityDTO()
+	{
+		HashSet dtoSet = new HashSet();
+		Integer[] contributionType = simpleActivityStrategy.getContributionType();
+		for(int i=0;i<contributionType.length;i++){
+			dtoSet.add(new MonitoringActivityDTO(this,contributionType[i]));
+		}
+		return dtoSet;
 	}
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java	(.../SynchGateActivity.java)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java	(.../SynchGateActivity.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -116,36 +116,34 @@
     
     /**
      * Makes a copy of the SynchGateActivity for authoring, preview and monitoring enviornment 
-     * 
-     * @param originalActivity The activity that needs to be deep-copied
      * @return SynchGateActivity Returns a deep-copy of the originalActivity
      */    
-    public static SynchGateActivity createCopy(SynchGateActivity originalActivity){
+    public Activity createCopy() {
     	SynchGateActivity newSynchGateActivity = new SynchGateActivity();
     	
-    	newSynchGateActivity.setGateActivityLevelId(originalActivity.getGateActivityLevelId());
+    	newSynchGateActivity.setGateActivityLevelId(this.getGateActivityLevelId());
     	newSynchGateActivity.setGateOpen(new Boolean(false));
     	
-    	newSynchGateActivity.setActivityUIID(originalActivity.getActivityUIID());
-    	newSynchGateActivity.setDescription(originalActivity.getDescription());
-    	newSynchGateActivity.setTitle(originalActivity.getTitle());
-    	newSynchGateActivity.setHelpText(originalActivity.getHelpText());    	
-    	newSynchGateActivity.setXcoord(originalActivity.getXcoord());
-    	newSynchGateActivity.setYcoord(originalActivity.getYcoord());
-    	newSynchGateActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+    	newSynchGateActivity.setActivityUIID(this.getActivityUIID());
+    	newSynchGateActivity.setDescription(this.getDescription());
+    	newSynchGateActivity.setTitle(this.getTitle());
+    	newSynchGateActivity.setHelpText(this.getHelpText());    	
+    	newSynchGateActivity.setXcoord(this.getXcoord());
+    	newSynchGateActivity.setYcoord(this.getYcoord());
+    	newSynchGateActivity.setActivityTypeId(this.getActivityTypeId());
     	
-    	newSynchGateActivity.setGroupingSupportType(originalActivity.getGroupingSupportType());
-    	newSynchGateActivity.setApplyGrouping(originalActivity.getApplyGrouping());
-    	newSynchGateActivity.setActivityCategoryID(originalActivity.getActivityCategoryID());
+    	newSynchGateActivity.setGroupingSupportType(this.getGroupingSupportType());
+    	newSynchGateActivity.setApplyGrouping(this.getApplyGrouping());
+    	newSynchGateActivity.setActivityCategoryID(this.getActivityCategoryID());
     	
-    	newSynchGateActivity.setGrouping(originalActivity.getGrouping());
-    	newSynchGateActivity.setGroupingUIID(originalActivity.getGroupingUIID());
-    	newSynchGateActivity.setLearningLibrary(originalActivity.getLearningLibrary());
-    	newSynchGateActivity.setDefineLater(originalActivity.getDefineLater());
+    	newSynchGateActivity.setGrouping(this.getGrouping());
+    	newSynchGateActivity.setGroupingUIID(this.getGroupingUIID());
+    	newSynchGateActivity.setLearningLibrary(this.getLearningLibrary());
+    	newSynchGateActivity.setDefineLater(this.getDefineLater());
     	newSynchGateActivity.setCreateDateTime(new Date());
-    	newSynchGateActivity.setRunOffline(originalActivity.getRunOffline());
-    	newSynchGateActivity.setLibraryActivity(originalActivity.getLibraryActivity());
-    	newSynchGateActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage());
+    	newSynchGateActivity.setRunOffline(this.getRunOffline());
+    	newSynchGateActivity.setLibraryActivity(this.getLibraryActivity());
+    	newSynchGateActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());
     	
     	return newSynchGateActivity;    	
     }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java	(.../ToolActivity.java)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java	(.../ToolActivity.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -136,35 +136,34 @@
     /**
      * Makes a copy of the ToolActivity for authoring, preview and monitoring enviornment 
      * 
-     * @param originalActivity The activity that needs to be deep-copied
      * @return ToolActivity Returns a deep-copy of the originalActivity
      */
-    public static ToolActivity createCopy(ToolActivity originalActivity){    	
+    public Activity createCopy(){    	
     	ToolActivity newToolActivity = new ToolActivity();
     	 
-		newToolActivity.setTool(originalActivity.getTool());
-		newToolActivity.setToolContentId(originalActivity.getToolContentId());    	
-		newToolActivity.setActivityUIID(originalActivity.getActivityUIID());
-    	newToolActivity.setDescription(originalActivity.getDescription());
-    	newToolActivity.setTitle(originalActivity.getTitle());
-    	newToolActivity.setHelpText(originalActivity.getHelpText());
-    	newToolActivity.setXcoord(originalActivity.getXcoord());
-    	newToolActivity.setYcoord(originalActivity.getYcoord());
-    	newToolActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+		newToolActivity.setTool(this.getTool());
+		newToolActivity.setToolContentId(this.getToolContentId());    	
+		newToolActivity.setActivityUIID(this.getActivityUIID());
+    	newToolActivity.setDescription(this.getDescription());
+    	newToolActivity.setTitle(this.getTitle());
+    	newToolActivity.setHelpText(this.getHelpText());
+    	newToolActivity.setXcoord(this.getXcoord());
+    	newToolActivity.setYcoord(this.getYcoord());
+    	newToolActivity.setActivityTypeId(this.getActivityTypeId());
     	
-    	newToolActivity.setGroupingSupportType(originalActivity.getGroupingSupportType());
-    	newToolActivity.setApplyGrouping(originalActivity.getApplyGrouping());
-    	newToolActivity.setGrouping(originalActivity.getGrouping());
+    	newToolActivity.setGroupingSupportType(this.getGroupingSupportType());
+    	newToolActivity.setApplyGrouping(this.getApplyGrouping());
+    	newToolActivity.setGrouping(this.getGrouping());
     	
-    	newToolActivity.setGroupingUIID(originalActivity.getGroupingUIID());
-    	newToolActivity.setOrderId(originalActivity.getOrderId());
-    	newToolActivity.setDefineLater(originalActivity.getDefineLater());
-    	newToolActivity.setLearningLibrary(originalActivity.getLearningLibrary());
+    	newToolActivity.setGroupingUIID(this.getGroupingUIID());
+    	newToolActivity.setOrderId(this.getOrderId());
+    	newToolActivity.setDefineLater(this.getDefineLater());
+    	newToolActivity.setLearningLibrary(this.getLearningLibrary());
     	newToolActivity.setCreateDateTime(new Date());
-    	newToolActivity.setRunOffline(originalActivity.getRunOffline());
-    	newToolActivity.setActivityCategoryID(originalActivity.getActivityCategoryID());
-    	newToolActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage());
-    	newToolActivity.setLibraryActivity(originalActivity.getLibraryActivity());
+    	newToolActivity.setRunOffline(this.getRunOffline());
+    	newToolActivity.setActivityCategoryID(this.getActivityCategoryID());
+    	newToolActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());
+    	newToolActivity.setLibraryActivity(this.getLibraryActivity());
     	return newToolActivity;
     }    
     
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java	(.../IActivityDAO.java)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java	(.../IActivityDAO.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -47,6 +47,15 @@
 	public Activity getActivityByActivityId(Long activityId);
 	
 	/**
+	 * Returns an object that may be assigned to the Class clasz.
+	 * Returns a true Activity object, rather than the Hibernate CGLIB proxy.
+	 * @param activityId The activityId of the activity
+	 * @param clasz The expected class - must be a subclass of Activity
+	 * @return Activity populated object
+	 */
+	public Activity getActivityByActivityId(Long activityId, Class clasz);
+
+	/**
 	 * @param uiID The internal id (flash generated) of the activity 
 	 * 		  being looked for 
 	 * @param design The learning_design_id of the design 
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java	(.../ActivityDAO.java)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java	(.../ActivityDAO.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -71,21 +71,21 @@
 			if ( activityType != null ) {
 				switch ( activityType.intValue() ) {
 					case Activity.TOOL_ACTIVITY_TYPE: 
-							return (ToolActivity) super.find(ToolActivity.class,activityId);
+							return getActivityByActivityId(activityId,ToolActivity.class);
 					case Activity.GROUPING_ACTIVITY_TYPE: 
-							return (GroupingActivity) super.find(GroupingActivity.class,activityId);
+							return getActivityByActivityId(activityId,GroupingActivity.class);
 					case Activity.SYNCH_GATE_ACTIVITY_TYPE: 
-							return (SynchGateActivity) super.find(SynchGateActivity.class,activityId);
+							return getActivityByActivityId(activityId,SynchGateActivity.class);
 					case Activity.SCHEDULE_GATE_ACTIVITY_TYPE: 
-							return (ScheduleGateActivity) super.find(ScheduleGateActivity.class,activityId);
+							return getActivityByActivityId(activityId,ScheduleGateActivity.class);
 					case Activity.PERMISSION_GATE_ACTIVITY_TYPE: 
-							return (PermissionGateActivity) super.find(PermissionGateActivity.class,activityId);
+							return getActivityByActivityId(activityId,PermissionGateActivity.class);
 					case Activity.PARALLEL_ACTIVITY_TYPE: 
-							return (ParallelActivity) super.find(ParallelActivity.class,activityId);
+							return getActivityByActivityId(activityId,ParallelActivity.class);
 					case Activity.OPTIONS_ACTIVITY_TYPE: 
-							return (OptionsActivity) super.find(OptionsActivity.class,activityId);
+							return getActivityByActivityId(activityId,OptionsActivity.class);
 					case Activity.SEQUENCE_ACTIVITY_TYPE: 
-							return (SequenceActivity) super.find(SequenceActivity.class,activityId);
+							return getActivityByActivityId(activityId,SequenceActivity.class);
 					default: break; 
 				}
 			}
@@ -95,6 +95,13 @@
 	}
 
 	/* 
+	 * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IActivityDAO#getActivityById(java.lang.Long)
+	 */
+	public Activity getActivityByActivityId(Long activityId, Class clasz) {
+		return (Activity) super.find(clasz,activityId);
+	}
+
+	/* 
 	 * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IActivityDAO#getActivityByParentActivityId(java.lang.Long)
 	 */
 	public List getActivitiesByParentActivityId(Long parentActivityId) {
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
===================================================================
diff -u -rb3dbc137e110d79b6aae154a808b7ca6e7de403d -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java	(.../AuthoringActivityDTO.java)	(revision b3dbc137e110d79b6aae154a808b7ca6e7de403d)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java	(.../AuthoringActivityDTO.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -221,9 +221,8 @@
 		this.groupingType = groupingType;
 		this.groupingDTO = groupingDTO;
 	}
-	public AuthoringActivityDTO(Object object){
-		processActivityType(object);
-		Activity activity = (Activity)object;
+	public AuthoringActivityDTO(Activity activity){
+		processActivityType(activity);
 		this.activityID = activity.getActivityId();
 		this.activityUIID = activity.getActivityUIID();
 		this.description = activity.getDescription();
@@ -263,20 +262,20 @@
 	
 	
 
-	private  void processActivityType(Object activity){
-		if(activity instanceof GroupingActivity)
+	private  void processActivityType(Activity activity){
+		if(activity.isGroupingActivity())
 			 addGroupingActivityAttributes((GroupingActivity)activity);
-		else if(activity instanceof ToolActivity)
+		else if(activity.isToolActivity())
 			 addToolActivityAttributes((ToolActivity)activity);
-		else if(activity instanceof GateActivity)
+		else if(activity.isGateActivity())
 			 addGateActivityAttributes(activity);
 		else 			
 			 addComplexActivityAttributes(activity);		
 	}
-	private void addComplexActivityAttributes(Object activity){		
-		if(activity instanceof OptionsActivity)
+	private void addComplexActivityAttributes(Activity activity){		
+		if(activity.isOptionsActivity())
 			addOptionsActivityAttributes((OptionsActivity)activity);
-		else if (activity instanceof ParallelActivity)
+		else if (activity.isParallelActivity())
 			addParallelActivityAttributes((ParallelActivity)activity);
 		else
 			addSequenceActivityAttributes((SequenceActivity)activity);
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
===================================================================
diff -u -rb3dbc137e110d79b6aae154a808b7ca6e7de403d -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java	(.../LearningDesignDTO.java)	(revision b3dbc137e110d79b6aae154a808b7ca6e7de403d)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java	(.../LearningDesignDTO.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -348,21 +348,20 @@
 		ArrayList childActivities = null;
 		Iterator parentIterator = design.getParentActivities().iterator();
 		while(parentIterator.hasNext()){
-			Object object = parentIterator.next();
+			Activity object = (Activity) parentIterator.next();
 			
-			if(object instanceof ComplexActivity){
+			if(object.isComplexActivity()){
 				ComplexActivity complexActivity = (ComplexActivity)object;
 				Iterator childIterator = complexActivity.getActivities().iterator();
 				childActivities = new ArrayList();
 				while(childIterator.hasNext()){
 					Activity activity =(Activity)childIterator.next();
 					childActivities.add(activity.getAuthoringActivityDTO());					
 				}				
-				activities.add(((Activity)complexActivity).getAuthoringActivityDTO());
+				activities.add(complexActivity.getAuthoringActivityDTO());
 				activities.addAll(childActivities);
 			}else{
-				Activity activity = (Activity)object;
-				activities.add(activity.getAuthoringActivityDTO());
+				activities.add(object.getAuthoringActivityDTO());
 			}			
 		}
 		return activities;
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java
===================================================================
diff -u -r8e98619391a7b227ca6d7f16b884e219149e4a23 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java	(.../MonitoringActivityDTO.java)	(revision 8e98619391a7b227ca6d7f16b884e219149e4a23)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java	(.../MonitoringActivityDTO.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -52,7 +52,7 @@
 		this.isRequired = new Boolean(calculateIsRequired(contributionType));
 	}
 	private boolean calculateIsRequired(Integer contributionType){
-		if(contributionType.equals(SimpleActivityStrategy.DEFINE_LATER) ||
+		if(contributionType!=null && contributionType.equals(SimpleActivityStrategy.DEFINE_LATER) ||
 				contributionType.equals(SimpleActivityStrategy.PERMISSION_GATE)||
 				contributionType.equals(SimpleActivityStrategy.CHOSEN_GROUPING))
 			return true;
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/LessonClass.java
===================================================================
diff -u -rdfed139a7289e34015731c0b41b2435a0b902b6f -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/lesson/LessonClass.java	(.../LessonClass.java)	(revision dfed139a7289e34015731c0b41b2435a0b902b6f)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/LessonClass.java	(.../LessonClass.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -7,8 +7,9 @@
 package org.lamsfoundation.lams.lesson;
 
 import java.util.Set;
-import org.lamsfoundation.lams.learningdesign.Grouping;
+
 import org.lamsfoundation.lams.learningdesign.Group;
+import org.lamsfoundation.lams.learningdesign.Grouping;
 
 /**
  * A type of Grouping that represents all the Learners in a Lesson. The
@@ -62,4 +63,16 @@
         return staffGroup.getGroupId()!=group.getGroupId();
     }
 
+    /**
+     * This method creates a deep copy of the LessonClass 
+     * @return LessonClass The deep copied LessonClass object
+     */
+    public Grouping createCopy()
+    {
+    	LessonClass lessonClass = new LessonClass();
+    	lessonClass.staffGroup = this.staffGroup;
+    	lessonClass.lesson = this.lesson;
+    	return lessonClass;
+    }
+
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
===================================================================
diff -u -r2b831e534444ad040546c3762a267a2f73e4199d -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	(.../LamsCoreToolService.java)	(revision 2b831e534444ad040546c3762a267a2f73e4199d)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	(.../LamsCoreToolService.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -20,6 +20,7 @@
 */
 package org.lamsfoundation.lams.tool.service;
 
+import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.Group;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
@@ -49,7 +50,9 @@
  */
 public class LamsCoreToolService implements ILamsCoreToolService,ApplicationContextAware
 {
-    //---------------------------------------------------------------------
+	private static final Logger log = Logger.getLogger(LamsCoreToolService.class);
+
+	//---------------------------------------------------------------------
     // Instance variables
     //---------------------------------------------------------------------
     private ApplicationContext context;
@@ -226,6 +229,15 @@
     {
         ToolSession toolSession = this.getToolSessionByActivity(learner,activity);
         
+        if ( toolSession == null ) {
+        	String error = "Unable to set up url as session does not exist. Activity "
+        		+(activity!=null?activity.getActivityId()+":"+activity.getTitle():"null")
+				+" learner "
+				+(learner!=null?learner.getUserId()+":"+learner.getLogin():"null");
+        	log.error(error);
+			throw new LamsToolServiceException(error);
+        }
+        
         return WebUtil.appendParameterToURL(toolURL,
                                             WebUtil.PARAM_TOOL_SESSION_ID,
                                             toolSession.getToolSessionId().toString());
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	(.../TestActivityDAO.java)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	(.../TestActivityDAO.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -98,27 +98,27 @@
 	}*/
 	public void testCreateToolActivityCopy(){
 		ToolActivity ta = (ToolActivity) activityDAO.getActivityByActivityId(new Long(20));
-		ToolActivity newToolActivity = ToolActivity.createCopy(ta);						
+		Activity newToolActivity = ta.createCopy();						
 		activityDAO.insert(newToolActivity);
 		assertNotNull(newToolActivity.getActivityId());
 	}
 	public void testCreateGroupingActivityCopy(){
 		GroupingActivity ga = (GroupingActivity) activityDAO.getActivityByActivityId(new Long(23));
-		GroupingActivity newGroupingActivity = null;
-		newGroupingActivity = GroupingActivity.createCopy(ga);			
+		Activity newGroupingActivity = null;
+		newGroupingActivity = ga.createCopy();			
 		activityDAO.insert(newGroupingActivity);
 		assertNotNull(newGroupingActivity.getActivityId());
 	}
 	public void testCreateOptionsActivityCopy(){
 		OptionsActivity oa = (OptionsActivity) activityDAO.getActivityByActivityId(new Long(12));
-		OptionsActivity optionsActivity =null;
-		optionsActivity = OptionsActivity.createCopy(oa);
+		Activity optionsActivity =null;
+		optionsActivity = oa.createCopy();
 		activityDAO.insert(optionsActivity);
 		assertNotNull(optionsActivity.getActivityId());		
 	}
 	public void testCreateParallelActivityCopy(){
 		ParallelActivity pa = (ParallelActivity) activityDAO.getActivityByActivityId(new Long(13));
-		ParallelActivity parallelActivity = ParallelActivity.createCopy(pa);
+		Activity parallelActivity = pa.createCopy();
 		activityDAO.insert(parallelActivity);
 		assertNotNull(parallelActivity.getActivityId());
 	}
Index: lams_monitoring/lib/lams/lams-tool-survey.jar
===================================================================
diff -u -r4ea4ebb1d2cf4a2a7a37944532c98d5a28c13ad3 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
Binary files differ
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -rf7b2dd6bd944a7f6286aeb748e999020b7b01a9b -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision f7b2dd6bd944a7f6286aeb748e999020b7b01a9b)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -34,12 +34,10 @@
 import org.lamsfoundation.lams.authoring.service.IAuthoringService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.Activity;
-import org.lamsfoundation.lams.learningdesign.ComplexActivity;
 import org.lamsfoundation.lams.learningdesign.GateActivity;
 import org.lamsfoundation.lams.learningdesign.Group;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.learningdesign.ScheduleGateActivity;
-import org.lamsfoundation.lams.learningdesign.SimpleActivity;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
 import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO;
 import org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO;
@@ -236,16 +234,18 @@
                                                                                   new Integer(LearningDesign.COPY_TYPE_LESSON),
                                                                                   user,
                                                                                   originalLearningDesign.getWorkspaceFolder());
-        //copy the tool content
+        // copy the tool content
+        // unfortuanately, we have to reaccess the activities to make sure we get the
+        // subclass, not a hibernate proxy.
         for (Iterator i = copiedLearningDesign.getActivities().iterator(); i.hasNext();)
         {
             Activity currentActivity = (Activity) i.next();
             if (currentActivity.isToolActivity())
             {
                 try {
-                    Long newContentId = newContentId = lamsCoreToolService.notifyToolToCopyContent((ToolActivity) currentActivity);
-                    ((ToolActivity) currentActivity).setToolContentId(newContentId);
-
+                	ToolActivity toolActivity = (ToolActivity) activityDAO.getActivityByActivityId(currentActivity.getActivityId());
+                    Long newContentId = lamsCoreToolService.notifyToolToCopyContent(toolActivity);
+                    toolActivity.setToolContentId(newContentId);
                 } catch (DataMissingException e) {
                     String error = "Unable to initialise the lesson. Data is missing for activity "+currentActivity.getActivityUIID()
                             +" in learning design "+learningDesignId
@@ -310,22 +310,27 @@
         Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId));
         Date lessonStartTime = new Date();
         //initialize tool sessions if necessary
-        for (Iterator i = requestedLesson.getLearningDesign()
-                                         .getActivities()
-                                         .iterator(); i.hasNext();)
+        Set activities = requestedLesson.getLearningDesign().getActivities();
+        for (Iterator i = activities.iterator(); i.hasNext();)
         {
             Activity activity = (Activity) i.next();
+            System.out.println(activity);
             //TODO this is for testing purpose as survey is the only tool available
             //so far.
-            if (shouldInitToolSessionFor(activity)&&this.isSurvey((ToolActivity)activity))
-                initToolSessionFor((ToolActivity) activity,
+            if ( activity.getActivityTypeId().intValue() == Activity.TOOL_ACTIVITY_TYPE ) {
+            	ToolActivity toolActivity = (ToolActivity) activityDAO.getActivityByActivityId(activity.getActivityId()); 
+				if (shouldInitToolSessionFor(toolActivity)&&this.isSurvey(toolActivity))
+					initToolSessionFor((ToolActivity) activity,
                                    requestedLesson.getAllLearners(),
                                    requestedLesson);
+            }
             //if it is schedule gate, we need to initialize the sheduler for it.
-            if(activity.getActivityTypeId().intValue()==Activity.SCHEDULE_GATE_ACTIVITY_TYPE)
-                runGateScheduler((ScheduleGateActivity)activity,lessonStartTime);
-        }
+            if(activity.getActivityTypeId().intValue() == Activity.SCHEDULE_GATE_ACTIVITY_TYPE) {
+            	ScheduleGateActivity gateActivity = (ScheduleGateActivity) activityDAO.getActivityByActivityId(activity.getActivityId());
+                runGateScheduler(gateActivity,lessonStartTime); 
+            }
         //update lesson status
+        }
         requestedLesson.setLessonStateId(Lesson.STARTED_STATE);
         requestedLesson.setStartDateTime(lessonStartTime);
         lessonDAO.updateLesson(requestedLesson);
@@ -340,8 +345,10 @@
     public GateActivity openGate(Long gateId)
     {
         GateActivity gate = (GateActivity)activityDAO.getActivityByActivityId(gateId);
-        gate.setGateOpen(new Boolean(true));
-        activityDAO.update(gate);
+        if ( gate != null ) {
+        	gate.setGateOpen(new Boolean(true));
+        	activityDAO.update(gate);
+        }
         return gate;
     }
 
@@ -744,13 +751,12 @@
      * can be initialized if the activity is tool activity and it doesn't 
      * involve any grouping.
      * 
-     * @param activity the activity that needs to be inspected.
+     * @param tool activity the activity that needs to be inspected.
      * @return the result.
      */
-    private boolean shouldInitToolSessionFor(Activity activity)
+    private boolean shouldInitToolSessionFor(ToolActivity activity)
     {
-        return activity.isToolActivity()
-                && !((ToolActivity) activity).getApplyGrouping().booleanValue();
+        return activity.getApplyGrouping().booleanValue();
     }
 
     /**
@@ -781,49 +787,44 @@
 	private Vector getOrderedActivityTree(LearningDesign learningDesign){
 		int order = 0;		
 		HashMap activityTree = learningDesign.getActivityTree();		
-		Vector activitySet = new Vector();		
+		Vector activityVector = new Vector();		
 		
-		Activity firstActivity = learningDesign.getFirstActivity();
-		firstActivity.setOrderId(new Integer(order));
-		order++;
-		
-		if(firstActivity.isComplexActivity()){			
-			ComplexActivity complexActivity = (ComplexActivity)firstActivity;			
-			Iterator childIterator = complexActivity.getActivities().iterator();
-			while(childIterator.hasNext()){
-				SimpleActivity simpleActivity= (SimpleActivity)childIterator.next();
-				activitySet.addAll(simpleActivity.getMonitoringActivityDTO(simpleActivity.getContributionType()));				
-			}		
-		}else{
-			SimpleActivity simpleActivity = (SimpleActivity)firstActivity;
-			if(simpleActivity.getContributionType().length!=0)
-				activitySet.addAll(simpleActivity.getMonitoringActivityDTO(simpleActivity.getContributionType()));
-		}
-		
-		
-		Activity nextActivity = transitionDAO.getNextActivity(firstActivity.getActivityId());
+		Activity nextActivity = learningDesign.getFirstActivity();
 		while(nextActivity!=null){
-			nextActivity.setOrderId(new Integer(order));
-			order++;			
-			Set childActiivities = (Set) activityTree.get(nextActivity.getActivityId());			
-			if(childActiivities.size()!=0){
-				Iterator iterator = childActiivities.iterator();
-				while(iterator.hasNext()){					
-					SimpleActivity simpleActivity= (SimpleActivity)iterator.next();
-					activitySet.addAll(simpleActivity.getMonitoringActivityDTO(simpleActivity.getContributionType()));
-				}
-			}else{
-				SimpleActivity simpleActivity = (SimpleActivity)nextActivity;
-				if(simpleActivity.getContributionType().length!=0)
-					activitySet.addAll(simpleActivity.getMonitoringActivityDTO(simpleActivity.getContributionType()));
-			}
-			
+			order = addActivityToVector(order, activityTree, activityVector, nextActivity);
 			nextActivity = transitionDAO.getNextActivity(nextActivity.getActivityId());	
 		}				
-		return activitySet;
+		return activityVector;
 	}	
 
-    //---------------------------------------------------------------------
+    /**
+     * Used by getOrderedActivityTree(LearningDesign learningDesign)
+     * 
+	 * @param order
+	 * @param activityTree
+	 * @param activityVector
+	 * @param nextActivity
+	 * @return
+	 */
+	private int addActivityToVector(int order, HashMap activityTree, Vector activityVector, Activity nextActivity) {
+		nextActivity.setOrderId(new Integer(order));
+		Set childActivities = (Set) activityTree.get(nextActivity.getActivityId());			
+		if(childActivities.size()!=0){
+			Iterator iterator = childActivities.iterator();
+			while(iterator.hasNext()){					
+				Activity simpleActivity= (Activity)iterator.next();
+				activityVector.add(simpleActivity.getMonitoringActivityDTO());
+			}
+		}else{
+			// we are assuming that this is a simple activity.
+			// the original code for this branch only added it if it had a valid contribution 
+			// type, but the code for the if branch above didn't. Can add it in 
+			// again later if it causes Flash problems.
+			activityVector.add(nextActivity.getMonitoringActivityDTO());
+		}
+		return order + 1;
+	}
+	//---------------------------------------------------------------------
     // Helper Methods - scheduling
     //---------------------------------------------------------------------
     /**
Fisheye: Tag 79c858a92c17ab3ca404cab4a0cf6094254e68d5 refers to a dead (removed) revision in file `lams_monitoring/test/web/WEB-INF/spring/applicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 79c858a92c17ab3ca404cab4a0cf6094254e68d5 refers to a dead (removed) revision in file `lams_monitoring/test/web/WEB-INF/spring/authoringApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 79c858a92c17ab3ca404cab4a0cf6094254e68d5 refers to a dead (removed) revision in file `lams_monitoring/test/web/WEB-INF/spring/learningApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 79c858a92c17ab3ca404cab4a0cf6094254e68d5 refers to a dead (removed) revision in file `lams_monitoring/test/web/WEB-INF/spring/monitoringApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_monitoring/test/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rb6df3bbcefaf4633858d1d3161063abc3b620e7e -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_monitoring/test/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision b6df3bbcefaf4633858d1d3161063abc3b620e7e)
+++ lams_monitoring/test/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -14,9 +14,12 @@
   <form-beans>
 
    <form-bean name="GateForm"  type="org.apache.struts.action.DynaActionForm">
+	<form-property name="gate" type="org.lamsfoundation.lams.learningdesign.GateActivity" />
 	<form-property name="activityId" type="java.lang.Long" />
-	<form-property name="waitingLearners" type="java.lang.Integer" />
+	<form-property name="waitingLearners" type="java.lang.Integer"/>
 	<form-property name="totalLearners" type="java.lang.Integer" />
+	<form-property name="startingTime" type="java.util.Date" />
+	<form-property name="endingTime" type="java.util.Date" />
 </form-bean>
 
   </form-beans>
@@ -64,7 +67,7 @@
       <exception
         key="error.system.monitor"
         type="org.lamsfoundation.lams.monitoring.service.MonitoringServiceException"
-        handler="org.lamsfoundation.lams.util.CustomStrutsExceptionHandler"
+        handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
         path=".systemError"
         scope="request"
       />
@@ -73,20 +76,25 @@
         path="/TestScheduler.jsp"
         redirect="false"
       />
+      <forward
+        name="success"
+        path="/index.jsp"
+        redirect="false"
+      />
     </action>
     <action
       path="/gate"
       type="org.lamsfoundation.lams.monitoring.web.GateAction"
       name="GateForm"
-      scope="request"
+      scope="session"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <exception
         key="error.system.monitor"
         type="org.lamsfoundation.lams.monitoring.service.MonitoringServiceException"
-        handler="org.lamsfoundation.lams.util.CustomStrutsExceptionHandler"
+        handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
         path=".systemError"
         scope="request"
       />
@@ -105,11 +113,6 @@
         path=".viewScheduleGate"
         redirect="false"
       />
-      <forward
-        name="openGate"
-        path=".openGate"
-        redirect="false"
-      />
     </action>
 
     <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
Index: lams_monitoring/test/web/WEB-INF/web.xml
===================================================================
diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -r79c858a92c17ab3ca404cab4a0cf6094254e68d5
--- lams_monitoring/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
+++ lams_monitoring/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
@@ -31,10 +31,13 @@
 <context-param>
 	<param-name>contextConfigLocation</param-name>
 	<param-value>
-		/WEB-INF/spring/applicationContext.xml /WEB-INF/spring/toolApplicationContext.xml
-		/WEB-INF/spring/monitoringApplicationContext.xml /WEB-INF/spring/lessonApplicationContext.xml
-		/WEB-INF/spring/authoringApplicationContext.xml	
-		/WEB-INF/spring/dataAccessContext.xml  /WEB-INF/spring/surveyApplicationContext.xml
+		classpath:/org/lamsfoundation/lams/applicationContext.xml
+		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
+		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
+  		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml        					  
+  		classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
+  		classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
+		classpath*:applicationContext.xml
 	</param-value>
 </context-param>
 
@@ -61,7 +64,7 @@
 
 <filter>
 	<filter-name>HibernateFilter</filter-name>
-	<filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
+	<filter-class>org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter</filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
 		<param-value>coreSessionFactory</param-value>
@@ -101,11 +104,11 @@
 	<url-pattern>*.jsp</url-pattern>
 </filter-mapping>
 
-    <!--
-    To use non XDoclet listeners, create a listeners.xml file that
-    contains the additional listeners and place it in your
-    project's merge dir.
-    -->
+  <listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+</listener>	
 
  <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
@@ -127,13 +130,7 @@
 
 http://www.gnu.org/licenses/gpl.txt
 -->
-
 <servlet>
-	<servlet-name>context</servlet-name>
-	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-<servlet>
     <servlet-name>action</servlet-name>
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
     <init-param>