Index: lams_learning/conf/war/META-INF/MANIFEST.MF
===================================================================
diff -u -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb -r29cf7c9f1421fde2bc6a38c5f56632b5acc11d70
--- lams_learning/conf/war/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
+++ lams_learning/conf/war/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision 29cf7c9f1421fde2bc6a38c5f56632b5acc11d70)
@@ -1 +1 @@
-Class-Path: ./lams.jar ./lams-learning.jar ./lams-tool-laicp10.jar ./lams-tool-lanb11.jar ./lams-tool-laqa11.jar ./lams-tool-lasbmt11.jar ./lams-tool-lasr10.jar
\ No newline at end of file
+Class-Path: ./lams.jar ./lams-learning.jar ./lams-tool-lafrum11.jar ./lams-tool-laicp10.jar ./lams-tool-lamc11.jar ./lams-tool-lanb11.jar ./lams-tool-laqa11.jar ./lams-tool-lasbmt11.jar ./lams-tool-lasr10.jar
\ No newline at end of file
Index: lams_learning/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb -r29cf7c9f1421fde2bc6a38c5f56632b5acc11d70
--- lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
+++ lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 29cf7c9f1421fde2bc6a38c5f56632b5acc11d70)
@@ -31,11 +31,10 @@
 		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
-		classpath:/org/lamsfoundation/lams/tool/imscp/applicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml 
 		classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml 
 		classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 
 		classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 
-		classpath:/org/lamsfoundation/lams/tool/survey/applicationContext.xml
 	</param-value>
 </context-param>
 <listener>
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
===================================================================
diff -u -r60a2ec1b6dc4618652303d3c30b3854599942366 -r29cf7c9f1421fde2bc6a38c5f56632b5acc11d70
--- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 60a2ec1b6dc4618652303d3c30b3854599942366)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 29cf7c9f1421fde2bc6a38c5f56632b5acc11d70)
@@ -22,6 +22,7 @@
 		<property name="activityDAO"><ref bean="activityDAO"/></property>
 		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
 		<property name="activityMapping"><ref bean="activityMapping"/></property>
+		<property name="userManagementService"><ref bean="userManagementService"/></property>
 	</bean>
 	
 	<bean id="learnerService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
===================================================================
diff -u -r715f8fde307b93cafb4b879577610d159684aaf6 -r29cf7c9f1421fde2bc6a38c5f56632b5acc11d70
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	(.../ILearnerService.java)	(revision 715f8fde307b93cafb4b879577610d159684aaf6)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	(.../ILearnerService.java)	(revision 29cf7c9f1421fde2bc6a38c5f56632b5acc11d70)
@@ -97,11 +97,11 @@
      * the learning design. This method is for tools to redirect the client on 
      * complete.
      * @param toolSessionId, session ID for completed tool
-     * @param learner the learne who is completing the tool session.
+     * @param learnerId the learner who is completing the tool session.
      * @return the URL for the next activity
      * @throws LearnerServiceException in case of problems.
      */
-    public String completeToolSession(Long toolSessionId, User learner);
+    public String completeToolSession(Long toolSessionId, Long learnerId);
     
     /**
      * Complete the activity in the progress engine and delegate to the progress 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
diff -u -r7f80ba8587932005ce6285ea17c4f91f94b6e02c -r29cf7c9f1421fde2bc6a38c5f56632b5acc11d70
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 29cf7c9f1421fde2bc6a38c5f56632b5acc11d70)
@@ -50,6 +50,7 @@
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 /**
  * This class is a facade over the Learning middle tier.
  * @author chris, Jacky Fang
@@ -69,6 +70,7 @@
     private IToolSessionDAO toolSessionDAO;
     private ILamsCoreToolService lamsCoreToolService;
     private ActivityMapping activityMapping;
+    private IUserManagementService userManagementService;
     //---------------------------------------------------------------------
     // Inversion of Control Methods - Constructor injection
     //---------------------------------------------------------------------
@@ -131,7 +133,19 @@
     public void setGroupingDAO(IGroupingDAO groupingDAO)
     {
         this.groupingDAO = groupingDAO;
-    }    
+    }
+    /**
+     * @return the User Management Service
+     */
+	public IUserManagementService getUserManagementService() {
+		return userManagementService;
+	}
+	/**
+	 * @param userService User Management Service
+	 */
+	public void setUserManagementService(IUserManagementService userService) {
+		this.userManagementService = userService;
+	}
     //---------------------------------------------------------------------
     // Service Methods
     //---------------------------------------------------------------------
@@ -278,8 +292,10 @@
     /**
      * @see org.lamsfoundation.lams.learning.service.ILearnerService#completeToolSession(long, User)
      */
-    public String completeToolSession(Long toolSessionId, User learner) 
+    public String completeToolSession(Long toolSessionId, Long learnerId) 
     {
+    	User learner = userManagementService.getUserById(new Integer(learnerId.intValue()));
+    	
         //update tool session state in lams
         ToolSession toolSession = lamsCoreToolService.getToolSessionById(toolSessionId);
     	
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
===================================================================
diff -u -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b -r29cf7c9f1421fde2bc6a38c5f56632b5acc11d70
--- lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(.../TestLearnerService.java)	(revision 4e143f1522cf63a2c32a7cb22a3c1ea57853284b)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(.../TestLearnerService.java)	(revision 29cf7c9f1421fde2bc6a38c5f56632b5acc11d70)
@@ -177,7 +177,8 @@
 
     public void testCompleteToolSession()
     {
-        String urlForNextActivity = learnerService.completeToolSession(new Long(TEST_TOOL_SESSION_ID),testUser);
+        String urlForNextActivity = learnerService.completeToolSession(new Long(TEST_TOOL_SESSION_ID),
+        		new Long(testUser.getUserId().longValue()));
         
         ToolSession toolSession = toolSessionDao.getToolSession(new Long(TEST_TOOL_SESSION_ID));
         
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -r7492a142f40382aa48f48eae31caa05856e39858 -r29cf7c9f1421fde2bc6a38c5f56632b5acc11d70
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 7492a142f40382aa48f48eae31caa05856e39858)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 29cf7c9f1421fde2bc6a38c5f56632b5acc11d70)
@@ -36,11 +36,10 @@
 		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
-		classpath:/org/lamsfoundation/lams/tool/imscp/applicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml 
 		classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml 
 		classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 
 		classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 
-		classpath:/org/lamsfoundation/lams/tool/survey/applicationContext.xml
 	</param-value>
 </context-param>
 <listener>