Index: lams_tool_chat/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/build.properties,v diff -u -r1.3.2.2 -r1.3.2.3 --- lams_tool_chat/build.properties 26 Mar 2007 06:06:59 -0000 1.3.2.2 +++ lams_tool_chat/build.properties 19 Apr 2007 01:10:55 -0000 1.3.2.3 @@ -14,6 +14,6 @@ tool.version=20070315 # Minimum compatible version -min.server.version.number=2.0.200612051427 +min.server.version.number=2.0.2.200704181605 Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java,v diff -u -r1.38 -r1.38.2.1 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 24 Nov 2006 00:28:46 -0000 1.38 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 19 Apr 2007 01:09:02 -0000 1.38.2.1 @@ -254,23 +254,23 @@ chatDAO.saveOrUpdate(toContent); } - public void setAsDefineLater(Long toolContentId) + public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException { Chat chat = chatDAO.getByContentId(toolContentId); if(chat == null){ throw new ToolException("Could not find tool with toolContentID: " + toolContentId); } - chat.setDefineLater(true); + chat.setDefineLater(value); chatDAO.saveOrUpdate(chat); } - public void setAsRunOffline(Long toolContentId) + public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException { Chat chat = chatDAO.getByContentId(toolContentId); if(chat == null){ throw new ToolException("Could not find tool with toolContentID: " + toolContentId); } - chat.setRunOffline(true); + chat.setRunOffline(value); chatDAO.saveOrUpdate(chat); } Index: lams_tool_forum/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/build.properties,v diff -u -r1.13.2.1 -r1.13.2.2 --- lams_tool_forum/build.properties 12 Mar 2007 05:05:25 -0000 1.13.2.1 +++ lams_tool_forum/build.properties 19 Apr 2007 01:11:02 -0000 1.13.2.2 @@ -18,4 +18,4 @@ language.files.package=org.lamsfoundation.lams.tool.forum # Minimum compatible version -min.server.version.number=2.0.200612051427 +min.server.version.number=2.0.2.200704181605 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.83 -r1.83.2.1 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 24 Nov 2006 00:28:36 -0000 1.83 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 19 Apr 2007 01:10:44 -0000 1.83.2.1 @@ -647,21 +647,21 @@ } - public void setAsDefineLater(Long toolContentId) throws DataMissingException, ToolException { + public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException { Forum forum = forumDao.getByContentId(toolContentId); if(forum == null){ throw new ToolException("No found tool content by given content ID:" + toolContentId); } - forum.setDefineLater(true); + forum.setDefineLater(value); forum.setContentInUse(false); } - public void setAsRunOffline(Long toolContentId) throws DataMissingException, ToolException { + public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException { Forum forum = forumDao.getByContentId(toolContentId); if(forum == null){ throw new ToolException("No found tool content by given content ID:" + toolContentId); } - forum.setRunOffline(true); + forum.setRunOffline(value); } Index: lams_tool_lamc/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/build.properties,v diff -u -r1.4.4.1 -r1.4.4.2 --- lams_tool_lamc/build.properties 12 Mar 2007 05:09:47 -0000 1.4.4.1 +++ lams_tool_lamc/build.properties 19 Apr 2007 01:11:31 -0000 1.4.4.2 @@ -13,7 +13,7 @@ language.files.package=org.lamsfoundation.lams.tool.mc # Minimum compatible version -min.server.version.number=2.0.200612051427 +min.server.version.number=2.0.2.200704181605 #submit files package definition mc.package=org.lamsfoundation.lams.tool.mc Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java,v diff -u -r1.62 -r1.62.2.1 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java 17 Dec 2006 22:47:42 -0000 1.62 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java 19 Apr 2007 01:11:18 -0000 1.62.2.1 @@ -201,11 +201,9 @@ public void setAsForceComplete(Long userId) throws McApplicationException; - public void unsetAsDefineLater(Long toolContentId) throws McApplicationException; + public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException; - public void setAsDefineLater(Long toolContentId) throws DataMissingException, ToolException; - - public void setAsRunOffline(Long toolContentId) throws DataMissingException, ToolException; + public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException; public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v diff -u -r1.93 -r1.93.2.1 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 17 Dec 2006 22:47:41 -0000 1.93 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 19 Apr 2007 01:11:18 -0000 1.93.2.1 @@ -1728,39 +1728,15 @@ } } - - public void unsetAsDefineLater(Long toolContentId) throws McApplicationException - { - logger.debug("request for unsetAsDefineLater with toolContentId: " + toolContentId); - if (toolContentId == null) - { - logger.error("WARNING!: retrieved toolContentId is null."); - throw new McApplicationException("Fail to setAsDefineLater" - + " based on null toolContentId."); - } - McContent mcContent = mcContentDAO.findMcContentById(toolContentId); - if (mcContent == null) - { - logger.error("WARNING!!!: retrieved mcContent is null."); - throw new McApplicationException("Fail to unsetAsDefineLater" - + " based on null mcContent."); - } - mcContent.setDefineLater(false); - createMc(mcContent); - logger.debug("mcContent has been updated for unsetAsDefineLater: " + mcContent); - } - - /** * Implemented as part of the tool contract. Sets the defineLater to true on this content. * setAsDefineLater(Long toolContentId) throws DataMissingException, ToolException * @param toolContentId * @return * @throws ToolException */ - public void setAsDefineLater(Long toolContentId) throws DataMissingException, ToolException + public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException { - logger.debug("request for setAsDefineLater with toolContentId: " + toolContentId); if (toolContentId == null) { logger.error("throwing DataMissingException: WARNING!: retrieved toolContentId is null."); @@ -1773,12 +1749,10 @@ logger.error("throwing DataMissingException: WARNING!: retrieved mcContent is null."); throw new DataMissingException("mcContent is missing"); } - mcContent.setDefineLater(true); + mcContent.setDefineLater(value); saveMcContent(mcContent); - logger.debug("success: end of setAsDefineLater on toolContentId:" + toolContentId); } - /** * Implemented as part of the tool contract. Sets the runOffline to true on this content. * setAsRunOffline(Long toolContentId) throws DataMissingException, ToolException @@ -1787,9 +1761,8 @@ * return * @throws ToolException */ - public void setAsRunOffline(Long toolContentId) throws DataMissingException, ToolException + public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException { - logger.debug("request for setAsRunOffline with toolContentId:" + toolContentId); if (toolContentId == null) { logger.error("throwing DataMissingException: WARNING!: retrieved toolContentId is null."); @@ -1801,9 +1774,8 @@ logger.error("throwing DataMissingException: WARNING!: retrieved mcContent is null."); throw new DataMissingException("mcContent is missing"); } - mcContent.setRunOffline(true); + mcContent.setRunOffline(value); saveMcContent(mcContent); - logger.debug("success: end of setAsRunOffline on toolContentId:" + toolContentId); } Index: lams_tool_laqa/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/build.properties,v diff -u -r1.18.2.1 -r1.18.2.2 --- lams_tool_laqa/build.properties 12 Mar 2007 05:10:28 -0000 1.18.2.1 +++ lams_tool_laqa/build.properties 19 Apr 2007 01:12:01 -0000 1.18.2.2 @@ -13,7 +13,7 @@ language.files.package=org.lamsfoundation.lams.tool.qa # Minimum compatible version -min.server.version.number=2.0.200612051427 +min.server.version.number=2.0.2.200704181605 #submit files package definition qa.package=org.lamsfoundation.lams.tool.qa 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.45 -r1.45.2.1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 26 Nov 2006 22:25:37 -0000 1.45 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 19 Apr 2007 01:11:48 -0000 1.45.2.1 @@ -189,12 +189,10 @@ */ public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException; - public void setAsDefineLater(Long toolContentId) throws DataMissingException, ToolException; + public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException; - public void unsetAsDefineLater(Long toolContentId) throws QaApplicationException; + public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException; - public void setAsRunOffline(Long toolContentId) throws DataMissingException, ToolException; - public void setAsForceComplete(Long userId) throws QaApplicationException; public void setAsForceCompleteSession(Long toolSessionId) throws QaApplicationException; 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.75 -r1.75.2.1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 26 Nov 2006 22:25:37 -0000 1.75 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 19 Apr 2007 01:11:48 -0000 1.75.2.1 @@ -1214,35 +1214,13 @@ } - public void unsetAsDefineLater(Long toolContentID) throws QaApplicationException - { - logger.debug("request for unsetAsDefineLater with toolContentID: " + toolContentID); - if (toolContentID == null) - { - logger.debug("WARNING!: retrieved toolContentID is null."); - throw new QaApplicationException("Fail to setAsDefineLater" - + " based on null toolContentID."); - } - QaContent qaContent = qaDAO.loadQaById(toolContentID.longValue()); - if (qaContent == null) - { - logger.debug("WARNING!!!: retrieved qaContent is null."); - throw new QaApplicationException("Fail to unsetAsDefineLater" - + " based on null qaContent."); - } - qaContent.setDefineLater(false); - updateQa(qaContent); - logger.debug("qaContent has been updated for unsetAsDefineLater: " + qaContent); - } - - /** * setAsDefineLater(Long toolContentID) throws DataMissingException, ToolException * * @param toolContentID * return void */ - public void setAsDefineLater(Long toolContentID) throws DataMissingException, ToolException + public void setAsDefineLater(Long toolContentID, boolean value) throws DataMissingException, ToolException { logger.debug("request for setAsDefineLater with toolContentID: " + toolContentID); if (toolContentID == null) @@ -1256,7 +1234,7 @@ logger.debug("throwing DataMissingException: WARNING!: retrieved qaContent is null."); throw new DataMissingException("qaContent is missing"); } - qaContent.setDefineLater(true); + qaContent.setDefineLater(value); updateQa(qaContent); logger.debug("qaContent has been updated for defineLater: " + qaContent); } @@ -1268,7 +1246,7 @@ * @param toolContentID * return void */ - public void setAsRunOffline(Long toolContentID) throws DataMissingException, ToolException + public void setAsRunOffline(Long toolContentID, boolean value) throws DataMissingException, ToolException { logger.debug("request for setAsRunOffline with toolContentID:" + toolContentID); if (toolContentID == null) @@ -1282,7 +1260,7 @@ logger.debug("throwing DataMissingException: WARNING!: retrieved qaContent is null."); throw new DataMissingException("qaContent is missing"); } - qaContent.setRunOffline(true); + qaContent.setRunOffline(value); updateQa(qaContent); logger.debug("qaContent has been updated for runOffline: " + qaContent); } Index: lams_tool_larsrc/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/build.properties,v diff -u -r1.3.2.1 -r1.3.2.2 --- lams_tool_larsrc/build.properties 12 Mar 2007 05:09:19 -0000 1.3.2.1 +++ lams_tool_larsrc/build.properties 19 Apr 2007 01:12:31 -0000 1.3.2.2 @@ -19,7 +19,7 @@ hideTool=false # Minimum compatible version -min.server.version.number=2.0.200612051427 +min.server.version.number=2.0.2.200704181605 # Language files package language.files.package=org.lamsfoundation.lams.tool.rsrc Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java,v diff -u -r1.53 -r1.53.2.1 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 24 Nov 2006 00:28:45 -0000 1.53 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 19 Apr 2007 01:12:31 -0000 1.53.2.1 @@ -928,21 +928,21 @@ } - public void setAsDefineLater(Long toolContentId) throws DataMissingException, ToolException { + public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException { Resource resource = resourceDao.getByContentId(toolContentId); if(resource == null){ throw new ToolException("No found tool content by given content ID:" + toolContentId); } - resource.setDefineLater(true); + resource.setDefineLater(value); } - public void setAsRunOffline(Long toolContentId) throws DataMissingException, ToolException { + public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException { Resource resource = resourceDao.getByContentId(toolContentId); if(resource == null){ throw new ToolException("No found tool content by given content ID:" + toolContentId); } - resource.setRunOffline(true); + resource.setRunOffline(value); } Index: lams_tool_nb/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/build.properties,v diff -u -r1.11.2.2 -r1.11.2.3 --- lams_tool_nb/build.properties 26 Mar 2007 06:08:38 -0000 1.11.2.2 +++ lams_tool_nb/build.properties 19 Apr 2007 01:13:12 -0000 1.11.2.3 @@ -15,7 +15,7 @@ hideTool=false # Minimum compatible version -min.server.version.number=2.0.200612051427 +min.server.version.number=2.0.2.200704181605 # Language files package language.files.package=org.lamsfoundation.lams.tool.noticeboard 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.40 -r1.40.2.1 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 24 Nov 2006 00:28:44 -0000 1.40 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 19 Apr 2007 01:13:06 -0000 1.40.2.1 @@ -829,22 +829,22 @@ } /** @see org.lamsfoundation.lams.tool.ToolContentManager#setAsDefineLater(java.lang.Long)*/ - public void setAsDefineLater(Long toolContentId) throws DataMissingException, ToolException + public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException { NoticeboardContent nbContent = getAndCheckIDandObject(toolContentId); - nbContent.setDefineLater(true); + nbContent.setDefineLater(value); //nbContent.setContentInUse(false); //if define later is set to true, then contentInUse flag should be false saveNoticeboard(nbContent); } /** @see org.lamsfoundation.lams.tool.ToolContentManager#setAsRunOffline(java.lang.Long)*/ - public void setAsRunOffline(Long toolContentId) throws DataMissingException, ToolException + public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException { NoticeboardContent nbContent = getAndCheckIDandObject(toolContentId); - nbContent.setForceOffline(true); + nbContent.setForceOffline(value); saveNoticeboard(nbContent); } Index: lams_tool_notebook/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/build.properties,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_notebook/build.properties 12 Mar 2007 05:14:24 -0000 1.1.2.1 +++ lams_tool_notebook/build.properties 19 Apr 2007 01:15:10 -0000 1.1.2.2 @@ -13,7 +13,7 @@ hideTool=false # Minimum compatible version -min.server.version.number=2.0.200612051427 +min.server.version.number=2.0.2.200704181605 # Language files package language.files.package=org.lamsfoundation.lams.tool.notebook Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java,v diff -u -r1.11 -r1.11.2.1 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java 2 Nov 2006 00:02:21 -0000 1.11 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java 19 Apr 2007 01:13:49 -0000 1.11.2.1 @@ -185,25 +185,25 @@ notebookDAO.saveOrUpdate(toContent); } - public void setAsDefineLater(Long toolContentId) + public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException { Notebook notebook = notebookDAO.getByContentId(toolContentId); if (notebook == null) { throw new ToolException("Could not find tool with toolContentID: " + toolContentId); } - notebook.setDefineLater(true); + notebook.setDefineLater(value); notebookDAO.saveOrUpdate(notebook); } - public void setAsRunOffline(Long toolContentId) + public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException { Notebook notebook = notebookDAO.getByContentId(toolContentId); if (notebook == null) { throw new ToolException("Could not find tool with toolContentID: " + toolContentId); } - notebook.setRunOffline(true); + notebook.setRunOffline(value); notebookDAO.saveOrUpdate(notebook); } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v diff -u -r1.70 -r1.70.2.1 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 24 Nov 2006 00:28:47 -0000 1.70 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 19 Apr 2007 01:17:04 -0000 1.70.2.1 @@ -171,7 +171,7 @@ /** * @see org.lamsfoundation.lams.tool.ToolContentManager#setAsRunOffline(java.lang.Long) */ - public void setAsRunOffline(Long toolContentId) + public void setAsRunOffline(Long toolContentId, boolean value) { //pre-condition validation if (toolContentId == null) @@ -183,7 +183,7 @@ if ( content == null || !toolContentId.equals(content.getContentID())) { content = duplicateDefaultToolContent(toolContentId); } - content.setRunOffline(true); + content.setRunOffline(value); submitFilesContentDAO.saveOrUpdate(content); } catch (DataAccessException e) @@ -211,7 +211,7 @@ /** * @see org.lamsfoundation.lams.tool.ToolContentManager#setAsDefineLater(java.lang.Long) */ - public void setAsDefineLater(Long toolContentId) { + public void setAsDefineLater(Long toolContentId, boolean value) { //pre-condition validation if (toolContentId == null) throw new SubmitFilesException("Fail to set tool content to define later - " @@ -222,7 +222,7 @@ if ( content == null || !toolContentId.equals(content.getContentID())) { content = duplicateDefaultToolContent(toolContentId); } - content.setDefineLater(true); + content.setDefineLater(value); submitFilesContentDAO.saveOrUpdate(content); } catch (DataAccessException e) @@ -234,7 +234,6 @@ } /** - * (non-Javadoc) * @throws SessionDataExistsException * * @see org.lamsfoundation.lams.tool.ToolContentManager#removeToolContent(java.lang.Long)