Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouping.java
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -r2eeeb7da6fd05405ea0bdd511270423401536fa9
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouping.java	(.../ChosenGrouping.java)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouping.java	(.../ChosenGrouping.java)	(revision 2eeeb7da6fd05405ea0bdd511270423401536fa9)
@@ -20,9 +20,9 @@
     }
     
     /** full constructor */
-    public ChosenGrouping(Long groupingId, Integer groupingTypeId, Set groups, Set activities)
+    public ChosenGrouping(Long groupingId, Set groups, Set activities)
     {
-        super(groupingId, groupingTypeId, groups, activities);
+        super(groupingId, groups, activities);
     }
     
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
===================================================================
diff -u -r2962a623ecfbd3460df3e34aa323e0cdc65438bd -r2eeeb7da6fd05405ea0bdd511270423401536fa9
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java	(.../Grouping.java)	(revision 2962a623ecfbd3460df3e34aa323e0cdc65438bd)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java	(.../Grouping.java)	(revision 2eeeb7da6fd05405ea0bdd511270423401536fa9)
@@ -7,6 +7,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.lesson.LessonClass;
 
 
 /**
@@ -31,10 +32,8 @@
     /** nullable persistent field */
     private Integer maxNumberOfGroups;
     
+   
     /** persistent field */
-    private Integer groupingTypeId;
-    
-    /** persistent field */
     private Set groups;
     
     /** persistent field */
@@ -44,10 +43,9 @@
     private Set learners;
     
     /** full constructor */
-    public Grouping(Long groupingId, Integer groupingTypeId, Set groups, Set activities)
+    public Grouping(Long groupingId, Set groups, Set activities)
     {
         this.groupingId = groupingId;
-        this.groupingTypeId = groupingTypeId;
         this.groups = groups;
         this.activities = activities;
     }
@@ -58,10 +56,9 @@
     }
     
     /** minimal constructor */
-    public Grouping(Long groupingId, Integer groupingTypeId)
+    public Grouping(Long groupingId)
     {
         this.groupingId = groupingId;
-        this.groupingTypeId = groupingTypeId;
     }
     
     /**
@@ -86,14 +83,14 @@
      */
     public Integer getGroupingTypeId()
     {
-        return this.groupingTypeId;
+        if(this instanceof LessonClass)
+            return CLASS_GROUPING_TYPE;
+        else if(this instanceof ChosenGrouping)
+            return CHOSEN_GROUPING_TYPE;
+        else
+            return RANDOM_GROUPING_TYPE;
     }
-    
-    public void setGroupingTypeId(Integer groupingTypeId)
-    {
-        this.groupingTypeId = groupingTypeId;
-    }
-    
+
     /**
      *            
      *
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -r2eeeb7da6fd05405ea0bdd511270423401536fa9
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java	(.../RandomGrouping.java)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java	(.../RandomGrouping.java)	(revision 2eeeb7da6fd05405ea0bdd511270423401536fa9)
@@ -54,9 +54,9 @@
     }
     
     /** full constructor */
-    public RandomGrouping(Long groupingId, Integer groupingTypeId, Set groups, Set activities, Integer numberOfGroups, Integer learnersPerGroup)
+    public RandomGrouping(Long groupingId, Set groups, Set activities, Integer numberOfGroups, Integer learnersPerGroup)
     {
-        super(groupingId, groupingTypeId, groups, activities);
+        super(groupingId, groups, activities);
         this.learnersPerGroup = learnersPerGroup;
         this.numberOfGroups = numberOfGroups;
     }
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/LessonClass.java
===================================================================
diff -u -r1d40a310039a2975dc474f61e9a732f90f86c707 -r2eeeb7da6fd05405ea0bdd511270423401536fa9
--- lams_common/src/java/org/lamsfoundation/lams/lesson/LessonClass.java	(.../LessonClass.java)	(revision 1d40a310039a2975dc474f61e9a732f90f86c707)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/LessonClass.java	(.../LessonClass.java)	(revision 2eeeb7da6fd05405ea0bdd511270423401536fa9)
@@ -27,9 +27,9 @@
 	}
 	
 	/** full constructor */
-	public LessonClass(Long groupingId, Integer groupingTypeId, Set groups,
+	public LessonClass(Long groupingId, Set groups,
 			Set activities, Group staffGroup, Lesson lesson) {
-		super(groupingId, groupingTypeId, groups, activities);
+		super(groupingId, groups, activities);
 		this.staffGroup = staffGroup;
 		this.lesson = lesson;
 	}
Index: lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java
===================================================================
diff -u -r53f5c22785cd5d9d63e6c1557f460ba7314635e5 -r2eeeb7da6fd05405ea0bdd511270423401536fa9
--- lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java	(.../NonGroupedToolSession.java)	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java	(.../NonGroupedToolSession.java)	(revision 2eeeb7da6fd05405ea0bdd511270423401536fa9)
@@ -28,6 +28,9 @@
                                  User user)
     {
         super(null,toolActivity,createDateTime,toolSessionStateId);
+        super.setUniqueKey(UNIQUE_KEY_PREFIX
+                           +toolActivity.getActivityId().toString()
+                           +user.getUserId().toString());
         this.user=user;
     }
     /**default constructor*/
Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java
===================================================================
diff -u -r53f5c22785cd5d9d63e6c1557f460ba7314635e5 -r2eeeb7da6fd05405ea0bdd511270423401536fa9
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java	(.../ToolSession.java)	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java	(.../ToolSession.java)	(revision 2eeeb7da6fd05405ea0bdd511270423401536fa9)
@@ -26,6 +26,7 @@
     /** Tool session state id for completed tool session */
     public static final int ENDED_STATE = 2;
 
