Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v diff -u -r1.36 -r1.37 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 15 Dec 2005 05:59:10 -0000 1.36 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 7 Feb 2006 22:58:36 -0000 1.37 @@ -520,7 +520,7 @@ forumDao.delete(forum); } - public void createToolSession(Long toolSessionId, Long toolContentId) throws ToolException { + public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { ForumToolSession session = new ForumToolSession(); session.setSessionId(toolSessionId); Forum forum = forumDao.getByContentId(toolContentId); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java,v diff -u -r1.19 -r1.20 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 5 Jan 2006 04:33:27 -0000 1.19 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 7 Feb 2006 23:03:24 -0000 1.20 @@ -170,15 +170,15 @@ /** - * createToolSession(Long toolSessionId, Long toolContentId) should ideally should not be part this interface as it is + * createToolSession(Long toolSessionId,String toolSessionName, Long toolContentId) 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 void createToolSession(Long toolSessionId, Long toolContentId) throws ToolException; + public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException; /** * leaveToolSession(Long toolSessionId, Long learnerId) should ideally should not be part this interface as it is Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v diff -u -r1.25 -r1.26 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 5 Jan 2006 04:33:27 -0000 1.25 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 7 Feb 2006 23:03:24 -0000 1.26 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java,v diff -u -r1.16 -r1.17 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 23 Dec 2005 01:57:57 -0000 1.16 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 7 Feb 2006 23:06:50 -0000 1.17 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/Attic/TestToolSessionManager.java,v diff -u -r1.4 -r1.5 --- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolSessionManager.java 4 Jan 2006 00:34:08 -0000 1.4 +++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolSessionManager.java 7 Feb 2006 23:06:35 -0000 1.5 @@ -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"); }