Index: lams_build/lib/lams/lams-learning.jar
===================================================================
diff -u -rb3f6d73a3c058682d7130f37120fcdfb58db3ca3 -rdddd4ed5ab9b4234f80c7e5a5186f75b3de008d8
Binary files differ
Index: lams_build/lib/lams/lams-monitoring.jar
===================================================================
diff -u -r0042ef2efffe59f6e2fa4b1554080a8500df69b9 -rdddd4ed5ab9b4234f80c7e5a5186f75b3de008d8
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r187a532cf59466566cb11205ef50c73269eaa03a -rdddd4ed5ab9b4234f80c7e5a5186f75b3de008d8
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java
===================================================================
diff -u -r737e77bd0a4a0888f135459bd908ae3ca888a2d6 -rdddd4ed5ab9b4234f80c7e5a5186f75b3de008d8
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java	(.../ToolSessionManager.java)	(revision 737e77bd0a4a0888f135459bd908ae3ca888a2d6)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java	(.../ToolSessionManager.java)	(revision dddd4ed5ab9b4234f80c7e5a5186f75b3de008d8)
@@ -34,10 +34,11 @@
      * tool content id, then use the default content id.
      * 
      * @param toolSessionId the generated tool session id.
+     * @param toolSessionName the tool session name.
      * @param toolContentId the tool content id specified.
      * @throws ToolException if an error occurs e.g. defaultContent is missing.
      */
-    public void createToolSession(Long toolSessionId, Long toolContentId) throws ToolException;
+    public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException;
     
     /**
      * Call the controller service to complete and leave the tool session.
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
===================================================================
diff -u -r408f469a1b4e8b9d7858d8a41da2b0358de3d6b7 -rdddd4ed5ab9b4234f80c7e5a5186f75b3de008d8
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java	(.../ILamsCoreToolService.java)	(revision 408f469a1b4e8b9d7858d8a41da2b0358de3d6b7)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java	(.../ILamsCoreToolService.java)	(revision dddd4ed5ab9b4234f80c7e5a5186f75b3de008d8)
@@ -31,6 +31,7 @@
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.ToolSession;
+import org.lamsfoundation.lams.tool.dao.IToolSessionDAO;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.LamsToolServiceException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
@@ -113,10 +114,10 @@
     
     /**
      * Notify tools to create their tool sessions in their own tables. 
-     * @param toolSessionId the tool session generated by lams.
+     * @param toolSession the tool session generated by lams.
      * @param activity the activity correspondent to that tool session.
      */
-    public void notifyToolsToCreateSession(Long toolSessionId, ToolActivity activity)
+    public void notifyToolsToCreateSession(ToolSession toolSession, ToolActivity activity)
     	throws ToolException;
     
     /**
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
===================================================================
diff -u -r9061ae80e70a9de672410991ca03bd9968bbe0cd -rdddd4ed5ab9b4234f80c7e5a5186f75b3de008d8
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	(.../LamsCoreToolService.java)	(revision 9061ae80e70a9de672410991ca03bd9968bbe0cd)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	(.../LamsCoreToolService.java)	(revision dddd4ed5ab9b4234f80c7e5a5186f75b3de008d8)
@@ -161,15 +161,15 @@
     
     /**
      * @throws ToolException
-     * @see org.lamsfoundation.lams.tool.service.ILamsCoreToolService#notifyToolsToCreateSession(java.lang.Long, org.lamsfoundation.lams.learningdesign.ToolActivity)
+     * @see org.lamsfoundation.lams.tool.service.ILamsCoreToolService#notifyToolsToCreateSession( org.lamsfoundation.lams.tool.ToolSession, org.lamsfoundation.lams.learningdesign.ToolActivity)
      */
-    public void notifyToolsToCreateSession(Long toolSessionId, ToolActivity activity) throws ToolException
+    public void notifyToolsToCreateSession(ToolSession toolSession, ToolActivity activity) throws ToolException
     {
     	// TODO remove call to isToolOnClasspath. Should throw an error if tool cannot be found.
     	if ( isToolOnClasspath(activity) ) {
 	        ToolSessionManager sessionManager = (ToolSessionManager) findToolService(activity);
 	
-	        sessionManager.createToolSession(toolSessionId,
+	        sessionManager.createToolSession(toolSession.getToolSessionId(),toolSession.getToolSessionName(),
 	                                         activity.getToolContentId());
     	}
     }
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
diff -u -rbc0d1f9fde98396bc8d9e9d125068f4407b1d392 -rdddd4ed5ab9b4234f80c7e5a5186f75b3de008d8
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision bc0d1f9fde98396bc8d9e9d125068f4407b1d392)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision dddd4ed5ab9b4234f80c7e5a5186f75b3de008d8)
@@ -447,7 +447,7 @@
         // if the tool session already exists, will return null
         if ( toolSession !=null ) {
 	        toolActivity.getToolSessions().add(toolSession);
-	        lamsCoreToolService.notifyToolsToCreateSession(toolSession.getToolSessionId(), toolActivity);
+	        lamsCoreToolService.notifyToolsToCreateSession(toolSession, toolActivity);
         }
     }
     
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -r2b516bec2b4c42ad0c7f3ea68db139d31d831205 -rdddd4ed5ab9b4234f80c7e5a5186f75b3de008d8
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 2b516bec2b4c42ad0c7f3ea68db139d31d831205)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision dddd4ed5ab9b4234f80c7e5a5186f75b3de008d8)
@@ -1222,7 +1222,7 @@
     			// core has set up a new tool session, we need to ask tool to create their own 
     			// tool sessions using the given id and attach the session to the activity.
     			ToolSession toolSession = (ToolSession) iter.next();
-	            lamsCoreToolService.notifyToolsToCreateSession(toolSession.getToolSessionId(), activity);
+	            lamsCoreToolService.notifyToolsToCreateSession(toolSession, activity);
 	            activity.getToolSessions().add(toolSession);
         		}
     		}