Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml
===================================================================
diff -u -rde9ee5f6274f17bb25bbba6f8ea3038cfebd5a90 -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	(.../InstructionFiles.hbm.xml)	(revision de9ee5f6274f17bb25bbba6f8ea3038cfebd5a90)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	(.../InstructionFiles.hbm.xml)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -43,6 +43,15 @@
             length="20"
         />
 
+        <property
+            name="type"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="type"
+            length="20"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-InstructionFiles.xml
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
===================================================================
diff -u -rde9ee5f6274f17bb25bbba6f8ea3038cfebd5a90 -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision de9ee5f6274f17bb25bbba6f8ea3038cfebd5a90)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -116,7 +116,7 @@
         />
 
         <set
-            name="instrctionFiles"
+            name="instructionFiles"
             lazy="true"
             inverse="false"
             cascade="all-delete-orphan"
@@ -134,6 +134,15 @@
 
         </set>
 
+        <property
+            name="lockOnFinished"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="lock_on_finished"
+            length="1"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-SubmitFilesContent.xml
Index: lams_tool_sbmt/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r4f4b5c90a74621f805dff5922233ca7e0240931f -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 4f4b5c90a74621f805dff5922233ca7e0240931f)
+++ lams_tool_sbmt/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -1,11 +1,24 @@
 <form-bean name ="SbmtAuthoringForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="title" 
 				   type="java.lang.String" />
+				   
 	<form-property name="instructions" 
 				   type="java.lang.String" />
+				   
+	<form-property name="offlineInstruction" 
+				   type="java.lang.String" />
+				   
+	<form-property name="onlineInstruction" 
+				   type="java.lang.String" />
+				   
 	<form-property name="toolContentID"
 				   type="java.lang.Long"/>
 				   
+	<form-property name="lockOnFinished"
+				   type="java.lang.Long"/>		   
+				   
+	<form-property name="filename"
+				   type="org.apache.struts.upload.FormFile"/>
 </form-bean>
 
 
Index: lams_tool_sbmt/db/model/lams_tool_sbmt.clay
===================================================================
diff -u -rde9ee5f6274f17bb25bbba6f8ea3038cfebd5a90 -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/db/model/lams_tool_sbmt.clay	(.../lams_tool_sbmt.clay)	(revision de9ee5f6274f17bb25bbba6f8ea3038cfebd5a90)
+++ lams_tool_sbmt/db/model/lams_tool_sbmt.clay	(.../lams_tool_sbmt.clay)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -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="151" y="33"/>
+<table-figure-bounds height="-1" width="-1" x="127" y="20"/>
 <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>
@@ -94,6 +94,19 @@
 <variant type-name-pattern="TINYINT ZEROFILL"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="lock_on_finished" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
 </column-list>
 <primary-key alias="" name="PRIMARY" remarks="">
 <primary-key-description></primary-key-description>
@@ -110,7 +123,7 @@
 </table>
 <table alias="" name="tl_lasbmt11_instruction_files" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="185" y="314"/>
+<table-figure-bounds height="-1" width="-1" x="173" y="266"/>
 <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>
@@ -151,6 +164,13 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="type" 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)">
@@ -192,7 +212,7 @@
 </table>
 <table alias="" name="tl_lasbmt11_report" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="810" y="292"/>
+<table-figure-bounds height="-1" width="-1" x="555" y="83"/>
 <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>
@@ -249,7 +269,7 @@
 </table>
 <table alias="" name="tl_lasbmt11_session" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="603" y="48"/>
+<table-figure-bounds height="-1" width="-1" x="805" y="235"/>
 <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>
@@ -318,7 +338,7 @@
 </table>
 <table alias="" name="tl_lasbmt11_submission_details" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="564" y="221"/>
+<table-figure-bounds height="-1" width="-1" x="503" 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/activity_insert.sql
===================================================================
diff -u -r6bb2422083ab3ef5c878fecc60d80f5153542c33 -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/db/sql/activity_insert.sql	(.../activity_insert.sql)	(revision 6bb2422083ab3ef5c878fecc60d80f5153542c33)
+++ lams_tool_sbmt/db/sql/activity_insert.sql	(.../activity_insert.sql)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -60,15 +60,15 @@
 , NULL
 , 0
 , NULL
-, ${learning_library_id}
+, 2
 , NOW()
 , 0
 , 'Do it yourself'
 , 'Do it in LAMS'
 , NULL
 , NULL
 , NULL
-, ${tool_id}
+, 2
 , NULL
 , 4
 , NULL
Index: lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql
===================================================================
diff -u -r4d61d078282166e5cf9c706ff3908c5d16e007c5 -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql	(.../create_lams_tool_sbmt.sql)	(revision 4d61d078282166e5cf9c706ff3908c5d16e007c5)
+++ lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql	(.../create_lams_tool_sbmt.sql)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -1,5 +1,4 @@
 SET FOREIGN_KEY_CHECKS=0;
-
 CREATE TABLE tl_lasbmt11_content (
        content_id BIGINT(20) NOT NULL DEFAULT 0
      , title VARCHAR(64) NOT NULL
@@ -10,6 +9,7 @@
      , online_instruction TEXT
      , run_offline_instruction TEXT
      , content_in_use TINYINT(1)
+     , lock_on_finished TINYINT(1)
      , PRIMARY KEY (content_id)
 )TYPE=InnoDB;
 
@@ -35,6 +35,7 @@
        file_id BIGINT(20) NOT NULL AUTO_INCREMENT
      , uuid BIGINT(20)
      , version_id BIGINT(20)
+     , type VARCHAR(20)
      , content_id BIGINT(20)
      , PRIMARY KEY (file_id)
      , INDEX (content_id)
