Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml
===================================================================
diff -u -rb9ef7102d5de177b2caeaa920e9cfce8996267ed -r917358423e83fc323518885887537421fd0afafb
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	(.../InstructionFiles.hbm.xml)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	(.../InstructionFiles.hbm.xml)	(revision 917358423e83fc323518885887537421fd0afafb)
@@ -52,6 +52,15 @@
             length="20"
         />
 
+        <property
+            name="name"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="name"
+            length="255"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-InstructionFiles.xml
Index: lams_tool_sbmt/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -rb9ef7102d5de177b2caeaa920e9cfce8996267ed -r917358423e83fc323518885887537421fd0afafb
--- lams_tool_sbmt/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
+++ lams_tool_sbmt/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 917358423e83fc323518885887537421fd0afafb)
@@ -15,10 +15,13 @@
 				   type="java.lang.Long"/>
 				   
 	<form-property name="lockOnFinished"
-				   type="java.lang.Long"/>		   
+				   type="java.lang.String"/>		   
 				   
-	<form-property name="filename"
+	<form-property name="onlineFile"
 				   type="org.apache.struts.upload.FormFile"/>
+				   
+	<form-property name="offlineFile"
+				   type="org.apache.struts.upload.FormFile"/>
 </form-bean>
 
 
Index: lams_tool_sbmt/db/model/lams_tool_sbmt.clay
===================================================================
diff -u -rb9ef7102d5de177b2caeaa920e9cfce8996267ed -r917358423e83fc323518885887537421fd0afafb
--- lams_tool_sbmt/db/model/lams_tool_sbmt.clay	(.../lams_tool_sbmt.clay)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
+++ lams_tool_sbmt/db/model/lams_tool_sbmt.clay	(.../lams_tool_sbmt.clay)	(revision 917358423e83fc323518885887537421fd0afafb)
@@ -9,7 +9,7 @@
 <table-list>
 <table alias="" name="tl_lasbmt11_content" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="127" y="20"/>
+<table-figure-bounds height="-1" width="-1" x="10" y="10"/>
 <column-list>
 <column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="0" mandatory="true" name="content_id" remarks="">
 <column-description></column-description>
@@ -123,7 +123,7 @@
 </table>
 <table alias="" name="tl_lasbmt11_instruction_files" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="173" y="266"/>
+<table-figure-bounds height="-1" width="-1" x="57" y="257"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="file_id" remarks="">
 <column-description></column-description>
@@ -171,6 +171,13 @@
 <variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="name" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
 <column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="content_id" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
@@ -212,7 +219,7 @@
 </table>
 <table alias="" name="tl_lasbmt11_report" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="555" y="83"/>
+<table-figure-bounds height="-1" width="-1" x="647" y="179"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="report_id" remarks="">
 <column-description></column-description>
@@ -269,7 +276,7 @@
 </table>
 <table alias="" name="tl_lasbmt11_session" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="805" y="235"/>
+<table-figure-bounds height="-1" width="-1" x="573" y="8"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="session_id" remarks="">
 <column-description></column-description>
@@ -338,7 +345,7 @@
 </table>
 <table alias="" name="tl_lasbmt11_submission_details" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="503" y="316"/>
+<table-figure-bounds height="-1" width="-1" x="437" y="316"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="submission_id" remarks="">
 <column-description></column-description>
Index: lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql
===================================================================
diff -u -rb9ef7102d5de177b2caeaa920e9cfce8996267ed -r917358423e83fc323518885887537421fd0afafb
--- lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql	(.../create_lams_tool_sbmt.sql)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
+++ lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql	(.../create_lams_tool_sbmt.sql)	(revision 917358423e83fc323518885887537421fd0afafb)
@@ -36,6 +36,7 @@
      , uuid BIGINT(20)
      , version_id BIGINT(20)
      , type VARCHAR(20)
+     , name VARCHAR(255)
      , content_id BIGINT(20)
      , PRIMARY KEY (file_id)
      , INDEX (content_id)
@@ -59,6 +60,7 @@
 )TYPE=InnoDB;
 
 
