Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rc8ada738d232f17c286242d2e86081d116ed1e94 -rdae4a8667e5202762e22b18d152dcb112c78b982
Binary files differ
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
===================================================================
diff -u -r4f91fec3726e432ec1d9bf68967937fb3507f138 -rdae4a8667e5202762e22b18d152dcb112c78b982
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision 4f91fec3726e432ec1d9bf68967937fb3507f138)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision dae4a8667e5202762e22b18d152dcb112c78b982)
@@ -248,7 +248,7 @@
      * for the content.
      * @throws ToolException if any other error occurs
      */
-	public void importToolContent(String toolContentPath) throws ToolException {
+	public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException {
 		
 	}
 	
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98 -rdae4a8667e5202762e22b18d152dcb112c78b982
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision dae4a8667e5202762e22b18d152dcb112c78b982)
@@ -602,7 +602,7 @@
      * for the content.
      * @throws ToolException if any other error occurs
      */
-	public void importToolContent(String toolContentPath) throws ToolException {
+	public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException {
 			
 	}
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98 -rdae4a8667e5202762e22b18d152dcb112c78b982
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision dae4a8667e5202762e22b18d152dcb112c78b982)
@@ -1516,7 +1516,7 @@
      * for the content.
      * @throws ToolException if any other error occurs
      */
-	public void importToolContent(String toolContentPath) throws ToolException {
+	public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException {
 		
 	}
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98 -rdae4a8667e5202762e22b18d152dcb112c78b982
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision dae4a8667e5202762e22b18d152dcb112c78b982)
@@ -1317,7 +1317,7 @@
      * for the content.
      * @throws ToolException if any other error occurs
      */
-	public void importToolContent(String toolContentPath) throws ToolException {
+	public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException {
 		
 	}
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98 -rdae4a8667e5202762e22b18d152dcb112c78b982
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision dae4a8667e5202762e22b18d152dcb112c78b982)
@@ -756,14 +756,21 @@
 	}
 
 
-	public void importToolContent(String toolContentPath) throws ToolException {
+	public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException {
 	
 		try {
 			exportContentService.registerFileClassForImport("org.lamsfoundation.lams.tool.rsrc.model.ResourceAttachment"
 					,"fileUuid","fileVersionId","fileName","fileType",null,null);
 			exportContentService.registerFileClassForImport("org.lamsfoundation.lams.tool.rsrc.model.ResourceItem"
 					,"fileUuid","fileVersionId","fileName","fileType",null,"initialItem");
 			Object toolPOJO =  exportContentService.importToolContent(toolContentPath,resourceToolContentHandler);
+			if(!(toolPOJO instanceof Resource))
+				throw new ImportToolContentException("Import Share resources tool content failed. Deserialized object is " + toolPOJO);
+			Resource toolContentObj = (Resource) toolPOJO;
+			
+//			reset it to new toolContentId
+			toolContentObj.setContentId(toolContentId);
+			resourceDao.saveObject(toolContentObj);
 		} catch (ImportToolContentException e) {
 			throw new ToolException(e);
 		}
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java
===================================================================
diff -u -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98 -rdae4a8667e5202762e22b18d152dcb112c78b982
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	(.../NoticeboardServicePOJO.java)	(revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	(.../NoticeboardServicePOJO.java)	(revision dae4a8667e5202762e22b18d152dcb112c78b982)
@@ -896,7 +896,7 @@
      * for the content.
      * @throws ToolException if any other error occurs
      */
-	public void importToolContent(String toolContentPath) throws ToolException {
+	public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException {
 		
 	}
 	/* ===============Methods implemented from ToolSessionManager =============== */
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98 -rdae4a8667e5202762e22b18d152dcb112c78b982
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision dae4a8667e5202762e22b18d152dcb112c78b982)
@@ -240,12 +240,19 @@
 		}
 	}
  	
- 	public void importToolContent(String toolContentPath) throws ToolException {
+ 	public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException {
  		
 		try {
 			exportContentService.registerFileClassForImport("org.lamsfoundation.lams.tool.sbmt.InstructionFiles",
 					"uuID","versionID","name","type",null,null);
 			Object toolPOJO =  exportContentService.importToolContent(toolContentPath,sbmtToolContentHandler);
+			if(!(toolPOJO instanceof SubmitFilesContent))
+				throw new ImportToolContentException("Import Submit tool content failed. Deserialized object is " + toolPOJO);
+			SubmitFilesContent toolContentObj = (SubmitFilesContent) toolPOJO;
+			
+			//reset it to new toolContentId
+			toolContentObj.setContentID(toolContentId);
+			submitFilesContentDAO.saveOrUpdate(toolContentObj);
 		} catch (ImportToolContentException e) {
 			throw new ToolException(e);
 		}
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
===================================================================
diff -u -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98 -rdae4a8667e5202762e22b18d152dcb112c78b982
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	(.../VoteServicePOJO.java)	(revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	(.../VoteServicePOJO.java)	(revision dae4a8667e5202762e22b18d152dcb112c78b982)
@@ -1561,7 +1561,7 @@
      * for the content.
      * @throws ToolException if any other error occurs
      */
-	public void importToolContent(String toolContentPath) throws ToolException {
+	public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException {
 		
 	}