Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -rd4e510b5e4f1a6bb17ef36b272b981b6a3dd13df -r5dcca6320036cabb17b0fefd636ce5a80e43780b --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision d4e510b5e4f1a6bb17ef36b272b981b6a3dd13df) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 5dcca6320036cabb17b0fefd636ce5a80e43780b) @@ -519,7 +519,7 @@ } forumDao.delete(forum); } - + /** @see org.lamsfoundation.lams.tool.ToolSessionManager#createToolSession(java.lang.Long, java.lang.String, java.lang.Long) */ public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { ForumToolSession session = new ForumToolSession(); session.setSessionId(toolSessionId); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== diff -u -r191a53b4be13d616249f6f6dcdd1242153d4ad9e -r5dcca6320036cabb17b0fefd636ce5a80e43780b --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 191a53b4be13d616249f6f6dcdd1242153d4ad9e) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 5dcca6320036cabb17b0fefd636ce5a80e43780b) @@ -1224,15 +1224,15 @@ } /** - * createToolSession(Long toolSessionId, Long toolContentId) throws ToolException + * createToolSession(Long toolSessionId,String toolSessionName, Long toolContentId) throws ToolException * TESTED * ToolSessionManager CONTRACT : creates a tool session with the incoming toolSessionId in the tool session table * * gets called only in the Learner mode. * All the learners in the same group have the same toolSessionId. * */ - public void createToolSession(Long toolSessionId, Long toolContentId) throws ToolException + public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { logger.debug("start of createToolSession with ids: " + toolSessionId + " and " + toolContentId); if (toolSessionId == null) Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java =================================================================== diff -u -rb58f2fc7bc8cd178273ceb14efe302d806ce2e72 -r5dcca6320036cabb17b0fefd636ce5a80e43780b --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision b58f2fc7bc8cd178273ceb14efe302d806ce2e72) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision 5dcca6320036cabb17b0fefd636ce5a80e43780b) @@ -880,8 +880,8 @@ /* ===============Methods implemented from ToolSessionManager =============== */ - /** @see org.lamsfoundation.lams.tool.ToolSessionManager#createToolSession(java.lang.Long, java.lang.Long) */ - public void createToolSession(Long toolSessionId, Long toolContentId) throws ToolException + /** @see org.lamsfoundation.lams.tool.ToolSessionManager#createToolSession(java.lang.Long, java.lang.String, java.lang.Long) */ + public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { if (toolSessionId == null || toolContentId == null) { Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolSessionManager.java =================================================================== diff -u -rca8040f0b17bc00f1411dd785b1c973accb0545c -r5dcca6320036cabb17b0fefd636ce5a80e43780b --- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolSessionManager.java (.../TestToolSessionManager.java) (revision ca8040f0b17bc00f1411dd785b1c973accb0545c) +++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolSessionManager.java (.../TestToolSessionManager.java) (revision 5dcca6320036cabb17b0fefd636ce5a80e43780b) @@ -45,6 +45,7 @@ private INoticeboardService nbService = null; private boolean cleanContentData = true; private static final Long NEW_SESSION_ID = new Long(3400); + private static final String NEW_SESSION_NAME = "SessionName"; public TestToolSessionManager(String name) { @@ -79,7 +80,7 @@ { try { - nbSessionManager.createToolSession(NEW_SESSION_ID, TEST_NB_ID); + nbSessionManager.createToolSession(NEW_SESSION_ID,NEW_SESSION_NAME, TEST_NB_ID); nbSession = nbService.retrieveNoticeboardSession(NEW_SESSION_ID); @@ -102,7 +103,7 @@ { try { - nbSessionManager.createToolSession(null, TEST_NB_ID); + nbSessionManager.createToolSession(null, NEW_SESSION_NAME,TEST_NB_ID); fail("An exception should be raised as the toolSessionId is null"); } catch(ToolException e) @@ -118,7 +119,7 @@ { try { - nbSessionManager.createToolSession(NEW_SESSION_ID, null); + nbSessionManager.createToolSession(NEW_SESSION_ID,NEW_SESSION_NAME, null); fail("An exception should be raised as the toolContentId is null"); } catch(ToolException e) @@ -136,7 +137,7 @@ Long invalidId = new Long(8968); try { - nbSessionManager.createToolSession(NEW_SESSION_ID, invalidId); + nbSessionManager.createToolSession(NEW_SESSION_ID, NEW_SESSION_NAME, invalidId); nbSession = nbService.retrieveNoticeboardSession(NEW_SESSION_ID); @@ -161,7 +162,7 @@ try { - nbSessionManager.createToolSession(NEW_SESSION_ID, null); + nbSessionManager.createToolSession(NEW_SESSION_ID, NEW_SESSION_NAME, null); fail("An exception should be raised since the toolContentId" + "is null and the defaultContent is missing"); } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== diff -u -rd6af0f1aaccf5fc744f80ae2da1ff239c0dd6b8b -r5dcca6320036cabb17b0fefd636ce5a80e43780b --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision d6af0f1aaccf5fc744f80ae2da1ff239c0dd6b8b) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 5dcca6320036cabb17b0fefd636ce5a80e43780b) @@ -307,10 +307,10 @@ /* * (non-Javadoc) * - * @see org.lamsfoundation.lams.tool.ToolSessionManager#createToolSession(java.lang.Long, + * @see org.lamsfoundation.lams.tool.ToolSessionManager#createToolSession(java.lang.Long,java.lang.String, * java.lang.Long) */ - public void createToolSession(Long toolSessionId, Long toolContentId) { + public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) { //pre-condition validation if (toolSessionId == null || toolContentId == null) throw new SubmitFilesException("Fail to create a submission session" Index: lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/service/TestSubmitFilesService.java =================================================================== diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -r5dcca6320036cabb17b0fefd636ce5a80e43780b --- lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/service/TestSubmitFilesService.java (.../TestSubmitFilesService.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569) +++ lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/service/TestSubmitFilesService.java (.../TestSubmitFilesService.java) (revision 5dcca6320036cabb17b0fefd636ce5a80e43780b) @@ -101,7 +101,7 @@ Long toolSessionId = new Long(getMaxSessionId()+1); try { - submitFilesToolSessionManager.createToolSession(toolSessionId,toolContentId); + submitFilesToolSessionManager.createToolSession(toolSessionId,"sessionName",toolContentId); } catch (ToolException e) { e.printStackTrace(); fail("Tool exception thrown while creating session");