Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java,v
diff -u -r1.25 -r1.26
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	13 Apr 2005 01:36:01 -0000	1.25
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	13 Apr 2005 07:07:50 -0000	1.26
@@ -24,7 +24,6 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
@@ -36,9 +35,7 @@
 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;
 /**
@@ -199,8 +196,7 @@
 	 */
 	public void setGroupingSupportType(Integer groupingSupportType) {
 		this.groupingSupportType = groupingSupportType;
-	}
-	protected ComplexActivityStrategy complexActivityStrategy;
+	}	
 	protected SimpleActivityStrategy simpleActivityStrategy;
 	
 	/** full constructor */
@@ -658,21 +654,12 @@
 	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()){
-			contributionType = ((SimpleActivity)activity).getContributionType();			
-			return new MonitoringActivityDTO(activity,contributionType);
-		}
-		else
-			return new MonitoringActivityDTO(activity);
-	}
 	public Vector getMonitoringActivityDTOSet(Set activities){
 		Vector children = new Vector();		
 		Iterator iterator = activities.iterator();
 		while(iterator.hasNext()){
 			Activity activity = (Activity)iterator.next();
-			children.add(getMonitoringActivityDTO(activity));
+			children.add(new MonitoringActivityDTO(activity));
 		}
 		return children;
 	}	
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestActivityDAO.java,v
diff -u -r1.13 -r1.14
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	13 Apr 2005 00:11:38 -0000	1.13
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	13 Apr 2005 07:08:02 -0000	1.14
@@ -81,12 +81,13 @@
 		boolean result = activity.isComplexActivity();
 		assertTrue(result);		
 	}
-	public void testGetContributionType(){
+	/*public void testGetContributionType(){
 		activity = activityDAO.getActivityByActivityId(new Long(18));
+		//activity.ge
 		HashSet set = activity.getContributionType();
 		assertTrue(set.size()>0);
 		
-	}
+	}*/
 	public void testCreateToolActivityCopy(){
 		activity = activityDAO.getActivityByActivityId(new Long(20));		
 		ToolActivity newToolActivity =null;
@@ -122,6 +123,15 @@
 			activityDAO.insert(parallelActivity);
 		}
 		assertNotNull(parallelActivity.getActivityId());
+	}
+
+
+	/* (non-Javadoc)
+	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+	 */
+	protected String getHibernateSessionFactoryName() {
+		// TODO Auto-generated method stub
+		return null;
 	}	
 }
 
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestLearningDesignDAO.java,v
diff -u -r1.9 -r1.10
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java	13 Apr 2005 00:11:38 -0000	1.9
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java	13 Apr 2005 07:08:02 -0000	1.10
@@ -67,5 +67,12 @@
 		LearningDesignDTO learningDesignDTO = learningDesign.getLearningDesignDTO();		
 		String str = WDDXProcessor.serialize(learningDesignDTO);
 		System.out.println(str);		
+	}
+	/* (non-Javadoc)
+	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+	 */
+	protected String getHibernateSessionFactoryName() {
+		// TODO Auto-generated method stub
+		return null;
 	}	
 }
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestLearningLibraryDAO.java,v
diff -u -r1.7 -r1.8
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java	13 Apr 2005 00:11:38 -0000	1.7
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java	13 Apr 2005 07:08:02 -0000	1.8
@@ -45,4 +45,12 @@
 		return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml",
 		 "WEB-INF/spring/applicationContext.xml"};
 	}
+
+	/* (non-Javadoc)
+	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+	 */
+	protected String getHibernateSessionFactoryName() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestTransitionDAO.java,v
diff -u -r1.9 -r1.10
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java	13 Apr 2005 00:11:38 -0000	1.9
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java	13 Apr 2005 07:08:02 -0000	1.10
@@ -43,4 +43,12 @@
 		return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml",
 		 "WEB-INF/spring/applicationContext.xml"};
 	}
+
+	/* (non-Javadoc)
+	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+	 */
+	protected String getHibernateSessionFactoryName() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAOTest.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/Attic/OrganisationDAOTest.java,v
diff -u -r1.2 -r1.3
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAOTest.java	13 Apr 2005 00:29:53 -0000	1.2
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAOTest.java	13 Apr 2005 07:08:12 -0000	1.3
@@ -42,5 +42,12 @@
 		return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml",
 		 "WEB-INF/spring/applicationContext.xml"};
 	}
+	/* (non-Javadoc)
+	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+	 */
+	protected String getHibernateSessionFactoryName() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 
 }
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/Attic/UserDAOTest.java,v
diff -u -r1.2 -r1.3
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java	13 Apr 2005 00:29:53 -0000	1.2
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java	13 Apr 2005 07:08:12 -0000	1.3
@@ -92,4 +92,11 @@
 		userOrganisationRoleDAO.saveUserOrganisationRole(userOrganisationRole);
 		return userOrganisationRole;
 	}
+	/* (non-Javadoc)
+	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+	 */
+	protected String getHibernateSessionFactoryName() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }
Index: lams_common/test/java/org/lamsfoundation/lams/workspace/TestWorkspaceManagement.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/workspace/Attic/TestWorkspaceManagement.java,v
diff -u -r1.1 -r1.2
--- lams_common/test/java/org/lamsfoundation/lams/workspace/TestWorkspaceManagement.java	13 Apr 2005 00:18:56 -0000	1.1
+++ lams_common/test/java/org/lamsfoundation/lams/workspace/TestWorkspaceManagement.java	13 Apr 2005 07:08:20 -0000	1.2
@@ -42,5 +42,12 @@
 		String packet = workspaceManagementService.copyFolder(new Integer(2),new Integer(8),new Integer(4));
 		System.out.println(packet);
 	}
+	/* (non-Javadoc)
+	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+	 */
+	protected String getHibernateSessionFactoryName() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 
 }