+    public static final String UNIQUE_KEY_PREFIX = "uq_";
     /** identifier field */
     private Long toolSessionId;
 
@@ -38,8 +39,6 @@
     /** persistent field */
     private int toolSessionStateId;
     
-    private int toolSessionTypeId;
-    
     private String uniqueKey;
 
     /** full constructor */
@@ -148,10 +147,9 @@
     }
 
 	public int getToolSessionTypeId() {
-		return toolSessionTypeId;
+	    if(this instanceof NonGroupedToolSession)
+	        return NON_GROUPED_TYPE;
+	    else
+	        return GROUPED_TYPE;
 	}
-	public void setToolSessionTypeId(int toolSessionTypeId) {
-		this.toolSessionTypeId = toolSessionTypeId;
-	}
-
 }
Index: lams_common/test/java/applicationContext.xml
===================================================================
diff -u -r53f5c22785cd5d9d63e6c1557f460ba7314635e5 -r2eeeb7da6fd05405ea0bdd511270423401536fa9
--- lams_common/test/java/applicationContext.xml	(.../applicationContext.xml)	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
+++ lams_common/test/java/applicationContext.xml	(.../applicationContext.xml)	(revision 2eeeb7da6fd05405ea0bdd511270423401536fa9)
@@ -72,7 +72,7 @@
 		<property name="hibernateProperties">
 			<props>
 				<prop key="hibernate.dialect">net.sf.hibernate.dialect.MySQLDialect</prop>
-				<prop key="hibernate.show_sql">true</prop>
+				<prop key="hibernate.show_sql">false</prop>
 				<prop key="hibernate.c3p0.minPoolSize">5</prop>
 				<prop key="hibernate.c3p0.maxPoolSize">20</prop>
 				<prop key="hibernate.c3p0.timeout">1800</prop>
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml
===================================================================
diff -u -r53f5c22785cd5d9d63e6c1557f460ba7314635e5 -r2eeeb7da6fd05405ea0bdd511270423401536fa9
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml	(.../learningDesignApplicationContext.xml)	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml	(.../learningDesignApplicationContext.xml)	(revision 2eeeb7da6fd05405ea0bdd511270423401536fa9)
@@ -25,5 +25,7 @@
 	<bean id="transitionDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO">
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
-	
+	<bean id="workspaceFolderDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceFolderDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
 </beans>
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java
===================================================================
diff -u -ra02cf86ad3b3bd9d16543ecd88628df98f87ac69 -r2eeeb7da6fd05405ea0bdd511270423401536fa9
--- lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	(.../LessonDataAccessTestCase.java)	(revision a02cf86ad3b3bd9d16543ecd88628df98f87ac69)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	(.../LessonDataAccessTestCase.java)	(revision 2eeeb7da6fd05405ea0bdd511270423401536fa9)
@@ -178,7 +178,6 @@
         //make a copy of lazily initialized activities
         Set activities = new HashSet(testLearningDesign.getActivities());
         testLessonClass = new LessonClass(null, //grouping id
-                                          Grouping.CLASS_GROUPING_TYPE,
                                           new HashSet(),//groups
                                           activities,
                                           null, //staff group 
Index: lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java
===================================================================
diff -u -r53f5c22785cd5d9d63e6c1557f460ba7314635e5 -r2eeeb7da6fd05405ea0bdd511270423401536fa9
--- lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	(.../ToolDataAccessTestCase.java)	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
+++ lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	(.../ToolDataAccessTestCase.java)	(revision 2eeeb7da6fd05405ea0bdd511270423401536fa9)
@@ -104,9 +104,6 @@
                                                   new Date(System.currentTimeMillis()),
                                                   ToolSession.STARTED_STATE,
                                                   testUser);
-        toolSession.setUniqueKey("uq_"
-                                   +testActivity.getActivityId().toString()
-                                   +testUser.getUserId().toString());
         return toolSession;
     }
     
Index: lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolSessionDAO.java
===================================================================
diff -u -r53f5c22785cd5d9d63e6c1557f460ba7314635e5 -r2eeeb7da6fd05405ea0bdd511270423401536fa9
--- lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolSessionDAO.java	(.../TestToolSessionDAO.java)	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
+++ lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolSessionDAO.java	(.../TestToolSessionDAO.java)	(revision 2eeeb7da6fd05405ea0bdd511270423401536fa9)
@@ -58,7 +58,7 @@
         
         assertNotNull(toolSession);
         assertEquals("verify tool session state",ToolSession.STARTED_STATE,toolSession.getToolSessionStateId());
-        //assertEquals("verify tool session type",ToolSession.NON_GROUPED_TYPE,toolSession.getToolSessionTypeId());
+        assertEquals("verify tool session type",ToolSession.NON_GROUPED_TYPE,toolSession.getToolSessionTypeId());
         assertNotNull(toolSession.getUser());
     }