Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml
===================================================================
diff -u -ra71feb5790286722c6a32766ec76d3dc2e5b202f -r53f5c22785cd5d9d63e6c1557f460ba7314635e5
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml	(.../ToolSession.hbm.xml)	(revision a71feb5790286722c6a32766ec76d3dc2e5b202f)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml	(.../ToolSession.hbm.xml)	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
@@ -36,13 +36,6 @@
 			<column name="activity_id" />
 		</many-to-one>
 
-		<property name="toolSessionKey" type="long"
-			column="tool_session_key" not-null="true" length="20">
-			<meta attribute="field-description">
-				@hibernate.property column="tool_session_key"
-				length="20" not-null="true"
-			</meta>
-		</property>
 		<property name="createDateTime" type="java.sql.Timestamp"
 			column="create_date_time" not-null="true" length="19">
 			<meta attribute="field-description">
@@ -53,7 +46,9 @@
 
 		<property name="toolSessionStateId" type="int"
 			column="tool_session_state_id" />
-
+			
+    	<property name="uniqueKey" type="java.lang.String" column="unique_key" length="128" not-null="true"/>
+        
 		<subclass name="org.lamsfoundation.lams.tool.GroupedToolSession"
 			discriminator-value="1">
 			<many-to-one name="group"
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -r2c4f5ec7f89ba037ad45ea5c1475de60bd9ebca4 -r53f5c22785cd5d9d63e6c1557f460ba7314635e5
--- lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision 2c4f5ec7f89ba037ad45ea5c1475de60bd9ebca4)
+++ lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
@@ -365,9 +365,7 @@
 CREATE TABLE lams_tool_session (
        tool_session_id BIGINT(20) NOT NULL AUTO_INCREMENT
      , tool_session_type_id INT(3) NOT NULL
-     , lesson_id BIGINT(20) NOT NULL
      , activity_id BIGINT(20) NOT NULL
-     , tool_session_key BIGINT(20) NOT NULL
      , tool_session_state_id INT(3) NOT NULL
      , create_date_time DATETIME NOT NULL
      , group_id BIGINT(20)
@@ -387,9 +385,6 @@
      , INDEX (user_id)
      , CONSTRAINT FK_lams_tool_session_5 FOREIGN KEY (user_id)
                   REFERENCES lams_user (user_id)
-     , INDEX (lesson_id)
-     , CONSTRAINT FK_lams_tool_session_6 FOREIGN KEY (lesson_id)
-                  REFERENCES lams_lesson (lesson_id)
      , INDEX (tool_session_type_id)
      , CONSTRAINT FK_lams_tool_session_7 FOREIGN KEY (tool_session_type_id)
                   REFERENCES lams_tool_session_type (tool_session_type_id)
Index: lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java
===================================================================
diff -u -r0d96122b75237f61d8280741601bc350953d6b90 -r53f5c22785cd5d9d63e6c1557f460ba7314635e5
--- lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java	(.../NonGroupedToolSession.java)	(revision 0d96122b75237f61d8280741601bc350953d6b90)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java	(.../NonGroupedToolSession.java)	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
@@ -6,6 +6,9 @@
  */
 package org.lamsfoundation.lams.tool;
 
+import java.util.Date;
+
+import org.lamsfoundation.lams.learningdesign.ToolActivity;
 import org.lamsfoundation.lams.usermanagement.User;
 
 /**
@@ -19,9 +22,22 @@
     /** persistent field */
     private User user;
 
-	public User getUser() {
+    public NonGroupedToolSession(ToolActivity toolActivity,
+                                 Date createDateTime,
+                                 int toolSessionStateId,
+                                 User user)
+    {
+        super(null,toolActivity,createDateTime,toolSessionStateId);
+        this.user=user;
+    }
+    /**default constructor*/
+    public NonGroupedToolSession(){}
+    
+	public User getUser() 
+	{
 		return user;
 	}
+	
 	public void setUser(User user) {
 		this.user = user;
 	}
Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java
===================================================================
diff -u -r7e278b5aed3057000d9cb93c63a3521a8a769957 -r53f5c22785cd5d9d63e6c1557f460ba7314635e5
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java	(.../ToolSession.java)	(revision 7e278b5aed3057000d9cb93c63a3521a8a769957)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java	(.../ToolSession.java)	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
@@ -1,11 +1,9 @@
 package org.lamsfoundation.lams.tool;
 
-import org.lamsfoundation.lams.learningdesign.Group;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.Set;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -35,21 +33,22 @@
     private ToolActivity toolActivity;
 
     /** persistent field */
-    private long toolSessionKey;
-
-    /** persistent field */
     private Date createDateTime;
 
     /** persistent field */
     private int toolSessionStateId;
     
     private int toolSessionTypeId;
+    
+    private String uniqueKey;
 
     /** full constructor */
-    public ToolSession(Long toolSessionId, ToolActivity toolActivity, long toolSessionKey, Date createDateTime, Group group, int toolSessionStateId, Set userToolSessions) {
+    public ToolSession(Long toolSessionId, 
+                       ToolActivity toolActivity, 
+                       Date createDateTime, 
+                       int toolSessionStateId) {
         this.toolSessionId = toolSessionId;
         this.toolActivity = toolActivity;
-        this.toolSessionKey = toolSessionKey;
         this.createDateTime = createDateTime;
         this.toolSessionStateId = toolSessionStateId;
     }
@@ -87,35 +86,32 @@
     }
 
     /** 
-     *            @hibernate.property
-     *             column="tool_session_key"
-     *             length="20"
-     *             not-null="true"
-     *         
+     * @hibernate.property column="create_date_time" length="19"
+     *             		   not-null="true"
      */
-    public long getToolSessionKey() {
-        return this.toolSessionKey;
-    }
-
-    public void setToolSessionKey(long toolSessionKey) {
-        this.toolSessionKey = toolSessionKey;
-    }
-
-    /** 
-     *            @hibernate.property
-     *             column="create_date_time"
-     *             length="19"
-     *             not-null="true"
-     *         
-     */
     public Date getCreateDateTime() {
         return this.createDateTime;
     }
 
     public void setCreateDateTime(Date createDateTime) {
         this.createDateTime = createDateTime;
     }
-
+    /**
+     * @hibernate.property column="unique_key" length="128"
+     *             not-null="true"
+     * @return Returns the uniqueKey.
+     */
+    public String getUniqueKey()
+    {
+        return uniqueKey;
+    }
+    /**
+     * @param uniqueKey The uniqueKey to set.
+     */
+    public void setUniqueKey(String uniqueKey)
+    {
+        this.uniqueKey = uniqueKey;
+    }
     /** 
      *            @hibernate.many-to-one
      *             not-null="true"
@@ -157,4 +153,5 @@
 	public void setToolSessionTypeId(int toolSessionTypeId) {
 		this.toolSessionTypeId = toolSessionTypeId;
 	}
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolSessionDAO.java
===================================================================
diff -u -rc3b4b51a62bf1841f6d6667a26b47019e607d3c4 -r53f5c22785cd5d9d63e6c1557f460ba7314635e5
--- lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolSessionDAO.java	(.../IToolSessionDAO.java)	(revision c3b4b51a62bf1841f6d6667a26b47019e607d3c4)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolSessionDAO.java	(.../IToolSessionDAO.java)	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
@@ -24,4 +24,5 @@
     
     public void saveToolSession(ToolSession toolSession);
 
+    public void removeToolSession(ToolSession toolSession);
 }
Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolSessionDAO.java
===================================================================
diff -u -r432eded2e44dafaf043b7a6acb26e448cb6697a4 -r53f5c22785cd5d9d63e6c1557f460ba7314635e5
--- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolSessionDAO.java	(.../ToolSessionDAO.java)	(revision 432eded2e44dafaf043b7a6acb26e448cb6697a4)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolSessionDAO.java	(.../ToolSessionDAO.java)	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
@@ -31,5 +31,13 @@
     {
         getHibernateTemplate().save(toolSession);
     }
+
+    /**
+     * @see org.lamsfoundation.lams.tool.dao.IToolSessionDAO#removeToolSession(org.lamsfoundation.lams.tool.ToolSession)
+     */
+    public void removeToolSession(ToolSession toolSession)
+    {
+        getHibernateTemplate().delete(toolSession);
+    }
     
 }
Index: lams_common/test/java/applicationContext.xml
===================================================================
diff -u -r432eded2e44dafaf043b7a6acb26e448cb6697a4 -r53f5c22785cd5d9d63e6c1557f460ba7314635e5
--- lams_common/test/java/applicationContext.xml	(.../applicationContext.xml)	(revision 432eded2e44dafaf043b7a6acb26e448cb6697a4)
+++ lams_common/test/java/applicationContext.xml	(.../applicationContext.xml)	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
@@ -72,7 +72,7 @@
 		<property name="hibernateProperties">
 			<props>
 				<prop key="hibernate.dialect">net.sf.hibernate.dialect.MySQLDialect</prop>
-				<prop key="hibernate.show_sql">false</prop>
+				<prop key="hibernate.show_sql">true</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 -rcfef4351991e34dc2c827370370af84d6059bc0d -r53f5c22785cd5d9d63e6c1557f460ba7314635e5
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml	(.../learningDesignApplicationContext.xml)	(revision cfef4351991e34dc2c827370370af84d6059bc0d)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml	(.../learningDesignApplicationContext.xml)	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
@@ -26,13 +26,4 @@
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
-	<!-- Usermanagement realted beans -->
-	<bean id="userDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO">
-		<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/tool/ToolDataAccessTestCase.java
===================================================================
diff -u -rceebf32d92002b7509364edecf1da2405913e8e7 -r53f5c22785cd5d9d63e6c1557f460ba7314635e5
--- lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	(.../ToolDataAccessTestCase.java)	(revision ceebf32d92002b7509364edecf1da2405913e8e7)
+++ lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	(.../ToolDataAccessTestCase.java)	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
@@ -9,11 +9,21 @@
 
 package org.lamsfoundation.lams.tool;
 
+import java.util.Date;
+
 import org.lamsfoundation.lams.AbstractLamsTestCase;
+import org.lamsfoundation.lams.learningdesign.ToolActivity;
+import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO;
+import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO;
 import org.lamsfoundation.lams.tool.dao.IToolContentDAO;
 import org.lamsfoundation.lams.tool.dao.IToolDAO;
+import org.lamsfoundation.lams.tool.dao.IToolSessionDAO;
 import org.lamsfoundation.lams.tool.dao.hibernate.ToolContentDAO;
 import org.lamsfoundation.lams.tool.dao.hibernate.ToolDAO;
+import org.lamsfoundation.lams.tool.dao.hibernate.ToolSessionDAO;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dao.IUserDAO;
+import org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO;
 
 
 /**
@@ -26,10 +36,19 @@
 
     protected IToolContentDAO toolContentDao;
     protected IToolDAO toolDao;
-    
+    protected IToolSessionDAO toolSessionDao;
+    protected IUserDAO userDao;
+	protected IActivityDAO activityDAO;
     //Test tool id - survey tool
     protected final Long TEST_TOOL_ID = new Long(6);
     protected Tool testTool;
+    protected ToolSession ngToolSession;
+    protected ToolSession gToolSession;
+    protected User testUser;
+    protected ToolActivity testActivity;
+    
+    private final Integer TEST_USER_ID = new Integer(1);
+    private final Long TEST_ACTIVITY_ID = new Long(20);
     /*
      * @see AbstractLamsCommonTestCase#setUp()
      */
@@ -39,7 +58,13 @@
         
         toolContentDao = (ToolContentDAO)this.context.getBean("toolContentDAO");
         toolDao = (ToolDAO)this.context.getBean("toolDAO");
+        toolSessionDao = (ToolSessionDAO)this.context.getBean("toolSessionDAO");
+        activityDAO =(ActivityDAO) context.getBean("activityDAO");
         
+        userDao = (UserDAO) this.context.getBean("userDAO");
+        //retrieve test domain data
+        testUser = userDao.getUserById(TEST_USER_ID);
+        testActivity = (ToolActivity)activityDAO.getActivityByActivityId(TEST_ACTIVITY_ID);
     }
 
     /*
@@ -64,7 +89,27 @@
     protected String[] getContextConfigLocation()
     {
         return new String[] { "/org/lamsfoundation/lams/tool/toolApplicationContext.xml",
-                			  "applicationContext.xml"};
+                			  "/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml",
+        					  "applicationContext.xml"};
     }
     
+    public void initTestToolSession()
+    {
+        this.ngToolSession=this.initNGToolSession();
+    }
+    
+    public ToolSession initNGToolSession()
+    {
+        ToolSession toolSession = new NonGroupedToolSession(testActivity,
+                                                  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
--- lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolSessionDAO.java	(revision 0)
+++ lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolSessionDAO.java	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
@@ -0,0 +1,71 @@
+/* ********************************************************************************
+ *  Copyright Notice
+ *  =================
+ * This file contains propriety information of LAMS Foundation. 
+ * Copying or reproduction with prior written permission is prohibited.
+ * Copyright (c) 2005 
+ * Created on 11/02/2005
+ ******************************************************************************** */
+
+package org.lamsfoundation.lams.tool.dao;
+
+import org.lamsfoundation.lams.tool.NonGroupedToolSession;
+import org.lamsfoundation.lams.tool.ToolDataAccessTestCase;
+import org.lamsfoundation.lams.tool.ToolSession;
+import org.lamsfoundation.lams.tool.dao.hibernate.ToolSessionDAO;
+
+
+/**
+ * 
+ * @author Jacky Fang 11/02/2005
+ * 
+ */
+public class TestToolSessionDAO extends ToolDataAccessTestCase
+{
+    private IToolSessionDAO toolSessionDao;
+    /*
+     * @see ToolDataAccessTestCase#setUp()
+     */
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        toolSessionDao = (ToolSessionDAO)this.context.getBean("toolSessionDAO");
+        super.initTestToolSession();
+        toolSessionDao.saveToolSession(this.ngToolSession);
+    }
+
+    /*
+     * @see ToolDataAccessTestCase#tearDown()
+     */
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        toolSessionDao.removeToolSession(this.ngToolSession);
+    }
+
+    /**
+     * Constructor for TestToolSessionDAO.
+     * @param arg0
+     */
+    public TestToolSessionDAO(String arg0)
+    {
+        super(arg0);
+    }
+
+    public void testGetToolSession()
+    {
+        NonGroupedToolSession toolSession = (NonGroupedToolSession)toolSessionDao.getToolSession(this.ngToolSession.getToolSessionId());
+        
+        assertNotNull(toolSession);
+        assertEquals("verify tool session state",ToolSession.STARTED_STATE,toolSession.getToolSessionStateId());
+        //assertEquals("verify tool session type",ToolSession.NON_GROUPED_TYPE,toolSession.getToolSessionTypeId());
+        assertNotNull(toolSession.getUser());
+    }
+
+    public void testSaveNonGroupedToolSession()
+    {
+        ToolSession testToolSession=initNGToolSession();
+        toolSessionDao.saveToolSession(this.ngToolSession);
+    }
+
+}
Index: lams_common/test/java/org/lamsfoundation/lams/tool/toolApplicationContext.xml
===================================================================
diff -u -rb61710d172a150fe0581dcaa0082edd909a4639a -r53f5c22785cd5d9d63e6c1557f460ba7314635e5
--- lams_common/test/java/org/lamsfoundation/lams/tool/toolApplicationContext.xml	(.../toolApplicationContext.xml)	(revision b61710d172a150fe0581dcaa0082edd909a4639a)
+++ lams_common/test/java/org/lamsfoundation/lams/tool/toolApplicationContext.xml	(.../toolApplicationContext.xml)	(revision 53f5c22785cd5d9d63e6c1557f460ba7314635e5)
@@ -12,7 +12,10 @@
 	<bean id="toolDAO" class="org.lamsfoundation.lams.tool.dao.hibernate.ToolDAO">
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
-
+	<bean id="toolSessionDAO" class="org.lamsfoundation.lams.tool.dao.hibernate.ToolSessionDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
 	<bean id="toolContentIDGeneratorTarget" class="org.lamsfoundation.lams.tool.ToolContentIDGenerator"
 		singleton="true"
 	>