@@ -57,6 +58,7 @@
                   REFERENCES tl_lasbmt11_session (session_id) ON DELETE NO ACTION ON UPDATE NO ACTION
 )TYPE=InnoDB;
 
-INSERT INTO `tl_lasbmt11_content` (content_id,title,instruction,define_later,run_offline,content_in_use) values(1,"Java Submission","Submit your java programs",0,0,0);
+
+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 -rde9ee5f6274f17bb25bbba6f8ea3038cfebd5a90 -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/db/sql/table-schema.sql	(.../table-schema.sql)	(revision de9ee5f6274f17bb25bbba6f8ea3038cfebd5a90)
+++ lams_tool_sbmt/db/sql/table-schema.sql	(.../table-schema.sql)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -23,12 +23,14 @@
    online_instruction text,
    run_offline_instruction text,
    content_in_use bit,
+   lock_on_finished bit,
    primary key (content_id)
 );
 create table tl_lasbmt11_instruction_files (
    file_id bigint not null auto_increment,
    uuid bigint,
    version_id bigint,
+   type varchar(20),
    content_id bigint,
    primary key (file_id)
 );
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml
===================================================================
diff -u -rde9ee5f6274f17bb25bbba6f8ea3038cfebd5a90 -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	(.../InstructionFiles.hbm.xml)	(revision de9ee5f6274f17bb25bbba6f8ea3038cfebd5a90)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	(.../InstructionFiles.hbm.xml)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -43,6 +43,15 @@
             length="20"
         />
 
+        <property
+            name="type"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="type"
+            length="20"
+        />
+
         <!--
             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 -rde9ee5f6274f17bb25bbba6f8ea3038cfebd5a90 -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java	(.../InstructionFiles.java)	(revision de9ee5f6274f17bb25bbba6f8ea3038cfebd5a90)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java	(.../InstructionFiles.java)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -35,6 +35,7 @@
 	private Long fileID;
 	private Long uuID;
 	private Long versionID;