+
 INSERT INTO `tl_lasbmt11_content` (content_id,title,instruction,define_later,run_offline,content_in_use,lock_on_finished) values(1,"Java Submission","Submit your java programs",0,0,0,0);
 INSERT INTO `tl_lasbmt11_session` (session_id,content_id,status) values(1,1,1);
 SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_sbmt/db/sql/table-schema.sql
===================================================================
diff -u -rb9ef7102d5de177b2caeaa920e9cfce8996267ed -r917358423e83fc323518885887537421fd0afafb
--- lams_tool_sbmt/db/sql/table-schema.sql	(.../table-schema.sql)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
+++ lams_tool_sbmt/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 917358423e83fc323518885887537421fd0afafb)
@@ -31,6 +31,7 @@
    uuid bigint,
    version_id bigint,
    type varchar(20),
+   name varchar(255),
    content_id bigint,
    primary key (file_id)
 );
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml
===================================================================
diff -u -rb9ef7102d5de177b2caeaa920e9cfce8996267ed -r917358423e83fc323518885887537421fd0afafb
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	(.../InstructionFiles.hbm.xml)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	(.../InstructionFiles.hbm.xml)	(revision 917358423e83fc323518885887537421fd0afafb)
@@ -52,6 +52,15 @@
             length="20"
         />
 
+        <property
+            name="name"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="name"
+            length="255"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-InstructionFiles.xml
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java
===================================================================
diff -u -rb9ef7102d5de177b2caeaa920e9cfce8996267ed -r917358423e83fc323518885887537421fd0afafb
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java	(.../InstructionFiles.java)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java	(.../InstructionFiles.java)	(revision 917358423e83fc323518885887537421fd0afafb)
@@ -35,6 +35,7 @@
 	private Long fileID;
 	private Long uuID;
 	private Long versionID;
