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.48 -r1.49
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	1 Jun 2006 06:59:46 -0000	1.48
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	2 Jun 2006 06:04:04 -0000	1.49
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v
diff -u -r1.62 -r1.63
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	1 Jun 2006 07:00:52 -0000	1.62
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	2 Jun 2006 06:04:32 -0000	1.63
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v
diff -u -r1.52 -r1.53
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	1 Jun 2006 07:01:42 -0000	1.52
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	2 Jun 2006 06:05:21 -0000	1.53
@@ -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_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.23 -r1.24
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	1 Jun 2006 07:02:58 -0000	1.23
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	2 Jun 2006 06:08:31 -0000	1.24
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v
diff -u -r1.45 -r1.46
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	1 Jun 2006 07:03:57 -0000	1.45
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	2 Jun 2006 06:09:20 -0000	1.46
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v
diff -u -r1.35 -r1.36
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	1 Jun 2006 07:05:15 -0000	1.35
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	2 Jun 2006 06:10:05 -0000	1.36
@@ -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 {
 		
 	}