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.32 -r1.33 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 17 Sep 2006 06:20:54 -0000 1.32 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 3 Oct 2006 06:55:27 -0000 1.33 @@ -290,8 +290,9 @@ throws DataMissingException, ToolException { Chat chat = chatDAO.getByContentId(toolContentId); if (chat == null) - throw new DataMissingException( - "Unable to find tool content by given id :" + toolContentId); + chat = getDefaultContent(); + if (chat ==null ) + throw new DataMissingException("Unable to find default content for the chat tool"); // set ResourceToolContentHandler as null to avoid copy file node in // repository again. 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.74 -r1.75 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 19 Sep 2006 04:08:21 -0000 1.74 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 3 Oct 2006 06:55:46 -0000 1.75 @@ -671,7 +671,9 @@ public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException { Forum toolContentObj = forumDao.getByContentId(toolContentId); if(toolContentObj == null) - throw new DataMissingException("Unable to find tool content by given id :" + toolContentId); + toolContentObj = getDefaultForum(); + if(toolContentObj == null) + throw new DataMissingException("Unable to find default content for the forum tool"); //set ResourceToolContentHandler as null to avoid copy file node in repository again. toolContentObj = Forum.newInstance(toolContentObj,toolContentId,null); 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.68 -r1.69 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 20 Sep 2006 15:15:44 -0000 1.68 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 3 Oct 2006 06:57:14 -0000 1.69 @@ -1423,8 +1423,12 @@ public void exportToolContent(Long toolContentID, String rootPath) throws DataMissingException, ToolException { QaContent toolContentObj = qaDAO.getQaById(toolContentID); + if(toolContentObj == null) { + long defaultToolContentId = toolService.getToolDefaultContentIdBySignature(MY_SIGNATURE); + toolContentObj = retrieveQa(defaultToolContentId); + } if(toolContentObj == null) - throw new DataMissingException("Unable to find tool content by given id :" + toolContentID); + throw new DataMissingException("Unable to find default content for the question and answer tool"); try { //set ToolContentHandler as null to avoid copy file node in repository again. @@ -2102,7 +2106,7 @@ toolContentObj.setContent(null); toolContentObj.setReportTitle(null); toolContentObj.setMonitoringReportTitle(null); - toolContentObj.setSynchInMonitor(true); // don't know what this does but the default content has false + toolContentObj.setSynchInMonitor(false); // doesn't appear to be used in LAMS 2.0 Boolean bool; try { 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.47 -r1.48 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 27 Sep 2006 04:58:29 -0000 1.47 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 3 Oct 2006 06:57:39 -0000 1.48 @@ -817,8 +817,15 @@ public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException { Resource toolContentObj = resourceDao.getByContentId(toolContentId); + if(toolContentObj == null) { + try { + toolContentObj = getDefaultResource(); + } catch (ResourceApplicationException e) { + throw new DataMissingException(e.getMessage()); + } + } if(toolContentObj == null) - throw new DataMissingException("Unable to find tool content by given id :" + toolContentId); + throw new DataMissingException("Unable to find default content for the share resources tool"); //set ResourceToolContentHandler as null to avoid copy file node in repository again. toolContentObj = Resource.newInstance(toolContentObj,toolContentId,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.35 -r1.36 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 20 Sep 2006 01:07:30 -0000 1.35 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 3 Oct 2006 06:59:02 -0000 1.36 @@ -917,8 +917,12 @@ public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException { NoticeboardContent toolContentObj = nbContentDAO.findNbContentById(toolContentId); + if(toolContentObj == null) { + Long defaultContentId = getToolDefaultContentIdBySignature(NoticeboardConstants.TOOL_SIGNATURE); + toolContentObj = retrieveNoticeboard(defaultContentId); + } if(toolContentObj == null) - throw new DataMissingException("Unable to find tool content by given id :" + toolContentId); + throw new DataMissingException("Unable to find default content for the noticeboard tool"); try { //set ResourceToolContentHandler as null to avoid copy file node in repository again. 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.7 -r1.8 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java 17 Sep 2006 06:27:20 -0000 1.7 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java 3 Oct 2006 06:59:39 -0000 1.8 @@ -224,9 +224,11 @@ public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException { Notebook notebook = notebookDAO.getByContentId(toolContentId); + if (notebook == null) { + notebook = getDefaultContent(); + } if (notebook == null) - throw new DataMissingException( - "Unable to find tool content by given id :" + toolContentId); + throw new DataMissingException("Unable to find default content for the notebook tool"); // set ResourceToolContentHandler as null to avoid copy file node in // repository again. 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.65 -r1.66 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 17 Sep 2006 06:27:55 -0000 1.65 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 3 Oct 2006 06:59:52 -0000 1.66 @@ -262,8 +262,11 @@ public void exportToolContent(Long toolContentId , String toPath) throws ToolException, DataMissingException{ exportContentService.registerFileClassForExport(InstructionFiles.class.getName(),"uuID","versionID"); SubmitFilesContent toolContentObj = submitFilesContentDAO.getContentByID(toolContentId); - if(toolContentObj == null) - throw new DataMissingException("Unable to find tool content by given id :" + toolContentId); + if(toolContentObj == null) { + toolContentObj = getDefaultSubmit(); + } + if(toolContentObj == null) + throw new DataMissingException("Unable to find default content for the submit files tool"); //set toolContentHandler as null to avoid duplicate file node in repository. toolContentObj = SubmitFilesContent.newInstance(toolContentObj,toolContentId,null); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v diff -u -r1.48 -r1.49 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 26 Sep 2006 02:26:51 -0000 1.48 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 3 Oct 2006 07:00:36 -0000 1.49 @@ -1632,9 +1632,14 @@ public void exportToolContent(Long toolContentID, String rootPath) throws DataMissingException, ToolException { VoteContent toolContentObj = voteContentDAO.findVoteContentById(toolContentID); - if(toolContentObj == null) - throw new DataMissingException("Unable to find tool content by given id :" + toolContentID); + if(toolContentObj == null) { + long defaultContentId=getToolDefaultContentIdBySignature(MY_SIGNATURE); + toolContentObj = voteContentDAO.findVoteContentById(defaultContentId); + } + if(toolContentObj == null) + throw new DataMissingException("Unable to find default content for the voting tool"); + try { //set ToolContentHandler as null to avoid copy file node in repository again. toolContentObj = VoteContent.newInstance(null,toolContentObj,toolContentID);