+	private String type;
 	/**
      * @hibernate.id generator-class="identity" type="java.lang.Long" column="file_id"
 	 * @return Returns the fileID.
@@ -86,4 +87,17 @@
 		
 		return obj;
 	}
+	/**
+	 * @hibernate.property column="type" length="20"
+	 * @return Returns the type.
+	 */
+	public String getType() {
+		return type;
+	}
+	/**
+	 * @param type The type to set.
+	 */
+	public void setType(String type) {
+		this.type = type;
+	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties
===================================================================
diff -u -r4d61d078282166e5cf9c706ff3908c5d16e007c5 -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties	(.../SbmtResources.properties)	(revision 4d61d078282166e5cf9c706ff3908c5d16e007c5)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties	(.../SbmtResources.properties)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -4,16 +4,22 @@
 label.authoring.heading.basic.desc=Basic input information for submission 
 label.authoring.heading.instructions=Submission Instructions
 label.authoring.heading.instructions.desc=Please input online and offline instructions
-label.authoring.heading.instructions=Submission Advance
-label.authoring.heading.instructions.desc=Please input advance options for submission 
+label.authoring.heading.advance=Submission Advance
+label.authoring.heading.advance.desc=Please input advance options for submission 
 
 label.authoring.basic.title=Title
 label.authoring.basic.instruction=Instruction
 label.authoring.online.instruction =Online Instrcution
 label.authoring.offline.instruction=Offline Instrcution
+label.authoring.online.file =Upload online file
+label.authoring.offline.file=Upload offline file
+label.authoring.advance.lock.on.finished=Lock on finished
 
 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
 
 #-------------------------Learners Labels-----------------#
 label.learner.fileName = File Name
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java
===================================================================
diff -u -rde9ee5f6274f17bb25bbba6f8ea3038cfebd5a90 -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java	(.../SubmissionDetails.java)	(revision de9ee5f6274f17bb25bbba6f8ea3038cfebd5a90)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java	(.../SubmissionDetails.java)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -48,16 +48,6 @@
 	/** default constructor */
 	public SubmissionDetails() {
 	}
-
-	/** minimal constructor */
-	public SubmissionDetails(String filePath, String fileDescription, Date dateOfSubmission, Long userID, Long uuid, Long versionID) {
-	    this.filePath = filePath;
-	    this.fileDescription = fileDescription;
-	    this.dateOfSubmission = dateOfSubmission;
-	    this.userID = userID;
-	    this.uuid = uuid;
-	    this.versionID = versionID;
-	}
 	/**
 	 * @hibernate.id generator-class="identity" type="java.lang.Long"
 	 *               column="submission_id"
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
===================================================================
diff -u -rde9ee5f6274f17bb25bbba6f8ea3038cfebd5a90 -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision de9ee5f6274f17bb25bbba6f8ea3038cfebd5a90)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -116,7 +116,7 @@
         />
 
         <set
-            name="instrctionFiles"
+            name="instructionFiles"
             lazy="true"
             inverse="false"
             cascade="all-delete-orphan"
@@ -134,6 +134,15 @@
 
         </set>
 
+        <property
+            name="lockOnFinished"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="lock_on_finished"
+            length="1"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-SubmitFilesContent.xml
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java
===================================================================
diff -u -rde9ee5f6274f17bb25bbba6f8ea3038cfebd5a90 -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	(.../SubmitFilesContent.java)	(revision de9ee5f6274f17bb25bbba6f8ea3038cfebd5a90)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	(.../SubmitFilesContent.java)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -51,6 +51,9 @@
 
 	private Set instructionFiles;
 	
+	/** persistent field */
+	private boolean lockOnFinished;
+
 	/** full constructor */
 	public SubmitFilesContent(String title, String instructions,
 							  Set toolSession) {
@@ -265,18 +268,35 @@
 	 * @hibernate.collection-key column="content_id"
 	 * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.sbmt.InstructionFiles"
 	 * 
-	 * @return Returns the instrctionFiles.
+	 * @return Returns the instructionFiles.
 	 */
-	public Set getInstrctionFiles() {
+	public Set getInstructionFiles() {
 		return instructionFiles;
 	}
 
 	/**
-	 * @param instrctionFiles The instrctionFiles to set.
+	 * @param instructionFiles The instructionFiles to set.
 	 */
-	public void setInstrctionFiles(Set instrctionFiles) {
-		this.instructionFiles = instrctionFiles;
+	public void setInstructionFiles(Set instructionFiles) {
+		this.instructionFiles = instructionFiles;
 	}
+
+	/**
+	 * 
+	 * @hibernate.property column="lock_on_finished" length="1"
+	 * @return Returns the lockOnFinished.
+	 */
+	public boolean isLockOnFinished() {
+		return lockOnFinished;
+	}
+
+	/**
+	 * @param lockOnFinished The lockOnFinished to set.
+	 */
+	public void setLockOnFinished(boolean lockOnFinished) {
+		this.lockOnFinished = lockOnFinished;
+	}
+
     
     public Object clone(){
 		Object obj = null;
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java
===================================================================
diff -u
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java	(revision 0)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -0,0 +1,179 @@
+/*
+ *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.dto;
+
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang.StringUtils;
+import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
+import org.lamsfoundation.lams.tool.sbmt.InstructionFiles;
+import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
+/**
+ * 
+ * @author Steve.Ni
+ * @serial 3555065437595921234L
+ * $version$
+ */
+public class AuthoringDTO implements Serializable {
+
+	private static final long serialVersionUID = 3555065437595921234L;
+	private Long contentID;
+	//basic tab
+	private String title;
+	private String instruction;
+	//instructions
+	private String onlineInstruction;
+	private String offlineInstruction;
+	private List onlineFiles;
+	private List offlineFiles;
+	//advance
+	private boolean lockOnFinished;
+	
+	public AuthoringDTO(){
+	}
+	public AuthoringDTO(SubmitFilesContent content){
+		try {
+			PropertyUtils.copyProperties(this,content);
+		} catch (IllegalAccessException e) {
+			throw new DTOException(e);
+		} catch (InvocationTargetException e) {
+			throw new DTOException(e);
+		} catch (NoSuchMethodException e) {
+			throw new DTOException(e);
+		}
+		
+		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);
+		}
+		
+	}
+	/**
+	 * @return Returns the contentID.
+	 */
+	public Long getContentID() {
+		return contentID;
+	}
+	/**
+	 * @param contentID The contentID to set.
+	 */
+	public void setContentID(Long contentID) {
+		this.contentID = contentID;
+	}
+	/**
+	 * @return Returns the instruction.
+	 */
+	public String getInstruction() {
+		return instruction;
+	}
+	/**
+	 * @param instruction The instruction to set.
+	 */
+	public void setInstruction(String instruction) {
+		this.instruction = instruction;
+	}
+	/**
+	 * @return Returns the lockOnFinished.
+	 */
+	public boolean isLockOnFinished() {
+		return lockOnFinished;
+	}
+	/**
+	 * @param lockOnFinished The lockOnFinished to set.
+	 */
+	public void setLockOnFinished(boolean lockOnFinished) {
+		this.lockOnFinished = lockOnFinished;
+	}
+	/**
+	 * @return Returns the offlineFiles.
+	 */
+	public List getOfflineFiles() {
+		return offlineFiles;
+	}
+	/**
+	 * @param offlineFiles The offlineFiles to set.
+	 */
+	public void setOfflineFiles(List offlineFiles) {
+		this.offlineFiles = offlineFiles;
+	}
+	/**
+	 * @return Returns the offlineInstruction.
+	 */
+	public String getOfflineInstruction() {
+		return offlineInstruction;
+	}
+	/**
+	 * @param offlineInstruction The offlineInstruction to set.
+	 */
+	public void setOfflineInstruction(String offlineInstruction) {
+		this.offlineInstruction = offlineInstruction;
+	}
+	/**
+	 * @return Returns the onlineFiles.
+	 */
+	public List getOnlineFiles() {
+		return onlineFiles;
+	}
+	/**
+	 * @param onlineFiles The onlineFiles to set.
+	 */
+	public void setOnlineFiles(List onlineFiles) {
+		this.onlineFiles = onlineFiles;
+	}
+	/**
+	 * @return Returns the onlineInstruction.
+	 */
+	public String getOnlineInstruction() {
+		return onlineInstruction;
+	}
+	/**
+	 * @param onlineInstruction The onlineInstruction to set.
+	 */
+	public void setOnlineInstruction(String onlineInstruction) {
+		this.onlineInstruction = onlineInstruction;
+	}
+	/**
+	 * @return Returns the title.
+	 */
+	public String getTitle() {
+		return title;
+	}
+	/**
+	 * @param title The title to set.
+	 */
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	
+}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/DTOException.java
===================================================================
diff -u
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/DTOException.java	(revision 0)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/DTOException.java	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -0,0 +1,45 @@
+/*
+ *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.dto;
+
+public class DTOException extends RuntimeException{
+
+	public DTOException() {
+		super();
+		
+	}
+
+	public DTOException(String message, Throwable cause) {
+		super(message, cause);
+		
+	}
+
+	public DTOException(String message) {
+		super(message);
+		
+	}
+
+	public DTOException(Throwable cause) {
+		super(cause);
+		
+	}
+
+}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
===================================================================
diff -u -r4f4b5c90a74621f805dff5922233ca7e0240931f -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision 4f4b5c90a74621f805dff5922233ca7e0240931f)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -48,15 +48,8 @@
 	/**
 	 * This method adds a new content record to the database.
 	 * 
-	 * @param contentID
-	 *            The <code>content_id</code> of the new record
-	 * @param title
-	 *            The title of the tool
-	 * @param instructions
-	 *            The instructions for working with that tool
 	 */
-	public void addSubmitFilesContent(Long contentID, String title,
-			String instructions);
+	public void addSubmitFilesContent(SubmitFilesContent content);
 
 	/**
 	 * Updates the record in the database
@@ -93,20 +86,20 @@
 	 * <li>It first uploads the file to the content repository</li>
 	 * <li>And then it updates the database</li>
 	 * </ol>
-	 * 
-	 * @param contentID
-	 *            The content_id of the record to be updated in the database
-	 * @param uploadedFile
-	 *            The STRUTS org.apache.struts.upload.FormFile type
 	 * @param fileDescription
 	 *            The description of the file being uploaded.
 	 * @param userID
 	 * 			  The <code>User</code> who has uploaded the file.
+	 * @param contentID
+	 *            The content_id of the record to be updated in the database
+	 * @param uploadedFile
+	 *            The STRUTS org.apache.struts.upload.FormFile type
+	 * 
 	 * @throws SubmitFilesException
 	 */
-	public void uploadFile(Long contentID, FormFile uploadedFile,
-			String fileDescription, Long userID) throws SubmitFilesException;
-	
+	public void uploadFileToSession(Long sessionID, FormFile uploadFile,
+			   String fileDescription, Long userID) throws SubmitFilesException;
+	public void uploadFileToContent(Long contentID, FormFile uploadFile, String fileType) throws SubmitFilesException;
 	/**
 	 * This method returns a list of files that were uploaded by the
 	 * given <code>User<code> for given <code>contentID</code>.
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r4f4b5c90a74621f805dff5922233ca7e0240931f -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 4f4b5c90a74621f805dff5922233ca7e0240931f)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -25,29 +25,33 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.contentrepository.AccessDeniedException;
 import org.lamsfoundation.lams.contentrepository.FileException;
 import org.lamsfoundation.lams.contentrepository.ICredentials;
 import org.lamsfoundation.lams.contentrepository.ITicket;
 import org.lamsfoundation.lams.contentrepository.IVersionedNode;
+import org.lamsfoundation.lams.contentrepository.InvalidParameterException;
 import org.lamsfoundation.lams.contentrepository.ItemNotFoundException;
 import org.lamsfoundation.lams.contentrepository.LoginException;
 import org.lamsfoundation.lams.contentrepository.NodeKey;
+import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException;
+import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
 import org.lamsfoundation.lams.contentrepository.service.RepositoryProxy;
 import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
@@ -56,6 +60,7 @@
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
+import org.lamsfoundation.lams.tool.sbmt.InstructionFiles;
 import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport;
@@ -68,6 +73,7 @@
 import org.lamsfoundation.lams.tool.sbmt.dto.LearnerDetailsDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.StatusReportDTO;
 import org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException;
+import org.lamsfoundation.lams.tool.sbmt.util.SbmtToolContentHandler;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dao.IUserDAO;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -89,6 +95,7 @@
 	
 	private ISubmissionDetailsDAO submissionDetailsDAO;
 	
+	private SbmtToolContentHandler toolContentHandler;
 	private IUserDAO userDAO;
 
 	private IRepositoryService repositoryService;
@@ -132,7 +139,22 @@
 		this.submissionDetailsDAO = submissionDetailsDAO;
 	}
 	
+
 	/**
+	 * @return Returns the toolContentHandler.
+	 */
+	public SbmtToolContentHandler getToolContentHandler() {
+		return toolContentHandler;
+	}
+
+	/**
+	 * @param toolContentHandler The toolContentHandler to set.
+	 */
+	public void setToolContentHandler(SbmtToolContentHandler toolContentHandler) {
+		this.toolContentHandler = toolContentHandler;
+	}
+	
+	/**
 	 * @param userDAO The userDAO to set.
 	 */
 	public void setUserDAO(IUserDAO userDAO) {
@@ -248,15 +270,10 @@
 	/**
 	 * (non-Javadoc)
 	 * 
-	 * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#addSubmitFilesContent(java.lang.Long,
-	 *      java.lang.String, java.lang.String)
+	 * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#addSubmitFilesContent(SubmitFilesContent)
 	 */
-	public void addSubmitFilesContent(Long contentID, String title,
-			String instructions) {
-		SubmitFilesContent submitFilesContent = new SubmitFilesContent(
-				contentID, title, instructions);
-		
-		submitFilesContentDAO.save(submitFilesContent);
+	public void addSubmitFilesContent(SubmitFilesContent content) {
+		submitFilesContentDAO.save(content);
 	}
 
 	/**
@@ -332,104 +349,16 @@
 			throws SubmitFilesException {
 		ITicket ticket = getRepositoryLoginTicket();
 		try {
-			String files[] = repositoryService.deleteVersion(ticket, uuid,versionID);
+			repositoryService.deleteVersion(ticket, uuid,versionID);
 		} catch (Exception e) {
 			throw new SubmitFilesException(
 					"Exception occured while deleting files from"
 							+ " the repository " + e.getMessage());
 		}
 	}
 
-	/**
-	 * This method is called when the user requests to upload a file. It's a
-	 * three step process.
-	 * <ol>
-	 * <li>Firstly, the tool authenticates itself and obtains a valid ticket
-	 * from the respository</li>
-	 * <li>Secondly, using the above ticket it uploads the file to the
-	 * repository. Upon successful uploading of the file, repository returns a
-	 * <code>NodeKey</code> object which is a unique indentifier of the file
-	 * in the repsoitory</li>
-	 * <li>Finally, this information is updated into the database for the given
-	 * contentID in the following tables
-	 * 	<ul>
-	 * 		<li><code>tl_lasbmt11_submission_details</code></li>
-	 * 		<li><code>tl_lasbmt11_report</code></li>
-	 * 	</ul>
-	 * </li>
-	 * </ol>
-	 * 
-	 * @param stream
-	 *            The <code>InputStream</code> representing the data to be
-	 *            uploaded
-	 * @param sessionID
-	 *            The <code>ToolSessionID</code> of the file being uploaded
-	 * @param fileDescription
-	 *            The description of the file
-	 * @param fileName
-	 *            The name of the file being added
-	 * @param mimeType
-	 *            The MIME type of the file (eg. TXT, DOC, GIF etc)
-	 * @param dateOfSubmission
-	 *            The date this file was uploaded by the user
-	 * @param userID
-	 * 			  The <code>User</code> who has uploaded the file.
-	 * @throws SubmitFilesException
-	 */
-	private void uploadFile(InputStream stream, Long sessionID, 
-							String fileDescription, String fileName, String mimeType,
-							Date dateOfSubmission, Long userID) throws SubmitFilesException {
 
-		SubmitFilesSession session = submitFilesSessionDAO.getSessionByID(sessionID);
-		if (session == null)
-			throw new SubmitFilesException(
-					"No such session with a ToolSessionID of: " + sessionID
-							+ " found.");
-		else {
-			NodeKey nodeKey = uploadFileToRepository(stream, fileName, mimeType);
-			SubmissionDetails details = new SubmissionDetails(fileName,fileDescription,dateOfSubmission,
-															  userID,nodeKey.getUuid(),nodeKey.getVersion());
-			SubmitFilesReport report = new SubmitFilesReport();
-			details.setReport(report);
-			details.setSubmitFileSession(session);
-			//update session, then insert the detail too.
-			Set detailSet = session.getSubmissionDetails();
-			detailSet.add(details);
-			session.setSubmissionDetails(detailSet);
-			submissionDetailsDAO.saveOrUpdate(session);
-		}
-	}	
-
 	/**
-	 * This method is called everytime a new content has to be added to the
-	 * repository. In order to do so first of all a valid ticket is obtained
-	 * from the Repository hence authenticating the tool(SubmitFiles) and then
-	 * the corresponding file is added to the repository.
-	 * 
-	 * @param stream
-	 *            The <code>InputStream</code> representing the data to be
-	 *            added
-	 * @param fileName
-	 *            The name of the file being added
-	 * @param mimeType
-	 *            The MIME type of the file (eg. TXT, DOC, GIF etc)
-	 * @return NodeKey Represents the two part key - UUID and Version.
-	 * @throws SubmitFilesException
-	 */
-	public NodeKey uploadFileToRepository(InputStream stream, String fileName,
-			String mimeType) throws SubmitFilesException {
-		ITicket ticket = getRepositoryLoginTicket();
-		try {
-			NodeKey nodeKey = repositoryService.addFileItem(ticket, stream,
-					fileName, mimeType, null);
-			return nodeKey;
-		} catch (Exception e) {
-			throw new SubmitFilesException("Exception occured while trying to"
-					+ " upload file into the repository" + e.getMessage());
-		}
-	}
-
-	/**
 	 * (non-Javadoc)
 	 * 
 	 * @see org.lamsfoundation.lams.tool.ToolSessionManager#createToolSession(java.lang.Long,
@@ -504,28 +433,99 @@
 			// TODO Auto-generated method stub
 			return;
 	}
-	
 	/**
 	 * (non-Javadoc)
 	 * 
-	 * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#uploadFile(java.lang.Long,
-	 *      java.lang.String, java.lang.String)
+	 * @see org.lamsfoundation.lams.tool.ToolSessionManager# uploadFileToContent(Long,FormFile ) 
 	 */
-	public void uploadFile(Long sessionID, FormFile uploadFile,
+	public void uploadFileToContent(Long contentID, FormFile uploadFile,String fileType) throws SubmitFilesException{
+		
+		if(uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName()))
+			throw new SubmitFilesException("Could not find upload file: " + uploadFile);
+		
+		SubmitFilesContent content = submitFilesContentDAO.getContentByID(contentID);
+		if (content == null)
+			throw new SubmitFilesException(
+					"No such content with a contentID of: " + contentID
+							+ " found.");
+		
+		NodeKey nodeKey = processFile(uploadFile,fileType);
+		
+		Set fileSet = content.getInstructionFiles();
+		if(fileSet == null)
+			fileSet = new HashSet();
+		InstructionFiles file = new InstructionFiles();
+		file.setType(fileType);
+		file.setUuID(nodeKey.getUuid());
+		file.setVersionID(nodeKey.getVersion());
+		fileSet.add(file);
+		submitFilesContentDAO.save(content);
+	}
+	/**
+	 * (non-Javadoc)
+	 * 
+	 * @see org.lamsfoundation.lams.tool.ToolSessionManager# uploadFileToSession(Long,FormFile,String,Long ) 
+	 */
+	public void uploadFileToSession(Long sessionID, FormFile uploadFile,
 						   String fileDescription, Long userID) throws SubmitFilesException{
-		try{
-			String fileName = uploadFile.getFileName();
-			String mimeType = fileName.substring(fileName.lastIndexOf(".")+1,fileName.length());
-			InputStream stream = uploadFile.getInputStream();
-			uploadFile(stream,sessionID,fileDescription,fileName,mimeType,new Date(),userID);			
-		}catch(FileNotFoundException fe){
-			throw new SubmitFilesException("FileNotFoundException occured while trying to upload File" + fe.getMessage());
-		} catch (IOException e) {
-			throw new SubmitFilesException("FileNotFoundException occured while trying to upload File" + e.getMessage());
-		}
+			
+			if(uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName()))
+				throw new SubmitFilesException("Could not find upload file: " + uploadFile);
+			
+			SubmitFilesSession session = submitFilesSessionDAO.getSessionByID(sessionID);
+			if (session == null)
+				throw new SubmitFilesException(
+						"No such session with a sessionID of: " + sessionID
+								+ " found.");
+			
+			NodeKey nodeKey = processFile(uploadFile,IToolContentHandler.TYPE_ONLINE);
+			
+			SubmissionDetails details = new SubmissionDetails();
+			details.setFileDescription(fileDescription);
+			details.setFilePath(uploadFile.getFileName());
+			details.setDateOfSubmission(new Date());
+			details.setUserID(userID);
+			details.setUuid(nodeKey.getUuid());
+			details.setVersionID(nodeKey.getVersion());
+			SubmitFilesReport report = new SubmitFilesReport();
+			details.setReport(report);
+			details.setSubmitFileSession(session);
+			
+			//update session, then insert the detail too.
+			Set detailSet = session.getSubmissionDetails();
+			detailSet.add(details);
+			session.setSubmissionDetails(detailSet);
+			submissionDetailsDAO.saveOrUpdate(session);
 
 	}
-	
+    /**
+     * Process an uploaded file.
+     * 
+     * @param forumForm
+     * @throws FileNotFoundException
+     * @throws IOException
+     * @throws RepositoryCheckedException
+     * @throws InvalidParameterException
+     */
+    private NodeKey processFile(FormFile file, String fileType){
+    	NodeKey node = null;
+        if (file!= null && !StringUtils.isEmpty(file.getFileName())) {
+            String fileName = file.getFileName();
+            try {
+				node = getToolContentHandler().uploadFile(file.getInputStream(), fileName, 
+				        file.getContentType(), fileType);
+			} catch (InvalidParameterException e) {
+				throw new SubmitFilesException("FileNotFoundException occured while trying to upload File" + e.getMessage());
+			} catch (FileNotFoundException e) {
+				throw new SubmitFilesException("FileNotFoundException occured while trying to upload File" + e.getMessage());
+			} catch (RepositoryCheckedException e) {
+				throw new SubmitFilesException("FileNotFoundException occured while trying to upload File" + e.getMessage());
+			} catch (IOException e) {
+				throw new SubmitFilesException("FileNotFoundException occured while trying to upload File" + e.getMessage());
+			}
+          }
+        return node;
+    }
 	/**
 	 * (non-Javadoc)
 	 * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#getFilesUploadedByUserForContent(java.lang.Long, java.lang.Long)
@@ -739,7 +739,4 @@
 	}
 
 
-
-
-
 }
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
diff -u -rde9ee5f6274f17bb25bbba6f8ea3038cfebd5a90 -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision de9ee5f6274f17bb25bbba6f8ea3038cfebd5a90)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -67,6 +67,7 @@
 		<property name="submitFilesSessionDAO"><ref bean="submitFilesSessionDAO"/></property>
 		<property name="submitFilesReportDAO"><ref bean="submitFilesReportDAO"/></property>
 		<property name="submissionDetailsDAO"><ref bean="submissionDetailsDAO"/></property>
+		<property name="toolContentHandler"><ref bean="toolContentHandler"/></property>
 		<property name="userDAO"><ref bean="userDAO"/></property>
 	</bean>
 	
@@ -88,5 +89,8 @@
 			</props>
 		</property>
 	</bean>	
+	<bean id="toolContentHandler" class="org.lamsfoundation.lams.tool.sbmt.util.SbmtToolContentHandler">
+ 		<property name="repositoryService"><ref bean="repositoryService"/></property>
+	</bean> 
 	
 </beans>
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtToolContentHandler.java
===================================================================
diff -u
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtToolContentHandler.java	(revision 0)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtToolContentHandler.java	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -0,0 +1,43 @@
+/*
+ *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;
+
+import org.lamsfoundation.lams.contentrepository.client.ToolContentHandler;
+
+public class SbmtToolContentHandler extends ToolContentHandler {
+
+    private static String repositoryWorkspaceName = "SubmitFilesWorkspace";
+    private static String repositoryUser = "SubmitFilesLogin";
+    private static char[] repositoryId = {'S','u','b','m','i','t','F','i','l','e','s','P','a','s','s','w','o','r','d'}; //SubmitFilesPassword
+    
+	public String getRepositoryWorkspaceName() {
+		return repositoryWorkspaceName;
+	}
+
+	public String getRepositoryUser() {
+		return repositoryUser;
+	}
+
+	public char[] getRepositoryId() {
+		return repositoryId;
+	}
+
+}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
diff -u -rf66f1839407b038bc217a2af60599ac3edde342f -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision f66f1839407b038bc217a2af60599ac3edde342f)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -6,6 +6,9 @@
  */
 package org.lamsfoundation.lams.tool.sbmt.web;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -15,57 +18,121 @@
 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.util.WebUtil;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
  * @author Manpreet Minhas
  * 
- * @struts.action 
- * 				path="/authoring" 
- * 				parameter="method"
- * 				name="SbmtAuthoringForm"
- * 				input="/sbmtAuthoring.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="/Login.jsp"
- * @struts.action-forward name="initpage" path="/sbmtAuthoring.jsp"
+ * @struts.action-forward name="success" path="/authoring/success.jsp"
  * 
  */
-public class AuthoringAction extends DispatchAction {
+public class AuthoringAction extends LookupDispatchAction {
 	private Logger log = Logger.getLogger(AuthoringAction.class);
+
 	public ISubmitFilesService submitFilesService;
-	public static Logger logger = Logger.getLogger(AuthoringAction.class);
-	
-	public ActionForward updateContent(ActionMapping mapping,
-										 ActionForm form,
-										 HttpServletRequest request,
-										 HttpServletResponse response){
-		
-		DynaActionForm authForm= (DynaActionForm)form;		
-		Long contentID = (Long)authForm.get("toolContentID");
+
+	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");
-		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
+		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; 
+
+		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this
+				.getServlet().getServletContext());
 		try {
-			submitFilesService.addSubmitFilesContent(contentID,title,instructions);
+			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);
 		} catch (Exception e) {
 			log.error(e);
 		}
 		return mapping.findForward("success");
 	}
-	
-	public ActionForward initPage(ActionMapping mapping,
-			 ActionForm form,
-			 HttpServletRequest request,
-			 HttpServletResponse response){
-		
-		Long contentID = new Long(WebUtil.readLongParam(request,"toolContentID"));
-		request.setAttribute("toolContentID",contentID);
-		return mapping.findForward("initpage");
+
+	public ActionForward uploadOnline(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+		return uploadFile(mapping, form, IToolContentHandler.TYPE_ONLINE,request);
+
 	}
 
+	public ActionForward uploadOffline(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+		return uploadFile(mapping, form, IToolContentHandler.TYPE_OFFLINE,request);
+
+	}
+
+	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());
 		
+		return mapping.getInputForward();
+
+	}
+
+	protected Map getKeyMethodMap() {
+		Map map = new HashMap();
+		map.put("label.authoring.upload.online.button", "uploadOnline");
+		map.put("label.authoring.upload.offline.button", "uploadOffline");
+		map.put("label.authoring.save.button", "updateContent");
+
+		return map;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.struts.actions.DispatchAction#unspecified(org.apache.struts.action.ActionMapping,
+	 *      org.apache.struts.action.ActionForm,
+	 *      javax.servlet.http.HttpServletRequest,
+	 *      javax.servlet.http.HttpServletResponse)
+	 */
+	protected ActionForward unspecified(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+
+		Long contentID = new Long(WebUtil.readLongParam(request,
+				"toolContentID"));
+		request.setAttribute("toolContentID", contentID);
+		return mapping.getInputForward();
+	}
+
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -r4f4b5c90a74621f805dff5922233ca7e0240931f -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 4f4b5c90a74621f805dff5922233ca7e0240931f)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -6,13 +6,17 @@
  */
 package org.lamsfoundation.lams.tool.sbmt.web;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -22,12 +26,19 @@
 import org.apache.struts.action.DynaActionForm;
 import org.apache.struts.actions.DispatchAction;
 import org.apache.struts.upload.FormFile;
+import org.lamsfoundation.lams.contentrepository.InvalidParameterException;
+import org.lamsfoundation.lams.contentrepository.NodeKey;
+import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
+import org.lamsfoundation.lams.tool.sbmt.InstructionFiles;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
 import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO;
 import org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException;
 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.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
  * @author Manpreet Minhas
@@ -67,7 +78,9 @@
 		List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
 		listUploadFiles(authForm, filesUploaded);
 		
-		//to avoid user without patience click "upload" button too fast 
+		//to avoid user without patience click "upload" button too fast
+		request.setAttribute("userID",userID);
+		request.setAttribute("toolSessionID",sessionID);
 		saveToken(request);
 		return mapping.getInputForward();
 		
@@ -86,6 +99,8 @@
 			List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
 
 			listUploadFiles(authForm, filesUploaded);
+			request.setAttribute("userID",userID);
+			request.setAttribute("toolSessionID",sessionID);
 			return returnErrors(mapping,request,"submit.upload.twice","upload");
 		}
 		
@@ -98,9 +113,11 @@
 		//to avoid user without patience click "upload" button too fast 
 		saveToken(request);
 		try{
-			submitFilesService.uploadFile(sessionID,uploadedFile,fileDescription,userID);
+			submitFilesService.uploadFileToSession(sessionID,uploadedFile,fileDescription,userID);
 			List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
 			listUploadFiles(authForm, filesUploaded);
+			request.setAttribute("userID",userID);
+			request.setAttribute("toolSessionID",sessionID);
 			return mapping.getInputForward();			
 		}catch(SubmitFilesException se){
 			logger.error("uploadFile: Submit Files Exception has occured" + se.getMessage());
@@ -147,4 +164,6 @@
 		}
 		authForm.set("filesUploaded",filesUploaded);
 	}