+	private String name;
 	private String type;
 	/**
      * @hibernate.id generator-class="identity" type="java.lang.Long" column="file_id"
@@ -100,4 +101,17 @@
 	public void setType(String type) {
 		this.type = type;
 	}
+	/**
+	 * @hibernate.property column="name" length="255"
+	 * @return Returns the name.
+	 */
+	public String getName() {
+		return name;
+	}
+	/**
+	 * @param name The name to set.
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties
===================================================================
diff -u -rb9ef7102d5de177b2caeaa920e9cfce8996267ed -r917358423e83fc323518885887537421fd0afafb
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties	(.../SbmtResources.properties)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties	(.../SbmtResources.properties)	(revision 917358423e83fc323518885887537421fd0afafb)
@@ -18,9 +18,10 @@
 label.authoring.save.button=Save
 label.authoring.cancel.button=Cancel
 label.authoring.choosefile.button=Choose file
-label.authoring.upload.online.button=Upload
-label.authoring.upload.offline.button=Upload
+label.authoring.upload.online.button=Upload Online
+label.authoring.upload.offline.button=Upload Offline
 
+authoring.exception= There is a problem submitting content, the reason is {0}
 #-------------------------Learners Labels-----------------#
 label.learner.fileName = File Name
 label.learner.filePath = File 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java
===================================================================
diff -u -rb9ef7102d5de177b2caeaa920e9cfce8996267ed -r917358423e83fc323518885887537421fd0afafb
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java	(.../AuthoringDTO.java)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java	(.../AuthoringDTO.java)	(revision 917358423e83fc323518885887537421fd0afafb)
@@ -69,13 +69,15 @@
 		onlineFiles = new ArrayList();
 		offlineFiles = new ArrayList();
 		Set fileSet = content.getInstructionFiles();
-		Iterator iter = fileSet.iterator();
-		while(iter.hasNext()){
-			InstructionFiles file = (InstructionFiles) iter.next();
-			if(StringUtils.equalsIgnoreCase(file.getType(),IToolContentHandler.TYPE_OFFLINE))
-				offlineFiles.add(file);
-			else
-				onlineFiles.add(file);
+		if(fileSet != null){
+			Iterator iter = fileSet.iterator();
+			while(iter.hasNext()){
+				InstructionFiles file = (InstructionFiles) iter.next();
+				if(StringUtils.equalsIgnoreCase(file.getType(),IToolContentHandler.TYPE_OFFLINE))
+					offlineFiles.add(file);
+				else
+					onlineFiles.add(file);
+			}
 		}
 		
 	}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -rb9ef7102d5de177b2caeaa920e9cfce8996267ed -r917358423e83fc323518885887537421fd0afafb
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 917358423e83fc323518885887537421fd0afafb)
@@ -292,7 +292,13 @@
 	 * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#getSubmitFilesContent(java.lang.Long)
 	 */
 	public SubmitFilesContent getSubmitFilesContent(Long contentID) {
-		return submitFilesContentDAO.getContentByID(contentID);
+		SubmitFilesContent content = new SubmitFilesContent();
+		try {
+			content = submitFilesContentDAO.getContentByID(contentID);
+		} catch (Exception e) {
+			log.error("Could not find the content by givn ID:"+contentID+". Excpetion is " + e);
+		}
+		return content;
 	}
 
 	/**
@@ -458,6 +464,7 @@
 		file.setType(fileType);
 		file.setUuID(nodeKey.getUuid());
 		file.setVersionID(nodeKey.getVersion());
+		file.setName(uploadFile.getFileName());
 		fileSet.add(file);
 		submitFilesContentDAO.save(content);
 	}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java
===================================================================
diff -u
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	(revision 0)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	(revision 917358423e83fc323518885887537421fd0afafb)
@@ -0,0 +1,27 @@
+/*
+ *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ *
+ *This program is free software; you can redistribute it and/or modify
+ *it under the terms of the GNU General Public License as published by
+ *the Free Software Foundation; either version 2 of the License, or
+ *(at your option) any later version.
+ *
+ *This program is distributed in the hope that it will be useful,
+ *but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *GNU General Public License for more details.
+ *
+ *You should have received a copy of the GNU General Public License
+ *along with this program; if not, write to the Free Software
+ *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *USA
+ *
+ *http://www.gnu.org/licenses/gpl.txt
+ */
+package org.lamsfoundation.lams.tool.sbmt.util;
+
+public class SbmtConstants {
+
+	public static final String AUTHORING_DTO = "authoring";
+
+}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
diff -u -rb9ef7102d5de177b2caeaa920e9cfce8996267ed -r917358423e83fc323518885887537421fd0afafb
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 917358423e83fc323518885887537421fd0afafb)
@@ -12,99 +12,138 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.DynaActionForm;
-import org.apache.struts.actions.DispatchAction;
 import org.apache.struts.actions.LookupDispatchAction;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.dto.AuthoringDTO;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
-import org.lamsfoundation.lams.tool.sbmt.util.SbmtToolContentHandler;
+import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
  * @author Manpreet Minhas
  * 
- * @struts.action path="/authoring" name="SbmtAuthoringForm" parameter="action"
- *                input="/authoring/authoring.jsp" scope="request" validate="true"
+ * @struts.action path="/authoring" 
+ * 				  name="SbmtAuthoringForm" 
+ * 				  parameter="action"
+ *                input="/authoring/authoring.jsp" 
+ *                scope="request" 
+ *                validate="true"
  * 
  * @struts.action-forward name="success" path="/authoring/success.jsp"
