Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
===================================================================
diff -u -r28b3045d39cf68d79a469dfa23e625b3822abfe0 -r40632908af1b31e1af4f1607b0ee4031ab098a84
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision 28b3045d39cf68d79a469dfa23e625b3822abfe0)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision 40632908af1b31e1af4f1607b0ee4031ab098a84)
@@ -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
===================================================================
diff -u -r2700025047410d38f40b3bd7c56966a9fc08bb29 -r40632908af1b31e1af4f1607b0ee4031ab098a84
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 2700025047410d38f40b3bd7c56966a9fc08bb29)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 40632908af1b31e1af4f1607b0ee4031ab098a84)
@@ -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
===================================================================
diff -u
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java	(revision 0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java	(revision 40632908af1b31e1af4f1607b0ee4031ab098a84)
@@ -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
===================================================================
diff -u -rae3a279333f20ce806e7956ac2b6816b70f19642 -r40632908af1b31e1af4f1607b0ee4031ab098a84
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision ae3a279333f20ce806e7956ac2b6816b70f19642)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 40632908af1b31e1af4f1607b0ee4031ab098a84)
@@ -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
===================================================================
diff -u -r28b3045d39cf68d79a469dfa23e625b3822abfe0 -r40632908af1b31e1af4f1607b0ee4031ab098a84
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 28b3045d39cf68d79a469dfa23e625b3822abfe0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 40632908af1b31e1af4f1607b0ee4031ab098a84)
@@ -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
===================================================================
diff -u -r2700025047410d38f40b3bd7c56966a9fc08bb29 -r40632908af1b31e1af4f1607b0ee4031ab098a84
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 2700025047410d38f40b3bd7c56966a9fc08bb29)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 40632908af1b31e1af4f1607b0ee4031ab098a84)
@@ -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
===================================================================
diff -u -r2a6d3a91cb4cf1c169518fe434154f645fabd602 -r40632908af1b31e1af4f1607b0ee4031ab098a84
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	(.../NoticeboardServicePOJO.java)	(revision 2a6d3a91cb4cf1c169518fe434154f645fabd602)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	(.../NoticeboardServicePOJO.java)	(revision 40632908af1b31e1af4f1607b0ee4031ab098a84)
@@ -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
===================================================================
diff -u -r28b3045d39cf68d79a469dfa23e625b3822abfe0 -r40632908af1b31e1af4f1607b0ee4031ab098a84
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision 28b3045d39cf68d79a469dfa23e625b3822abfe0)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision 40632908af1b31e1af4f1607b0ee4031ab098a84)
@@ -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
===================================================================
diff -u -r4ac72923dceaa7fbeff388951a458462f1f7ac71 -r40632908af1b31e1af4f1607b0ee4031ab098a84
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 4ac72923dceaa7fbeff388951a458462f1f7ac71)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 40632908af1b31e1af4f1607b0ee4031ab098a84)
@@ -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
===================================================================
diff -u -r4b4b0d35dcce611d0cb85cab458f2e9687858ef0 -r40632908af1b31e1af4f1607b0ee4031ab098a84
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	(.../ScribeService.java)	(revision 4b4b0d35dcce611d0cb85cab458f2e9687858ef0)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	(.../ScribeService.java)	(revision 40632908af1b31e1af4f1607b0ee4031ab098a84)
@@ -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
===================================================================
diff -u -r1c302b4cc728a5f47d0b710e5645212b782aedd4 -r40632908af1b31e1af4f1607b0ee4031ab098a84
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision 1c302b4cc728a5f47d0b710e5645212b782aedd4)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision 40632908af1b31e1af4f1607b0ee4031ab098a84)
@@ -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
===================================================================
diff -u -r9e404dff209b29c6df8b3e2e12a88077413d5095 -r40632908af1b31e1af4f1607b0ee4031ab098a84
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	(.../VoteServicePOJO.java)	(revision 9e404dff209b29c6df8b3e2e12a88077413d5095)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	(.../VoteServicePOJO.java)	(revision 40632908af1b31e1af4f1607b0ee4031ab098a84)
@@ -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;