Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -r97f2318395de13f34d37cec08c50bc379b7ece13 -r9310fe30da9974d1f174319efc054e3bde9eed84 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 97f2318395de13f34d37cec08c50bc379b7ece13) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 9310fe30da9974d1f174319efc054e3bde9eed84) @@ -51,7 +51,6 @@ import org.lamsfoundation.lams.tool.forum.util.ForumToolContentHandler; import org.lamsfoundation.lams.tool.forum.util.TopicComparator; import org.lamsfoundation.lams.tool.service.ILamsToolService; -import org.lamsfoundation.lams.usermanagement.User; /** @@ -363,7 +362,7 @@ public void createToolSession(Long toolSessionId, Long toolContentId) throws ToolException { } - public String leaveToolSession(Long toolSessionId, User learner) throws DataMissingException, ToolException { + public String leaveToolSession(Long toolSessionId, Long learnerID) throws DataMissingException, ToolException { return null; } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java =================================================================== diff -u -r690cf7460e6899ac1279fc823d9819a2060744b1 -r9310fe30da9974d1f174319efc054e3bde9eed84 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 690cf7460e6899ac1279fc823d9819a2060744b1) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 9310fe30da9974d1f174319efc054e3bde9eed84) @@ -160,7 +160,7 @@ public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException; - public String leaveToolSession(Long toolSessionId,User learner) throws DataMissingException, ToolException; + public String leaveToolSession(Long toolSessionId,Long learnerId) throws DataMissingException, ToolException; public ToolSessionExportOutputData exportToolSession(Long toolSessionId) throws DataMissingException, ToolException; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== diff -u -r690cf7460e6899ac1279fc823d9819a2060744b1 -r9310fe30da9974d1f174319efc054e3bde9eed84 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 690cf7460e6899ac1279fc823d9819a2060744b1) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 9310fe30da9974d1f174319efc054e3bde9eed84) @@ -1324,21 +1324,21 @@ * Call controller service to complete the qa session * @see org.lamsfoundation.lams.tool.ToolSessionManager#leaveToolSession(java.lang.Long) */ - public String leaveToolSession(Long toolSessionId,User learner) throws DataMissingException, ToolException + public String leaveToolSession(Long toolSessionId,Long learnerId) throws DataMissingException, ToolException { logger.debug("start of leaveToolSession with toolSessionId:" + toolSessionId); - logger.debug("start of leaveToolSession with learner:" + learner); + logger.debug("start of leaveToolSession with learner:" + learnerId); if (toolSessionId == null) { logger.debug("toolSessionId is null"); throw new DataMissingException("toolSessionId is missing"); } - if (learner == null) + if (learnerId == null) { - logger.debug("learner is null"); - throw new DataMissingException("learner is missing"); + logger.debug("learnerId is null"); + throw new DataMissingException("learnerId is missing"); } try Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml =================================================================== diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r9310fe30da9974d1f174319efc054e3bde9eed84 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision 664a5459e87fdfde268c9c54e458618c0965f816) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision 9310fe30da9974d1f174319efc054e3bde9eed84) @@ -71,6 +71,7 @@ + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java =================================================================== diff -u -r5137b070eb144e247a323c143293151ca039f1b6 -r9310fe30da9974d1f174319efc054e3bde9eed84 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision 5137b070eb144e247a323c143293151ca039f1b6) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision 9310fe30da9974d1f174319efc054e3bde9eed84) @@ -179,15 +179,15 @@ public void createToolSession(Long toolSessionId, Long toolContentId) throws ToolException; /** - * leaveToolSession(Long toolSessionId, User learner) should ideally should not be part this interface as it is + * leaveToolSession(Long toolSessionId, Long learnerId) should ideally should not be part this interface as it is * already part of the interface ToolSessionManager. It is here for development purposes. * * It is also defined here since in development we want to be able call it directly from our web-layer * instead of it being called by the container. * @param toolSessionId * @param toolContentId */ - public String leaveToolSession(Long toolSessionId,User learner) throws DataMissingException, ToolException; + public String leaveToolSession(Long toolSessionId,Long learnerId) throws DataMissingException, ToolException; public BasicToolVO getToolBySignature(String toolSignature); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== diff -u -re693b778e6201af40e4ea93f2a0d06b5ca5cf462 -r9310fe30da9974d1f174319efc054e3bde9eed84 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision e693b778e6201af40e4ea93f2a0d06b5ca5cf462) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 9310fe30da9974d1f174319efc054e3bde9eed84) @@ -40,6 +40,7 @@ import org.lamsfoundation.lams.contentrepository.service.IRepositoryService; import org.lamsfoundation.lams.contentrepository.service.RepositoryProxy; import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials; +import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.tool.BasicToolVO; import org.lamsfoundation.lams.tool.ToolContentManager; @@ -110,6 +111,7 @@ private IUserManagementService userManagementService; private ILamsToolService toolService; + private ILearnerService learnerService; public void configureContentRepository() throws QaApplicationException { logger.debug("retrieved repService: " + repositoryService); @@ -1319,31 +1321,28 @@ * Call controller service to complete the qa session * */ - public String leaveToolSession(Long toolSessionId,User learner) throws DataMissingException, ToolException + public String leaveToolSession(Long toolSessionId,Long learnerId) throws DataMissingException, ToolException { logger.debug("start of leaveToolSession with toolSessionId:" + toolSessionId); - logger.debug("start of leaveToolSession with learner:" + learner); + logger.debug("start of leaveToolSession with learnerId:" + learnerId); if (toolSessionId == null) { logger.debug("toolSessionId is null"); throw new DataMissingException("toolSessionId is missing"); } - if (learner == null) + if (learnerId == null) { - logger.debug("learner is null"); - throw new DataMissingException("learner is missing"); + logger.debug("learnerId is null"); + throw new DataMissingException("learnerId is missing"); } try { - /* - String nextUrl=learnerService.completeToolSession(toolSessionId,learner); + String nextUrl = learnerService.completeToolSession(toolSessionId,learnerId); logger.debug(logger + " " + this.getClass().getName() + " " + "nextUrl: " + nextUrl); return nextUrl; - */ - return "nextUrl"; } catch(DataAccessException e) { @@ -1613,4 +1612,14 @@ public IUserManagementService getUserManagementService() { return userManagementService; } + + + public ILearnerService getLearnerService() { + return learnerService; + } + + + public void setLearnerService(ILearnerService learnerService) { + this.learnerService = learnerService; + } } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== diff -u -r837aa6d15c08f6d4b1cd80b7b4cc3d56e494c9ed -r9310fe30da9974d1f174319efc054e3bde9eed84 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 837aa6d15c08f6d4b1cd80b7b4cc3d56e494c9ed) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 9310fe30da9974d1f174319efc054e3bde9eed84) @@ -465,13 +465,13 @@ * @see org.lamsfoundation.lams.tool.ToolSessionManager#leaveToolSession(java.lang.Long, * org.lamsfoundation.lams.usermanagement.User) */ - public String leaveToolSession(Long toolSessionId, User learner) + public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException{ if(toolSessionId == null){ log.error("Fail to leave tool Session based on null tool session id."); throw new ToolException("Fail to remove tool Session based on null tool session id."); } - if(learner == null){ + if(learnerId == null){ log.error("Fail to leave tool Session based on null learner."); throw new ToolException("Fail to remove tool Session based on null learner."); } @@ -486,7 +486,7 @@ throw new DataMissingException("Fail to leave tool Session." + "Could not find submit file session by given session id: "+toolSessionId); } - return learnerService.completeToolSession(toolSessionId,learner); + return learnerService.completeToolSession(toolSessionId,learnerId); } /**