+ * @struts.action-exception 
+ * 				type="org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException" 
+ * 				key="authoring.exception"
+ * 				path="/authoring/authoring.jsp"
  * 
  */
 public class AuthoringAction extends LookupDispatchAction {
 	private Logger log = Logger.getLogger(AuthoringAction.class);
 
 	public ISubmitFilesService submitFilesService;
-
+	/**
+	 * Update content
+	 *  
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
 	public ActionForward updateContent(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 
-		DynaActionForm authForm = (DynaActionForm) form;
-		Long contentID = (Long) authForm.get("toolContentID");
-		String title = (String) authForm.get("title");
-		String instructions = (String) authForm.get("instructions");
-		String online_instruction = (String) authForm.get("onlineInstruction");
-		String offline_instruction = (String) authForm.get("offlineInstruction");
-		String value = (String) authForm.get("lockOnFinished");
-		//todo:need confirm
-		boolean lock_on_finished = false; 
-
+		SubmitFilesContent content = getContent(form);
+		
 		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this
 				.getServlet().getServletContext());
 		try {
-			SubmitFilesContent content = new SubmitFilesContent();
-			content.setContentID(contentID);
-			content.setContentInUse(false);
-			content.setDefineLater(false);
-			content.setInstruction(instructions);
-			content.setOfflineInstruction(offline_instruction);
-			content.setOnlineInstruction(online_instruction);
-			content.setRunOffline(false);
-			content.setRunOfflineInstruction("");
-			content.setTitle(title);
-			content.setLockOnFinished(lock_on_finished);
-			// content.setInstrctionFiles()
-			// content.setToolSession();
-			submitFilesService.addSubmitFilesContent(content);
+			SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(content.getContentID());
+			if(content.getContentID().equals(persistContent.getContentID())){
+				copyContentSimpleProperty(persistContent,content);
+				submitFilesService.updateSubmitFilesContent(persistContent);
+			}else
+				submitFilesService.addSubmitFilesContent(content);
 		} catch (Exception e) {
 			log.error(e);
 		}
 		return mapping.findForward("success");
 	}
 
+	private void copyContentSimpleProperty(SubmitFilesContent target, SubmitFilesContent src) {
+		target.setContentID(src.getContentID());
+		target.setContentInUse(src.isContentInUse());
+		target.setDefineLater(src.isDefineLater());
+		target.setRunOffline(src.isRunOffline());
+		target.setInstruction(src.getInstruction());
+		target.setOfflineInstruction(src.getOfflineInstruction());
+		target.setOnlineInstruction(src.getOnlineInstruction());
+		target.setRunOfflineInstruction(src.getRunOfflineInstruction());
+		target.setTitle(src.getTitle());
+		target.setLockOnFinished(src.isLockOnFinished());
+	}
+
+	/**
+	 * Handle upload online instruction files request.
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
 	public ActionForward uploadOnline(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 		return uploadFile(mapping, form, IToolContentHandler.TYPE_ONLINE,request);
-
 	}
-
+	/**
+	 * Handle upload offline instruction files request.
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
 	public ActionForward uploadOffline(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 		return uploadFile(mapping, form, IToolContentHandler.TYPE_OFFLINE,request);
-
 	}
-
+	/**
+	 * Common method to upload online or offline instruction files request.
+	 * @param mapping
+	 * @param form
+	 * @param type
+	 * @param request
+	 * @return
+	 */
 	private ActionForward uploadFile(ActionMapping mapping, ActionForm form,
 			String type,HttpServletRequest request) {
 
 		DynaActionForm authForm = (DynaActionForm) form;
-		FormFile file = (FormFile) authForm.get("filename");
-		Long contentID = (Long) authForm.get("toolContentID");
-		submitFilesService.uploadFileToContent(contentID, file, type);
-		//get back the upload file list and display them on page
-		SubmitFilesContent content = submitFilesService.getSubmitFilesContent(contentID);
-		AuthoringDTO dto = new AuthoringDTO(content);
-		request.setAttribute("onlinefiles",dto.getOnlineFiles());
-		request.setAttribute("offlinefiles",dto.getOfflineFiles());
 		
+		FormFile file;
+		if(StringUtils.equals(IToolContentHandler.TYPE_OFFLINE,type))
+			file = (FormFile) authForm.get("offlineFile");
+		else
+			file = (FormFile) authForm.get("onlineFile");
+		
+		SubmitFilesContent content = getContent(form);
+		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this
+				.getServlet().getServletContext());
+		submitFilesService.uploadFileToContent(content.getContentID(), file, type);
+		
+		//send back the upload file list and display them on page
+		SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(content.getContentID());
+		content.setInstructionFiles(persistContent.getInstructionFiles());
+		AuthoringDTO authorDto = new AuthoringDTO(content);
+		request.setAttribute(SbmtConstants.AUTHORING_DTO,authorDto);
 		return mapping.getInputForward();
 
 	}
