Index: lams_learning/conf/war/META-INF/MANIFEST.MF =================================================================== RCS file: /usr/local/cvsroot/lams_learning/conf/war/META-INF/Attic/MANIFEST.MF,v diff -u -r1.4 -r1.5 --- lams_learning/conf/war/META-INF/MANIFEST.MF 31 Oct 2005 05:24:57 -0000 1.4 +++ lams_learning/conf/war/META-INF/MANIFEST.MF 17 Nov 2005 23:08:34 -0000 1.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/web-settings.xml,v diff -u -r1.10 -r1.11 --- lams_learning/conf/xdoclet/web-settings.xml 31 Oct 2005 05:24:57 -0000 1.10 +++ lams_learning/conf/xdoclet/web-settings.xml 17 Nov 2005 23:08:34 -0000 1.11 @@ -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 Index: lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml,v diff -u -r1.7 -r1.8 --- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml 9 Nov 2005 04:48:50 -0000 1.7 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml 17 Nov 2005 23:08:34 -0000 1.8 @@ -22,6 +22,7 @@ + Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java,v diff -u -r1.18 -r1.19 --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java 7 Apr 2005 07:11:07 -0000 1.18 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java 17 Nov 2005 23:08:34 -0000 1.19 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java,v diff -u -r1.31 -r1.32 --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java 6 Oct 2005 06:40:18 -0000 1.31 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java 17 Nov 2005 23:08:34 -0000 1.32 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/service/Attic/TestLearnerService.java,v diff -u -r1.23 -r1.24 --- lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java 10 Oct 2005 12:09:29 -0000 1.23 +++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java 17 Nov 2005 23:08:34 -0000 1.24 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/web.xml,v diff -u -r1.15 -r1.16 --- lams_learning/web/WEB-INF/web.xml 9 Nov 2005 06:57:24 -0000 1.15 +++ lams_learning/web/WEB-INF/web.xml 17 Nov 2005 23:08:35 -0000 1.16 @@ -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