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.35 -r1.36 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 4 Oct 2006 08:56:16 -0000 1.35 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 18 Oct 2006 02:13:30 -0000 1.36 @@ -325,14 +325,14 @@ * if any other error occurs */ public void importToolContent(Long toolContentId, Integer newUserUid, - String toolContentPath) throws ToolException { + String toolContentPath ,String fromVersion,String toVersion) throws ToolException { try { exportContentService.registerFileClassForImport( ChatAttachment.class.getName(), "fileUuid", "fileVersionId", "fileName", "fileType", null, null); Object toolPOJO = exportContentService.importToolContent( - toolContentPath, chatToolContentHandler); + toolContentPath, chatToolContentHandler,fromVersion,toVersion); if (!(toolPOJO instanceof Chat)) throw new ImportToolContentException( "Import Chat tool content failed. Deserialized object is " 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.80 -r1.81 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 10 Oct 2006 04:19:49 -0000 1.80 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 18 Oct 2006 02:14:21 -0000 1.81 @@ -716,14 +716,15 @@ * for the content. * @throws ToolException if any other error occurs */ - public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException { + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath ,String fromVersion,String toVersion) + throws ToolException { try { exportContentService.registerFileClassForImport(Attachment.class.getName() ,"fileUuid","fileVersionId","fileName","fileType",null,null); - Object toolPOJO = exportContentService.importToolContent(toolContentPath,forumToolContentHandler); + Object toolPOJO = exportContentService.importToolContent(toolContentPath,forumToolContentHandler,fromVersion,toVersion); if(!(toolPOJO instanceof Forum)) throw new ImportToolContentException("Import Forum tool content failed. Deserialized object is " + toolPOJO); Forum toolContentObj = (Forum) toolPOJO; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java 18 Oct 2006 02:16:19 -0000 1.1 @@ -0,0 +1,21 @@ +package org.lamsfoundation.lams.tool.mc.service; + +import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter; +import org.lamsfoundation.lams.tool.mc.pojos.McQueContent; +import org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt; +/** + * Import filter class for different version of MC content. + * @author steven + * + */ +public class McImportContentVersionFilter extends ToolContentVersionFilter{ + + /** + * Import 1.0 version content to 1.1 version tool server. + * + */ + public void up10To20061015(){ + this.removeField(McQueContent.class, "weight"); + this.removeField(McUsrAttempt.class, "timeZone"); + } +} 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.85 -r1.86 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 16 Oct 2006 23:28:04 -0000 1.85 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 18 Oct 2006 02:16:19 -0000 1.86 @@ -1815,12 +1815,16 @@ * for the content. * @throws ToolException if any other error occurs */ - public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException { + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath,String fromVersion,String toVersion) throws ToolException { try { + //register File node class exportContentService.registerFileClassForImport(McUploadedFile.class.getName() ,"uuid",null,"fileName","fileProperty",null,null); - Object toolPOJO = exportContentService.importToolContent(toolContentPath,mcToolContentHandler); + //register version filter class + exportContentService.registerImportVersionFilterClass(McImportContentVersionFilter.class); + + Object toolPOJO = exportContentService.importToolContent(toolContentPath,mcToolContentHandler,fromVersion,toVersion); if(!(toolPOJO instanceof McContent)) throw new ImportToolContentException("Import MC tool content failed. Deserialized object is " + toolPOJO); McContent toolContentObj = (McContent) toolPOJO; 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.70 -r1.71 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 4 Oct 2006 08:54:58 -0000 1.70 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 18 Oct 2006 02:16:49 -0000 1.71 @@ -1465,11 +1465,11 @@ * for the content. * @throws ToolException if any other error occurs */ - public void importToolContent(Long toolContentID, Integer newUserUid, String toolContentPath) throws ToolException { + public void importToolContent(Long toolContentID, Integer newUserUid, String toolContentPath ,String fromVersion,String toVersion) throws ToolException { try { exportContentService.registerFileClassForImport(QaUploadedFile.class.getName(),"uuid",null,"fileName","fileProperty",null,null); - Object toolPOJO = exportContentService.importToolContent(toolContentPath,qaToolContentHandler); + Object toolPOJO = exportContentService.importToolContent(toolContentPath,qaToolContentHandler,fromVersion,toVersion); if(!(toolPOJO instanceof QaContent)) throw new ImportToolContentException("Import QA tool content failed. Deserialized object is " + toolPOJO); QaContent toolContentObj = (QaContent) toolPOJO; 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.50 -r1.51 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 10 Oct 2006 04:19:40 -0000 1.50 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 18 Oct 2006 02:17:18 -0000 1.51 @@ -851,15 +851,15 @@ } - public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException { + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath ,String fromVersion,String toVersion) throws ToolException { try { exportContentService.registerFileClassForImport(ResourceAttachment.class.getName() ,"fileUuid","fileVersionId","fileName","fileType",null,null); exportContentService.registerFileClassForImport(ResourceItem.class.getName() ,"fileUuid","fileVersionId","fileName","fileType",null,"initialItem"); - Object toolPOJO = exportContentService.importToolContent(toolContentPath,resourceToolContentHandler); + Object toolPOJO = exportContentService.importToolContent(toolContentPath,resourceToolContentHandler,fromVersion,toVersion); if(!(toolPOJO instanceof Resource)) throw new ImportToolContentException("Import Share resources tool content failed. Deserialized object is " + toolPOJO); Resource toolContentObj = (Resource) toolPOJO; 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.38 -r1.39 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 10 Oct 2006 07:47:02 -0000 1.38 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 18 Oct 2006 02:18:21 -0000 1.39 @@ -944,12 +944,12 @@ * for the content. * @throws ToolException if any other error occurs */ - public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException { + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath,String fromVersion,String toVersion) throws ToolException { try { exportContentService.registerFileClassForImport(NoticeboardAttachment.class.getName() ,"uuid","versionId","filename","fileProperty",null,null); - Object toolPOJO = exportContentService.importToolContent(toolContentPath,nbToolContentHandler); + Object toolPOJO = exportContentService.importToolContent(toolContentPath,nbToolContentHandler,fromVersion,toVersion); if(!(toolPOJO instanceof NoticeboardContent)) throw new ImportToolContentException("Import Noteice board tool content failed. Deserialized object is " + toolPOJO); NoticeboardContent toolContentObj = (NoticeboardContent) toolPOJO; 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.9 -r1.10 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java 4 Oct 2006 08:53:36 -0000 1.9 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java 18 Oct 2006 02:18:49 -0000 1.10 @@ -260,14 +260,14 @@ * if any other error occurs */ public void importToolContent(Long toolContentId, Integer newUserUid, - String toolContentPath) throws ToolException { + String toolContentPath,String fromVersion,String toVersion) throws ToolException { try { exportContentService.registerFileClassForImport( NotebookAttachment.class.getName(), "fileUuid", "fileVersionId", "fileName", "fileType", null, null); Object toolPOJO = exportContentService.importToolContent( - toolContentPath, notebookToolContentHandler); + toolContentPath, notebookToolContentHandler,fromVersion,toVersion); if (!(toolPOJO instanceof Notebook)) throw new ImportToolContentException( "Import Notebook tool content failed. Deserialized object is " 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.68 -r1.69 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 10 Oct 2006 04:20:16 -0000 1.68 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 18 Oct 2006 02:19:15 -0000 1.69 @@ -279,12 +279,12 @@ } } - public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException { + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath,String fromVersion,String toVersion) throws ToolException { try { exportContentService.registerFileClassForImport(InstructionFiles.class.getName(),"uuID","versionID","name","type",null,null); - Object toolPOJO = exportContentService.importToolContent(toolContentPath,sbmtToolContentHandler); + Object toolPOJO = exportContentService.importToolContent(toolContentPath,sbmtToolContentHandler,fromVersion,toVersion); if(!(toolPOJO instanceof SubmitFilesContent)) throw new ImportToolContentException("Import Submit tool content failed. Deserialized object is " + toolPOJO); SubmitFilesContent toolContentObj = (SubmitFilesContent) toolPOJO; Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java,v diff -u -r1.9 -r1.10 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java 4 Oct 2006 09:44:52 -0000 1.9 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java 18 Oct 2006 02:19:43 -0000 1.10 @@ -275,14 +275,14 @@ * if any other error occurs */ public void importToolContent(Long toolContentId, Integer newUserUid, - String toolContentPath) throws ToolException { + String toolContentPath,String fromVersion,String toVersion) throws ToolException { try { exportContentService.registerFileClassForImport( ScribeAttachment.class.getName(), "fileUuid", "fileVersionId", "fileName", "fileType", null, null); Object toolPOJO = exportContentService.importToolContent( - toolContentPath, scribeToolContentHandler); + toolContentPath, scribeToolContentHandler,fromVersion,toVersion); if (!(toolPOJO instanceof Scribe)) throw new ImportToolContentException( "Import Scribe tool content failed. Deserialized object is " Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java,v diff -u -r1.12 -r1.13 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java 4 Oct 2006 08:52:24 -0000 1.12 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java 18 Oct 2006 02:20:07 -0000 1.13 @@ -635,13 +635,13 @@ } - public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException { + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath,String fromVersion,String toVersion) throws ToolException { try { exportContentService.registerFileClassForImport(SurveyAttachment.class.getName() ,"fileUuid","fileVersionId","fileName","fileType",null,null); - Object toolPOJO = exportContentService.importToolContent(toolContentPath,surveyToolContentHandler); + Object toolPOJO = exportContentService.importToolContent(toolContentPath,surveyToolContentHandler,fromVersion,toVersion); if(!(toolPOJO instanceof Survey)) throw new ImportToolContentException("Import survey tool content failed. Deserialized object is " + toolPOJO); Survey toolContentObj = (Survey) toolPOJO; 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.52 -r1.53 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 15 Oct 2006 04:55:50 -0000 1.52 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 18 Oct 2006 02:20:34 -0000 1.53 @@ -1667,12 +1667,12 @@ * for the content. * @throws ToolException if any other error occurs */ - public void importToolContent(Long toolContentID, Integer newUserUid, String toolContentPath) throws ToolException { + public void importToolContent(Long toolContentID, Integer newUserUid, String toolContentPath,String fromVersion,String toVersion) throws ToolException { try { exportContentService.registerFileClassForImport(VoteUploadedFile.class.getName() ,"uuid",null,"fileName","fileProperty",null,null); - Object toolPOJO = exportContentService.importToolContent(toolContentPath,voteToolContentHandler); + Object toolPOJO = exportContentService.importToolContent(toolContentPath,voteToolContentHandler,fromVersion,toVersion); if(!(toolPOJO instanceof VoteContent)) throw new ImportToolContentException("Import Vote tool content failed. Deserialized object is " + toolPOJO); VoteContent toolContentObj = (VoteContent) toolPOJO;