@@ -129,10 +168,53 @@
 	protected ActionForward unspecified(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 
-		Long contentID = new Long(WebUtil.readLongParam(request,
-				"toolContentID"));
-		request.setAttribute("toolContentID", contentID);
+		Long contentID = new Long(WebUtil.readLongParam(request,"toolContentID"));
+		
+		//get back the upload file list and display them on page
+		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this
+				.getServlet().getServletContext());
+		
+		SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(contentID);
+		//if this content does not exist, then reset the contentID to current value to keep it on HTML page.
+		persistContent.setContentID(contentID);
+		
+		AuthoringDTO authorDto = new AuthoringDTO(persistContent);
+		request.setAttribute(SbmtConstants.AUTHORING_DTO,authorDto);
+		//set back STRUTS component value
+		DynaActionForm authForm = (DynaActionForm) form;
+		authForm.set("title",authorDto.getTitle());
+		authForm.set("lockOnFinished",authorDto.isLockOnFinished()?"1":null);
 		return mapping.getInputForward();
 	}
 
+	/**
+	 * Get content from ActionForm parameters.
+	 * 
+	 * @param form
+	 * @return
+	 */
+	private SubmitFilesContent getContent(ActionForm form) {
+		DynaActionForm authForm = (DynaActionForm) form;
+		Long contentID = (Long) authForm.get("toolContentID");
+		String title = (String) authForm.get("title");
+		String instructions = (String) authForm.get("instructions");
+		String online_instruction = (String) authForm.get("onlineInstruction");
+		String offline_instruction = (String) authForm.get("offlineInstruction");
+		String value = (String) authForm.get("lockOnFinished");
+		boolean lock_on_finished = StringUtils.isEmpty(value)?false:true;
+		SubmitFilesContent content = new SubmitFilesContent();
+		content.setContentID(contentID);
+		content.setContentInUse(false);
+		content.setDefineLater(false);
+		content.setRunOffline(false);
+		content.setInstruction(instructions);
+		content.setOfflineInstruction(offline_instruction);
+		content.setOnlineInstruction(online_instruction);
+		content.setRunOfflineInstruction("");
+		content.setTitle(title);
+		content.setLockOnFinished(lock_on_finished);
+		// content.setInstrctionFiles()
+		// content.setToolSession();
+		return content;
+	}
 }
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rb9ef7102d5de177b2caeaa920e9cfce8996267ed -r917358423e83fc323518885887537421fd0afafb
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 917358423e83fc323518885887537421fd0afafb)
@@ -25,9 +25,11 @@
 	<form-property name="toolContentID"
 				   type="java.lang.Long"/>
 	<form-property name="lockOnFinished"
-				   type="java.lang.Long"/>		   
-	<form-property name="filename"
+				   type="java.lang.String"/>		   
+	<form-property name="onlineFile"
 				   type="org.apache.struts.upload.FormFile"/>
+	<form-property name="offlineFile"
+				   type="org.apache.struts.upload.FormFile"/>
 </form-bean>
 
 <form-bean name="SbmtLearnerForm" type="org.apache.struts.validator.DynaValidatorForm">
@@ -122,6 +124,11 @@
       unknown="false"
       validate="true"
     >
+      <exception
+        key="authoring.exception"
+        type="org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException"
+        path="/authoring/authoring.jsp"
+      />
       <forward
         name="success"
         path="/authoring/success.jsp"
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -rb9ef7102d5de177b2caeaa920e9cfce8996267ed -r917358423e83fc323518885887537421fd0afafb
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 917358423e83fc323518885887537421fd0afafb)
@@ -17,14 +17,15 @@
 </head>
 
 <body>
-<html:form action="authoring?method=updateContent" method="post"
-	focus="login"  enctype="multipart/form-data">
+<html:form action="authoring" method="post"
+	focus="title"  enctype="multipart/form-data">
+	<html:errors/>
 	<div id="basic">
 	<h1><fmt:message key="label.authoring.heading.basic" /></h1>
 	<h1><fmt:message key="label.authoring.heading.basic.desc" /></h1>
 	<table class="forms">
 		<!--hidden field contentID passed by flash-->
