Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java,v diff -u -r1.18 -r1.19 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java 19 Sep 2006 06:37:24 -0000 1.18 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java 10 Oct 2006 07:47:02 -0000 1.19 @@ -430,16 +430,9 @@ while (iter.hasNext()) { NoticeboardAttachment element = (NoticeboardAttachment) iter.next(); NoticeboardAttachment newAttachment = new NoticeboardAttachment(newContent, element.getFilename(), element.isOnlineFile()); - if(toolContentHandler != null){ - //if it is not null, copy file node and refresh uuid and version - NodeKey keys = toolContentHandler.copyFile(element.getUuid()); - newAttachment.setUuid(keys.getUuid()); - newAttachment.setVersionId(keys.getVersion()); - }else{ - //keep old value - newAttachment.setUuid(element.getUuid()); - newAttachment.setVersionId(element.getVersionId()); - } + //keep old value do not duplicate file + newAttachment.setUuid(element.getUuid()); + newAttachment.setVersionId(element.getVersionId()); newAttachmentSet.add(newAttachment); } 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.37 -r1.38 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 4 Oct 2006 08:53:50 -0000 1.37 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 10 Oct 2006 07:47:02 -0000 1.38 @@ -765,7 +765,6 @@ { attachment.setNbContent(null); content.getNbAttachments().remove(attachment); - nbToolContentHandler.deleteFile(attachment.getUuid()); saveNoticeboard(content); } catch (DataAccessException e) Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java,v diff -u -r1.32 -r1.33 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java 17 Sep 2006 06:26:25 -0000 1.32 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java 10 Oct 2006 07:47:02 -0000 1.33 @@ -290,7 +290,7 @@ try { - // remove tool entry from db, includies removing entry from the content repository + // remove tool entry from db, does not removing entry from the content repository // deleting a non-existent entry shouldn't cause any errors. if ( attachment.getAttachmentId() != null ) { nbService.removeAttachment(nbContent, attachment);