+
+
 }
Fisheye: Tag b9ef7102d5de177b2caeaa920e9cfce8996267ed refers to a dead (removed) revision in file `lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/dao/TestSubmissionDetailsDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/Login.jsp
===================================================================
diff -u -r8880f4178b1950bfd55ad3a1a94d27140bb223e3 -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/web/Login.jsp	(.../Login.jsp)	(revision 8880f4178b1950bfd55ad3a1a94d27140bb223e3)
+++ lams_tool_sbmt/web/Login.jsp	(.../Login.jsp)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -5,7 +5,6 @@
 <body>
 	<form name="authoring" method="get" action="authoring.do">
 		<input type ="hidden" name="toolContentID" value="1">
-		<input type ="hidden" name="method" value="initPage">
 		<input type="submit" name="submit" value="Author1 Logon">
 	</form>		
 	<form name="authoring" method="get" action="authoring.do">
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r4f4b5c90a74621f805dff5922233ca7e0240931f -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 4f4b5c90a74621f805dff5922233ca7e0240931f)
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -18,8 +18,16 @@
 				   type="java.lang.String" />
 	<form-property name="instructions" 
 				   type="java.lang.String" />
+	<form-property name="offlineInstruction" 
+				   type="java.lang.String" />
+	<form-property name="onlineInstruction" 
+				   type="java.lang.String" />
 	<form-property name="toolContentID"
 				   type="java.lang.Long"/>
+	<form-property name="lockOnFinished"
+				   type="java.lang.Long"/>		   
+	<form-property name="filename"
+				   type="org.apache.struts.upload.FormFile"/>
 </form-bean>
 
 <form-bean name="SbmtLearnerForm" type="org.apache.struts.validator.DynaValidatorForm">
@@ -109,21 +117,16 @@
       type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction"
       name="SbmtAuthoringForm"
       scope="request"
-      input="/sbmtAuthoring.jsp"
-      parameter="method"
+      input="/authoring/authoring.jsp"
+      parameter="action"
       unknown="false"
       validate="true"
     >
       <forward
         name="success"
-        path="/Login.jsp"
+        path="/authoring/success.jsp"
         redirect="false"
       />
-      <forward
-        name="initpage"
-        path="/sbmtAuthoring.jsp"
-        redirect="false"
-      />
     </action>
 
     <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -r4f4b5c90a74621f805dff5922233ca7e0240931f -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 4f4b5c90a74621f805dff5922233ca7e0240931f)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -14,12 +14,11 @@
 <title>Submit Files</title>
 <!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
 <link href="../css/aqua.css" rel="stylesheet" type="text/css">
-
 </head>
 
 <body>
 <html:form action="authoring?method=updateContent" method="post"
-	focus="login">
+	focus="login"  enctype="multipart/form-data">
 	<div id="basic">
 	<h1><fmt:message key="label.authoring.heading.basic" /></h1>
 	<h1><fmt:message key="label.authoring.heading.basic.desc" /></h1>
@@ -46,44 +45,79 @@
 	<table class="forms">
 		<!--hidden field contentID passed by flash-->
 		<html:hidden property="toolContentID" value="${toolContentID}" />
-		<!-- Title Row -->
 		<tr>
 		</tr>
 		<!-- Instructions Row -->
 		<tr>
 			<td class="formlabel"><fmt:message
 				key="label.authoring.online.instruction" />:</td>
-			<td class="formcontrol"><FCK:editor id="online_instruction"
+			<td class="formcontrol"><FCK:editor id="onlineInstruction"
 				basePath="/lams/fckEditor/" height="150" width="85%">
 			</FCK:editor></td>
 		</tr>
 		<tr>
+			<td class="formlabel">
+				<fmt:message key="label.authoring.online.file" />:
+			</td>
+			<td class="formcontrol">
+				<html:file property="filename">
+					<fmt:message key="label.authoring.choosefile.button" />
+				</html:file>
+				<html:submit property="submit">
+					<fmt:message key="label.authoring.upload.online.button" />
+				</html:submit>
+			</td>
+		</tr>	
+		<tr>
 			<td class="formlabel"><fmt:message
 				key="label.authoring.offline.instruction" />:</td>
-			<td class="formcontrol"><FCK:editor id="offline_instruction"
+			<td class="formcontrol"><FCK:editor id="offlineInstruction"
 				basePath="/lams/fckEditor/" height="150" width="85%">
 			</FCK:editor></td>
 		</tr>
 		<tr>
-			<td class="formlabel"><fmt:message
-				key="label.authoring.uploadfile" />:</td>
+			<td class="formlabel">
+				<fmt:message key="label.authoring.offline.file" />:
+			</td>
 			<td class="formcontrol">
-				<html:file property="title" />
-				<input name="filename" type="file" value="choose file">
-				<input name="upload" type="button" value="upload">
+				<html:file property="filename">
+					<fmt:message key="label.authoring.choosefile.button" />
+				</html:file>
+				<html:submit property="submit">
+					<fmt:message key="label.authoring.upload.offline.button" />
+				</html:submit>
 			</td>
 		</tr>			
 		</tr>
 	</table>
 	</div>
+	<div id="instruction">
+	<h1><fmt:message key="label.authoring.heading.advance" /></h1>
+	<h2><fmt:message key="label.authoring.heading.advance.desc" /></h2>
 	<table class="forms">
+		<!--hidden field contentID passed by flash-->
+		<html:hidden property="toolContentID" value="${toolContentID}" />
+		<tr>
+		</tr>
+		<!-- Instructions Row -->
+		<tr>
+			<td class="formcontrol">
+				<html:radio property="lockOnFinished" value="1">
+					<fmt:message key="label.authoring.advance.lock.on.finished" />
+				</html:radio>
+			</td>
+		</tr>
+	</table>
+	</div>
+	<table class="forms">
 		<!-- Button Row -->
 		<tr>
 			<td class="formcontrol"><html:button property="cancel"
 				onclick="window.close()">
 				<fmt:message key="label.authoring.cancel.button" />
 			</html:button></td>
-			<td class="formcontrol"><html:submit property="save">
+			<td class="formcontrol">
+			<html:submit property="submit">
 				<fmt:message key="label.authoring.save.button" />
 			</html:submit></td>
 	</table>
Index: lams_tool_sbmt/web/sbmtLearner.jsp
===================================================================
diff -u -r4f4b5c90a74621f805dff5922233ca7e0240931f -rb9ef7102d5de177b2caeaa920e9cfce8996267ed
--- lams_tool_sbmt/web/sbmtLearner.jsp	(.../sbmtLearner.jsp)	(revision 4f4b5c90a74621f805dff5922233ca7e0240931f)
+++ lams_tool_sbmt/web/sbmtLearner.jsp	(.../sbmtLearner.jsp)	(revision b9ef7102d5de177b2caeaa920e9cfce8996267ed)
@@ -89,8 +89,8 @@
       <p><html:errors/></p>
       <table class="forms">
       	<!-- Hidden fields -->
-      	<html:hidden property="toolSessionID" value="${param.toolSessionID}"/>
-      	<html:hidden property="userID" value ="${param.userID}"/>
+      	<html:hidden property="toolSessionID" value="${requestScope.toolSessionID}"/>
+      	<html:hidden property="userID" value ="${requestScope.userID}"/>
       	
       	<!--File path row -->
         <tr>