-		<html:hidden property="toolContentID" value="${toolContentID}" />
+		<html:hidden property="toolContentID" value="${authoring.contentID}" />
 		<!-- Title Row -->
 		<tr>
 			<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
@@ -35,6 +36,7 @@
 			<td class="formlabel"><fmt:message key="label.authoring.basic.instruction" />:</td>
 			<td class="formcontrol"><FCK:editor id="instructions"
 				basePath="/lams/fckEditor/" height="150" width="85%">
+				<c:out value="${authoring.instruction}" escapeXml="false"/>
 			</FCK:editor></td>
 		</tr>
 	</table>
@@ -53,17 +55,26 @@
 				key="label.authoring.online.instruction" />:</td>
 			<td class="formcontrol"><FCK:editor id="onlineInstruction"
 				basePath="/lams/fckEditor/" height="150" width="85%">
+				<c:out value="${authoring.onlineInstruction}" escapeXml="false"/>
 			</FCK:editor></td>
 		</tr>
 		<tr>
+			<td></td>
+			<td class="formcontrol">
+				<c:forEach var="file" items="${authoring.onlineFiles}">
+					<li><c:out value="${file.name}"/></li>
+				</c:forEach>
+			</td>
+		</tr>
+		<tr>
 			<td class="formlabel">
 				<fmt:message key="label.authoring.online.file" />:
 			</td>
 			<td class="formcontrol">
-				<html:file property="filename">
+				<html:file property="onlineFile">
 					<fmt:message key="label.authoring.choosefile.button" />
 				</html:file>
-				<html:submit property="submit">
+				<html:submit property="action">
 					<fmt:message key="label.authoring.upload.online.button" />
 				</html:submit>
 			</td>
@@ -73,17 +84,26 @@
 				key="label.authoring.offline.instruction" />:</td>
 			<td class="formcontrol"><FCK:editor id="offlineInstruction"
 				basePath="/lams/fckEditor/" height="150" width="85%">
+				<c:out value="${authoring.offlineInstruction}" escapeXml="false"/>
 			</FCK:editor></td>
 		</tr>
 		<tr>
+			<td></td>
+			<td class="formcontrol">
+				<c:forEach var="file" items="${authoring.offlineFiles}">
+					<li><c:out value="${file.name}"/></li>
+				</c:forEach>
+			</td>
+		</tr>
+		<tr>
 			<td class="formlabel">
 				<fmt:message key="label.authoring.offline.file" />:
 			</td>
 			<td class="formcontrol">
-				<html:file property="filename">
+				<html:file property="offlineFile">
 					<fmt:message key="label.authoring.choosefile.button" />
 				</html:file>
-				<html:submit property="submit">
+				<html:submit property="action">
 					<fmt:message key="label.authoring.upload.offline.button" />
 				</html:submit>
 			</td>
@@ -102,9 +122,9 @@
 		<!-- Instructions Row -->
 		<tr>
 			<td class="formcontrol">
-				<html:radio property="lockOnFinished" value="1">
+				<html:checkbox property="lockOnFinished" value="1">
 					<fmt:message key="label.authoring.advance.lock.on.finished" />
-				</html:radio>
+				</html:checkbox>
 			</td>
 		</tr>
 	</table>
@@ -117,7 +137,7 @@
 				<fmt:message key="label.authoring.cancel.button" />
 			</html:button></td>
 			<td class="formcontrol">
-			<html:submit property="submit">
+			<html:submit property="action">
 				<fmt:message key="label.authoring.save.button" />
 			</html:submit></td>
 	</table>
Fisheye: Tag 917358423e83fc323518885887537421fd0afafb refers to a dead (removed) revision in file `lams_tool_sbmt/web/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/authoring/success.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/authoring/success.jsp	(revision 0)
+++ lams_tool_sbmt/web/authoring/success.jsp	(revision 917358423e83fc323518885887537421fd0afafb)
@@ -0,0 +1,5 @@
+<html>
+<body>
+Success, back to <a href="Login.jsp">index</a>.
+</body>
+</html>
\ No newline at end of file