Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUploadedFile.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/Attic/McUploadedFile.java,v diff -u -r1.6 -r1.7 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUploadedFile.java 2 Oct 2006 01:59:55 -0000 1.6 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUploadedFile.java 11 Oct 2006 07:19:28 -0000 1.7 @@ -92,25 +92,11 @@ { McUploadedFile newMcUploadedFile=null; - try - { - String fileUuid = mcUploadedFile.getUuid(); - if(toolContentHandler != null){ - NodeKey copiedNodeKey = toolContentHandler.copyFile(new Long(mcUploadedFile.getUuid())); - logger.debug("copied NodeKey: " + copiedNodeKey); - logger.debug("copied NodeKey uuid: " + copiedNodeKey.getUuid().toString()); - fileUuid = copiedNodeKey.getUuid().toString(); - } - newMcUploadedFile = new McUploadedFile(fileUuid, + newMcUploadedFile = new McUploadedFile(mcUploadedFile.getUuid(), mcUploadedFile.isFileOnline(), mcUploadedFile.getFileName(), newMcContent); - } - catch(RepositoryCheckedException e) - { - logger.debug("error occurred: " + e); - } return newMcUploadedFile; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUploadedFile.java,v diff -u -r1.13 -r1.14 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java 20 Sep 2006 15:15:44 -0000 1.13 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java 11 Oct 2006 07:19:26 -0000 1.14 @@ -92,25 +92,10 @@ { QaUploadedFile newMcUploadedFile=null; - try - { - String fileUuid = qaUploadedFile.getUuid(); - if(toolContentHandler != null){ - NodeKey copiedNodeKey = toolContentHandler.copyFile(new Long(qaUploadedFile.getUuid())); - logger.debug("copied NodeKey: " + copiedNodeKey); - logger.debug("copied NodeKey uuid: " + copiedNodeKey.getUuid().toString()); - fileUuid = copiedNodeKey.getUuid().toString(); - } - newMcUploadedFile = new QaUploadedFile(fileUuid, + newMcUploadedFile = new QaUploadedFile(qaUploadedFile.getUuid(), qaUploadedFile.isFileOnline(), qaUploadedFile.getFileName(), newMcContent); - - } - catch(RepositoryCheckedException e) - { - logger.debug("error occurred: " + e); - } return newMcUploadedFile; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java,v diff -u -r1.20 -r1.21 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java 23 Sep 2006 15:11:00 -0000 1.20 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java 11 Oct 2006 07:20:02 -0000 1.21 @@ -2019,27 +2019,7 @@ QaUploadedFile attachment = (QaUploadedFile) iter.next(); logger.debug("attachment: " + attachment); - /*remove entry from content repository. deleting a non-existent entry - shouldn't cause any errors.*/ - try - { - - if(attachment.getUuid()!= null) - { - getToolContentHandler().deleteFile(Long.getLong(attachment.getUuid())); - logger.error("deleted file with uuid: " + attachment.getUuid()); - } - } - catch (RepositoryCheckedException e) { - logger.error("Unable to delete file",e); - /* - ActionMessages am = new ActionMessages(); - am.add( ActionMessages.GLOBAL_MESSAGE, - new ActionMessage( "error.contentrepository" , - attachment.getFileName())); - saveErrors( request, am ); - */ - } + /* remove entry from db, leave in content repository. */ if ( attachment.getSubmissionId() != null ) { qaService.removeFile(attachment.getSubmissionId()); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java,v diff -u -r1.18 -r1.19 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java 17 Sep 2006 06:25:37 -0000 1.18 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java 11 Oct 2006 07:19:28 -0000 1.19 @@ -128,13 +128,7 @@ while(iter.hasNext()){ ResourceItem item = (ResourceItem)iter.next(); ResourceItem newItem = (ResourceItem) item.clone(); -// if toolContentHandle is null, just clone old file without duplicate it in repository - if(toolContentHandler != null && item.getFileUuid() != null){ - //duplicate file node in repository - NodeKey keys = toolContentHandler.copyFile(item.getFileUuid()); - newItem.setFileUuid(keys.getUuid()); - newItem.setFileVersionId(keys.getVersion()); - } +// just clone old file without duplicate it in repository set.add(newItem); } resource.resourceItems = set; @@ -146,13 +140,8 @@ while(iter.hasNext()){ ResourceAttachment file = (ResourceAttachment)iter.next(); ResourceAttachment newFile = (ResourceAttachment) file.clone(); -// if toolContentHandle is null, just clone old file without duplicate it in repository - if(toolContentHandler != null){ - //duplicate file node in repository - NodeKey keys = toolContentHandler.copyFile(file.getFileUuid()); - newFile.setFileUuid(keys.getUuid()); - newFile.setFileVersionId(keys.getVersion()); - } +// just clone old file without duplicate it in repository + set.add(newFile); } resource.attachments = set; @@ -163,10 +152,6 @@ } } catch (CloneNotSupportedException e) { log.error("When clone " + Resource.class + " failed"); - } catch (ItemNotFoundException e) { - log.error("When clone " + Resource.class + " failed"); - } catch (RepositoryCheckedException e) { - log.error("When clone " + Resource.class + " failed"); } return resource; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java,v diff -u -r1.42 -r1.43 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java 10 Oct 2006 04:19:39 -0000 1.42 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java 11 Oct 2006 07:19:28 -0000 1.43 @@ -550,8 +550,6 @@ while(iter.hasNext()){ ResourceAttachment delAtt = (ResourceAttachment) iter.next(); iter.remove(); - //delete from repository - service.deleteFromRepository(delAtt.getFileUuid(),delAtt.getFileVersionId()); //it is an existed att, then delete it from current attachmentPO if(delAtt.getUid() != null){ Iterator attIter = attPOSet.iterator(); @@ -590,17 +588,13 @@ iter.remove(); if(item.getUid() != null) service.deleteResourceItem(item.getUid()); - if(item.getFileUuid() != null && item.getFileVersionId() != null) - service.deleteFromRepository(item.getFileUuid(),item.getFileVersionId()); } //handle resource item attachment file: List delItemAttList = getDeletedItemAttachmentList(sessionMap); iter = delItemAttList.iterator(); while(iter.hasNext()){ ResourceItem delAtt = (ResourceItem) iter.next(); iter.remove(); - //delete from repository - service.deleteFromRepository(delAtt.getFileUuid(),delAtt.getFileVersionId()); } //if miniview number is bigger than available items, then set it topics size Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java,v diff -u -r1.5 -r1.6 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java 17 Sep 2006 06:27:19 -0000 1.5 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java 11 Oct 2006 07:19:29 -0000 1.6 @@ -395,13 +395,6 @@ NotebookAttachment originalFile = (NotebookAttachment) iter.next(); NotebookAttachment newFile = (NotebookAttachment) originalFile .clone(); - if (toolContentHandler != null) { - // duplicate file node in repository - NodeKey keys = toolContentHandler.copyFile(originalFile - .getFileUuid()); - newFile.setFileUuid(keys.getUuid()); - newFile.setFileVersionId(keys.getVersion()); - } set.add(newFile); } notebook.notebookAttachments = set; @@ -411,10 +404,6 @@ } catch (CloneNotSupportedException cnse) { log.error("Error cloning " + Notebook.class); - } catch (ItemNotFoundException infe) { - log.error("Item Not found " + Notebook.class); - } catch (RepositoryCheckedException rce) { - log.error("Repository checked exception " + Notebook.class); } return notebook; } Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java,v diff -u -r1.8 -r1.9 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java 4 Oct 2006 07:32:27 -0000 1.8 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java 11 Oct 2006 07:19:29 -0000 1.9 @@ -172,9 +172,7 @@ } for (NotebookAttachment att : getAttList(KEY_DELETED_FILES, map)) { - // remove from repository and db - notebookService.deleteFromRepository(att.getFileUuid(), att - .getFileVersionId()); + // remove from db, leave in repository attachments.remove(att); } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java,v diff -u -r1.18 -r1.19 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java 17 Sep 2006 06:27:55 -0000 1.18 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java 11 Oct 2006 07:19:27 -0000 1.19 @@ -284,12 +284,6 @@ while(iter.hasNext()){ InstructionFiles file = (InstructionFiles)iter.next(); InstructionFiles newFile = (InstructionFiles) file.clone(); - //duplicate file node in repository - if(toolContentHandler != null){ - NodeKey keys = toolContentHandler.copyFile(file.getUuID()); - newFile.setUuID(keys.getUuid()); - newFile.setVersionID(keys.getVersion()); - } set.add(newFile); } ((SubmitFilesContent)obj).instructionFiles= set; @@ -300,10 +294,6 @@ } } catch (CloneNotSupportedException e) { log.error("When clone " + SubmitFilesContent.class + " failed"); - } catch (ItemNotFoundException e) { - log.error("When clone " + SubmitFilesContent.class + " failed"); - } catch (RepositoryCheckedException e) { - log.error("When clone " + SubmitFilesContent.class + " failed"); } return obj; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java,v diff -u -r1.32 -r1.33 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java 17 Sep 2006 06:27:56 -0000 1.32 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java 11 Oct 2006 07:19:27 -0000 1.33 @@ -243,8 +243,6 @@ iter = deleteAttachmentList.iterator(); while(iter.hasNext()){ InstructionFiles delAtt = (InstructionFiles) iter.next(); - //delete from repository - submitFilesService.deleteFromRepository(delAtt.getUuID(),delAtt.getVersionID()); //it is an existed att, then delete it from current attachmentPO if(delAtt.getUid() != null){ Iterator attIter = attPOSet.iterator(); Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/Scribe.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/Scribe.java,v diff -u -r1.4 -r1.5 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/Scribe.java 30 Sep 2006 10:18:45 -0000 1.4 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/Scribe.java 11 Oct 2006 07:19:19 -0000 1.5 @@ -434,13 +434,6 @@ ScribeAttachment originalFile = (ScribeAttachment) iter.next(); ScribeAttachment newFile = (ScribeAttachment) originalFile .clone(); - if (toolContentHandler != null) { - // duplicate file node in repository - NodeKey keys = toolContentHandler.copyFile(originalFile - .getFileUuid()); - newFile.setFileUuid(keys.getUuid()); - newFile.setFileVersionId(keys.getVersion()); - } set.add(newFile); } scribe.scribeAttachments = set; @@ -467,10 +460,6 @@ } catch (CloneNotSupportedException cnse) { log.error("Error cloning " + Scribe.class); - } catch (ItemNotFoundException infe) { - log.error("Item Not found " + Scribe.class); - } catch (RepositoryCheckedException rce) { - log.error("Repository checked exception " + Scribe.class); } return scribe; } Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java,v diff -u -r1.5 -r1.6 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java 4 Oct 2006 07:31:07 -0000 1.5 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java 11 Oct 2006 07:19:20 -0000 1.6 @@ -183,9 +183,7 @@ } for (ScribeAttachment att : getAttList(KEY_DELETED_FILES, map)) { - // remove from repository and db - scribeService.deleteFromRepository(att.getFileUuid(), att - .getFileVersionId()); + // remove from db, leave in repository attachments.remove(att); } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java,v diff -u -r1.5 -r1.6 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java 26 Sep 2006 07:12:41 -0000 1.5 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java 11 Oct 2006 07:19:27 -0000 1.6 @@ -136,13 +136,8 @@ while(iter.hasNext()){ SurveyAttachment file = (SurveyAttachment)iter.next(); SurveyAttachment newFile = (SurveyAttachment) file.clone(); -// if toolContentHandle is null, just clone old file without duplicate it in repository - if(toolContentHandler != null){ - //duplicate file node in repository - NodeKey keys = toolContentHandler.copyFile(file.getFileUuid()); - newFile.setFileUuid(keys.getUuid()); - newFile.setFileVersionId(keys.getVersion()); - } +// clone old file without duplicate it in repository + set.add(newFile); } survey.attachments = set; @@ -153,10 +148,6 @@ } } catch (CloneNotSupportedException e) { log.error("When clone " + Survey.class + " failed"); - } catch (ItemNotFoundException e) { - log.error("When clone " + Survey.class + " failed"); - } catch (RepositoryCheckedException e) { - log.error("When clone " + Survey.class + " failed"); } return survey; Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java,v diff -u -r1.12 -r1.13 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java 10 Oct 2006 04:19:51 -0000 1.12 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java 11 Oct 2006 07:19:27 -0000 1.13 @@ -551,8 +551,6 @@ while(iter.hasNext()){ SurveyAttachment delAtt = (SurveyAttachment) iter.next(); iter.remove(); - //delete from repository - service.deleteFromRepository(delAtt.getFileUuid(),delAtt.getFileVersionId()); //it is an existed att, then delete it from current attachmentPO if(delAtt.getUid() != null){ Iterator attIter = attPOSet.iterator(); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUploadedFile.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/Attic/VoteUploadedFile.java,v diff -u -r1.6 -r1.7 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUploadedFile.java 26 Sep 2006 02:26:51 -0000 1.6 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUploadedFile.java 11 Oct 2006 07:19:26 -0000 1.7 @@ -83,25 +83,11 @@ { VoteUploadedFile newMcUploadedFile=null; - try - { - String fileUuid = voteUploadedFile.getUuid(); - if(toolContentHandler != null){ - NodeKey copiedNodeKey = toolContentHandler.copyFile(new Long(voteUploadedFile.getUuid())); - logger.debug("copied NodeKey: " + copiedNodeKey); - logger.debug("copied NodeKey uuid: " + copiedNodeKey.getUuid().toString()); - fileUuid = copiedNodeKey.getUuid().toString(); - } - newMcUploadedFile = new VoteUploadedFile(fileUuid, + newMcUploadedFile = new VoteUploadedFile(voteUploadedFile.getUuid(), voteUploadedFile.isFileOnline(), voteUploadedFile.getFileName(), newMcContent); - } - catch(RepositoryCheckedException e) - { - logger.debug("error occurred: " + e); - } return newMcUploadedFile; }