Index: lams_tool_sbmt/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/.classpath,v
diff -u -r1.18 -r1.19
--- lams_tool_sbmt/.classpath	1 Jul 2009 14:17:10 -0000	1.18
+++ lams_tool_sbmt/.classpath	23 Jul 2009 04:45:51 -0000	1.19
@@ -15,5 +15,5 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_gradebook"/>
-	<classpathentry kind="output" path="web/WEB-INF/classes"/>
+	<classpathentry kind="output" path="bin/classes"/>
 <classpathentry kind="var" path="JBOSS_HOME/common/lib/log4j.jar"/></classpath>
Index: lams_tool_sbmt/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.properties,v
diff -u -r1.22 -r1.23
--- lams_tool_sbmt/build.properties	14 Jan 2009 10:44:23 -0000	1.22
+++ lams_tool_sbmt/build.properties	23 Jul 2009 04:45:51 -0000	1.23
@@ -8,7 +8,7 @@
 signature=lasbmt11
 
 #project version
-tool.version=20090113
+tool.version=20090723
 
 # Minimum compatible version
 min.server.version.number=2.0.3
Index: lams_tool_sbmt/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.xml,v
diff -u -r1.50 -r1.51
--- lams_tool_sbmt/build.xml	6 Apr 2009 17:08:29 -0000	1.50
+++ lams_tool_sbmt/build.xml	23 Jul 2009 04:45:51 -0000	1.51
@@ -283,8 +283,8 @@
 		<!-- =================================================================== -->
 		<target name="deploy-war" depends="build-war" description="Deploy the SubmitFiles tool war file and jar file">
 			<delete quiet="true">
-				<fileset dir="${jboss.deploy}/tmp"/>
-				<fileset dir="${jboss.deploy}/work"/>
+				<fileset dir="${jboss.server.instance}/tmp"/>
+				<fileset dir="${jboss.server.instance}/work"/>
 			</delete>
 			<copy file="${build.lib}/${product}.jar"
 					todir="${jboss.deploy}"/> 
@@ -462,6 +462,23 @@
 	   description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
 	</target>
 	
+	<target name="deploy-jar" depends="build-jar" 
+		   description="Deploys just the jar to the lams.ear directory">
+		
+		<delete >
+			<fileset dir="${jboss.server.instance}/tmp"/>
+			<fileset dir="${jboss.server.instance}/work"/>
+		</delete>
+		<copy file="${build.lib}/${product}.jar" todir="${jboss.deploy}"/> 
+		
+		<copy overwrite="yes" todir="${jboss.deploy}/lams-dictionary.jar/org/lamsfoundation/lams/tool/wiki">
+		   <fileset dir="${conf.language.dir}">
+		   	<include name="**/*.properties"/>
+		    <include name="**/*.txt"/>
+		   </fileset>
+		</copy>
+	</target>
+	
 	<target name="delete-exploded-tool-folder" description="delete old tool exploded tool folder">
 		<!-- delete old war folder tree -->
 		<delete quiet="true" includeemptydirs="true">
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Attic/SubmitFilesReport.hbm.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	13 May 2008 00:54:18 -0000	1.6
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	23 Jul 2009 04:45:52 -0000	1.7
@@ -51,6 +51,31 @@
             length="19"
         />
 
+        <property
+            name="markFileUUID"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="mark_file_uuid"
+        />
+
+        <property
+            name="markFileName"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="mark_file_name"
+            length="255"
+        />
+
+        <property
+            name="markFileVersionID"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="mark_file_version_id"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-SubmitFilesReport.xml
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.19 -r1.20
--- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	4 Jul 2009 07:55:06 -0000	1.19
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	23 Jul 2009 04:45:52 -0000	1.20
@@ -137,12 +137,17 @@
 monitor.summary.td.notebookInstructions  =Notebook instructions
 label.authoring.advanced.notify.mark.release  =Notify learners when marks are released
 event.mark.release.subject  =LAMS: Marks were released
-event.mark.release.body  =A teacher released marks in a Submit Files activity in LAMS.\nYour marks are:\n\n{0}\nThis message was send automatically, please do not reply to it.
+event.mark.release.body  =A teacher released marks in a Submit Files activity in LAMS.\nYour marks are\:\n\n{0}\nThis message was send automatically, please do not reply to it.
 event.mark.release.mark  =For the file named "{0}" submitted on {1} the mark is {2}\n
 label.authoring.advanced.notify.onfilesubmit  =Notify monitoring teachers when a learner submits a file
 event.file.submit.subject  =LAMS: A learner submitted a file in a Submit Files tool
 event.file.submit.body  =The learner {0} submitted a file in a Submit Files tool.\n\nThis message was send automatically, following tool''s advanced settings.
 message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
+label.monitor.mark.markedFile  =Marked File
+label.monitor.mark.updoad  =Upload Marked File
+label.monitor.mark.replaceFile  =Replace
+label.monitor.mark.notifyStudent  =Notify student about marked file
+message.monitor.mark.confirmDeleteFile  =Are you sure you want to delete this marked file?
 
 
 #======= End labels: Exported 137 labels for en AU =====
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.18 -r1.19
--- lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	4 Jul 2009 07:55:06 -0000	1.18
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	23 Jul 2009 04:45:52 -0000	1.19
@@ -137,12 +137,16 @@
 monitor.summary.td.notebookInstructions  =Notebook instructions
 label.authoring.advanced.notify.mark.release  =Notify learners when marks are released
 event.mark.release.subject  =LAMS: Marks were released
-event.mark.release.body  =A teacher released marks in a Submit Files activity in LAMS.\nYour marks are:\n\n{0}\nThis message was send automatically, please do not reply to it.
+event.mark.release.body  =A teacher released marks in a Submit Files activity in LAMS.\nYour marks are\:\n\n{0}\nThis message was send automatically, please do not reply to it.
 event.mark.release.mark  =For the file named "{0}" submitted on {1} the mark is {2}\n
 label.authoring.advanced.notify.onfilesubmit  =Notify monitoring teachers when a learner submits a file
 event.file.submit.subject  =LAMS: A learner submitted a file in a Submit Files tool
 event.file.submit.body  =The learner {0} submitted a file in a Submit Files tool.\n\nThis message was send automatically, following tool''s advanced settings.
 message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
+label.monitor.mark.markedFile  =Marked File
+label.monitor.mark.updoad  =Upload Marked File
+label.monitor.mark.replaceFile  =Replace
+label.monitor.mark.notifyStudent  =Notify student about marked file
+message.monitor.mark.confirmDeleteFile  =Are you sure you want to delete this marked file?
 
-
 #======= End labels: Exported 137 labels for en AU =====
Index: lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql,v
diff -u -r1.28 -r1.29
--- lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql	3 Sep 2008 02:11:21 -0000	1.28
+++ lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql	23 Jul 2009 04:45:52 -0000	1.29
@@ -54,6 +54,9 @@
    comments varchar(250),
    marks float,
    date_marks_released datetime,
+   mark_file_uuid bigint,
+   mark_file_version_id bigint,
+   mark_file_name varchar(255),
    primary key (report_id)
 )TYPE=InnoDB;
 create table tl_lasbmt11_session (
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/SubmitFilesReport.hbm.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	13 May 2008 00:54:18 -0000	1.4
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	23 Jul 2009 04:45:52 -0000	1.5
@@ -51,6 +51,31 @@
             length="19"
         />
 
+        <property
+            name="markFileUUID"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="mark_file_uuid"
+        />
+
+        <property
+            name="markFileName"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="mark_file_name"
+            length="255"
+        />
+
+        <property
+            name="markFileVersionID"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="mark_file_version_id"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-SubmitFilesReport.xml
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java,v
diff -u -r1.10 -r1.11
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java	13 May 2008 00:54:18 -0000	1.10
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java	23 Jul 2009 04:45:52 -0000	1.11
@@ -21,7 +21,7 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.sbmt;
 
 import java.io.Serializable;
@@ -32,17 +32,16 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.log4j.Logger;
 
-
-/** 
+/**
  * @hibernate.class table="tl_lasbmt11_report"
- * @serial  -3415065437595925246L
-*/
-public class SubmitFilesReport implements Serializable,Cloneable{
+ * @serial -3415065437595925246L
+ */
+public class SubmitFilesReport implements Serializable, Cloneable {
 
-	private static final long serialVersionUID = -3415065437595925246L;
+    private static final long serialVersionUID = -3415065437595925246L;
 
-	private static Logger log = Logger.getLogger(SubmitFilesReport.class);
-	
+    private static Logger log = Logger.getLogger(SubmitFilesReport.class);
+
     /** identifier field */
     private Long reportID;
 
@@ -54,103 +53,139 @@
 
     /** nullable persistent field */
     private Date dateMarksReleased;
+
+    /** persistent field */
+    private Long markFileUUID;
+
+    /** persistent field */
+    private String markFileName;
     
+    /** persistent field */
+    private Long markFileVersionID;
+
     /** full constructor */
     public SubmitFilesReport(String comments, Float marks, Date dateMarksReleased) {
-        this.comments = comments;
-        this.marks = marks;
-        this.dateMarksReleased = dateMarksReleased;
+	this.comments = comments;
+	this.marks = marks;
+	this.dateMarksReleased = dateMarksReleased;
     }
 
     /** default constructor */
     public SubmitFilesReport() {
-	}
-    /** 
-     * @hibernate.id generator-class="native" type="java.lang.Long" column="report_id"
+    }
+
+    /**
+     * @hibernate.id generator-class="native" type="java.lang.Long"
+     *               column="report_id"
      */
     public Long getReportID() {
-        return this.reportID;
+	return this.reportID;
     }
 
     public void setReportID(Long reportID) {
-        this.reportID = reportID;
+	this.reportID = reportID;
     }
 
-    /** 
-     * @hibernate.property column="comments" length="250" 
+    /**
+     * @hibernate.property column="comments" length="250"
      */
     public String getComments() {
-        return this.comments;
+	return this.comments;
     }
 
     public void setComments(String comments) {
-        this.comments = comments;
+	this.comments = comments;
     }
 
-    /** 
+    /**
      * @hibernate.property column="marks"
      */
     public Float getMarks() {
-        return this.marks;
+	return this.marks;
     }
 
     public void setMarks(Float marks) {
-        this.marks = marks;
+	this.marks = marks;
     }
 
-    /** 
-     * @hibernate.property column="date_marks_released" length="19" 
+    /**
+     * @hibernate.property column="date_marks_released" length="19"
      */
     public Date getDateMarksReleased() {
-        return this.dateMarksReleased;
+	return this.dateMarksReleased;
     }
 
     public void setDateMarksReleased(Date dateMarksReleased) {
-        this.dateMarksReleased = dateMarksReleased;
-    }  
+	this.dateMarksReleased = dateMarksReleased;
+    }
+    
+    /**
+     * @hibernate.property column="mark_file_uuid"
+     */
+    public Long getMarkFileUUID() {
+        return markFileUUID;
+    }
+
+    public void setMarkFileUUID(Long markFileUUID) {
+        this.markFileUUID = markFileUUID;
+    }
+
+    /**
+     * @hibernate.property column="mark_file_name" length="255"
+     */
+    public String getMarkFileName() {
+        return markFileName;
+    }
+
+    public void setMarkFileName(String markFileName) {
+        this.markFileName = markFileName;
+    }
+    
+    /**
+     * @hibernate.property column="mark_file_version_id"
+     */
+    public Long getMarkFileVersionID() {
+        return markFileVersionID;
+    }
+
+    public void setMarkFileVersionID(Long markFileVersionID) {
+        this.markFileVersionID = markFileVersionID;
+    }
+
     public String toString() {
-        return new ToStringBuilder(this)
-            .append("reportID", getReportID())
-            .append("comments", getComments())
-            .append("marks", getMarks())
-            .append("dateMarksReleased", getDateMarksReleased())   
-            .toString();
+	return new ToStringBuilder(this).append("reportID", getReportID()).append("comments", getComments()).append(
+		"marks", getMarks()).append("dateMarksReleased", getDateMarksReleased()).toString();
     }
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#clone()
-	 */
-	public Object clone() {
-		
-		Object obj = null;
-		try {
-			obj = super.clone();
-			//never clone key!
-			((SubmitFilesReport)obj).setReportID(null);
-		} catch (CloneNotSupportedException e) {
-			log.error("When clone " + SubmitFilesReport.class + " failed");
-		}
-		return obj;
-	}
+    /* (non-Javadoc)
+     * @see java.lang.Object#clone()
+     */
+    public Object clone() {
 
-	public boolean equals(Object other) {
-	    if ( (this == other ) ) return true;
-	    if ( !(other instanceof SubmitFilesReport) ) return false;
-	    SubmitFilesReport castOther = (SubmitFilesReport) other;
-	    return new EqualsBuilder()
-	        .append(this.getReportID(), castOther.getReportID())
-	        .append(this.getComments(), castOther.getComments())
-	        .append(this.getMarks(), castOther.getMarks())
-	        .append(this.getDateMarksReleased(), castOther.getDateMarksReleased())
-	        .isEquals();
+	Object obj = null;
+	try {
+	    obj = super.clone();
+	    //never clone key!
+	    ((SubmitFilesReport) obj).setReportID(null);
+	} catch (CloneNotSupportedException e) {
+	    log.error("When clone " + SubmitFilesReport.class + " failed");
 	}
+	return obj;
+    }
 
-	public int hashCode() {
-	    return new HashCodeBuilder()
-	        .append(getReportID())
-	        .append(getComments())
-	        .append(getMarks())
-	        .append(getDateMarksReleased())
-	        .toHashCode();
-	}
+    public boolean equals(Object other) {
+	if ((this == other))
+	    return true;
+	if (!(other instanceof SubmitFilesReport))
+	    return false;
+	SubmitFilesReport castOther = (SubmitFilesReport) other;
+	return new EqualsBuilder().append(this.getReportID(), castOther.getReportID()).append(this.getComments(),
+		castOther.getComments()).append(this.getMarks(), castOther.getMarks()).append(
+		this.getDateMarksReleased(), castOther.getDateMarksReleased()).isEquals();
+    }
+
+    public int hashCode() {
+	return new HashCodeBuilder().append(getReportID()).append(getComments()).append(getMarks()).append(
+		getDateMarksReleased()).toHashCode();
+    }
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20090723_updateFrom231.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20090723_updateFrom231.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20090723_updateFrom231.sql	23 Jul 2009 04:45:52 -0000	1.1
@@ -0,0 +1,17 @@
+  -- SQL statements to update from LAMS 2.3.1
+
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-2385 
+alter table tl_lasbmt11_report add column mark_file_uuid bigint default null;
+alter table tl_lasbmt11_report add column mark_file_version_id bigint default null;
+alter table tl_lasbmt11_report add column mark_file_name varchar(255) default null;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java,v
diff -u -r1.16 -r1.17
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java	21 May 2008 05:52:10 -0000	1.16
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java	23 Jul 2009 04:45:51 -0000	1.17
@@ -60,6 +60,9 @@
 	private String marks;
 	private Date dateOfSubmission;
 	private Date dateMarksReleased;
+	private String markFileName;
+	private Long markFileUUID;
+	private Long markFileVersionID;
 	
 	//file repository info
 	private Long uuID;
@@ -68,7 +71,7 @@
 	private boolean finished;
 	//if this file uploaded by current learner
 	private boolean currentLearner;
-	private String exportedURL;  // the location of this file saved by the export function.      	
+	private String exportedURL;  // the location of this file saved by the export function.   
 	
 
 	/** 
@@ -99,6 +102,9 @@
 			this.dateMarksReleased = report.getDateMarksReleased();		
 			this.comments = report.getComments();
 			this.marks = report.getMarks() != null? NumberUtil.formatLocalisedNumber(report.getMarks(), numberFormat,2) : "";
+			this.markFileName = report.getMarkFileName();
+			this.markFileUUID = report.getMarkFileUUID();
+			this.markFileVersionID = report.getMarkFileVersionID();
 		}
 	}
 
@@ -260,5 +266,28 @@
 	public void setOwner(SubmitUserDTO owner) {
 		this.owner = owner;
 	}
-	
+
+	public String getMarkFileName() {
+	    return markFileName;
+	}
+
+	public void setMarkFileName(String markFileName) {
+	    this.markFileName = markFileName;
+	}
+
+	public Long getMarkFileUUID() {
+	    return markFileUUID;
+	}
+
+	public void setMarkFileUUID(Long markFileUUID) {
+	    this.markFileUUID = markFileUUID;
+	}
+
+	public Long getMarkFileVersionID() {
+	    return markFileVersionID;
+	}
+
+	public void setMarkFileVersionID(Long markFileVersionID) {
+	    this.markFileVersionID = markFileVersionID;
+	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/MarkForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/MarkForm.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/MarkForm.java	23 Jul 2009 04:45:52 -0000	1.1
@@ -0,0 +1,130 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id: MarkForm.java,v 1.1 2009/07/23 04:45:52 lfoxton Exp $ */
+package org.lamsfoundation.lams.tool.sbmt.form;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.upload.FormFile;
+
+/**
+ * @author lfoxton
+ * 
+ * @struts.form name="sbmtMarkForm"
+ */
+public class MarkForm extends ActionForm {
+
+    private static final long serialVersionUID = -8680214759155659983L;
+    
+    private Long toolSessionID;
+    private Integer userID;
+    private Long detailID;
+    private Long reportID;
+    private String marks;
+    private FormFile markFile;
+    private String comments;
+    private String updateMode;
+    private Long markFileUUID;
+    private Long markFileVersionID;
+    
+    public MarkForm() {}
+
+    public Long getToolSessionID() {
+        return toolSessionID;
+    }
+
+    public void setToolSessionID(Long toolSessionID) {
+        this.toolSessionID = toolSessionID;
+    }
+
+    public Integer getUserID() {
+        return userID;
+    }
+
+    public void setUserID(Integer userID) {
+        this.userID = userID;
+    }
+
+    public Long getDetailID() {
+        return detailID;
+    }
+
+    public void setDetailID(Long detailID) {
+        this.detailID = detailID;
+    }
+
+    public Long getReportID() {
+        return reportID;
+    }
+
+    public void setReportID(Long reportID) {
+        this.reportID = reportID;
+    }
+
+    public String getMarks() {
+        return marks;
+    }
+
+    public void setMarks(String marks) {
+        this.marks = marks;
+    }
+
+    public FormFile getMarkFile() {
+        return markFile;
+    }
+
+    public void setMarkFile(FormFile markFile) {
+        this.markFile = markFile;
+    }
+
+    public String getComments() {
+        return comments;
+    }
+
+    public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+    public String getUpdateMode() {
+        return updateMode;
+    }
+
+    public void setUpdateMode(String updateMode) {
+        this.updateMode = updateMode;
+    }
+
+    public Long getMarkFileUUID() {
+        return markFileUUID;
+    }
+
+    public void setMarkFileUUID(Long markFileUUID) {
+        this.markFileUUID = markFileUUID;
+    }
+
+    public Long getMarkFileVersionID() {
+        return markFileVersionID;
+    }
+
+    public void setMarkFileVersionID(Long markFileVersionID) {
+        this.markFileVersionID = markFileVersionID;
+    }
+}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java,v
diff -u -r1.30 -r1.31
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	10 Oct 2008 00:37:16 -0000	1.30
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	23 Jul 2009 04:45:52 -0000	1.31
@@ -25,12 +25,15 @@
 
 package org.lamsfoundation.lams.tool.sbmt.service;
 
+import java.io.InputStream;
 import java.util.List;
 import java.util.Locale;
 import java.util.SortedMap;
 
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.contentrepository.IVersionedNode;
+import org.lamsfoundation.lams.contentrepository.InvalidParameterException;
+import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.sbmt.InstructionFiles;
@@ -124,7 +127,25 @@
      */
     public SortedMap getFilesUploadedBySession(Long sessionID, Locale currentLocale);
 
-    public void updateMarks(Long reportID, Float marks, String comments);
+    /**
+     * Updates the marks for a file, and also allows a file to be uploaded
+     * 
+     * @param reportID
+     * @param marks
+     * @param comments
+     * @param marksFileInputStream
+     * @param marksFileName
+     */
+    public void updateMarks(Long reportID, Float marks, String comments, FormFile file) throws InvalidParameterException, RepositoryCheckedException;
+    
+    /**
+     * Removes the marks file from a report
+     * 
+     * @param reportID
+     * @param markFileUUID
+     * @param markFileVersionID
+     */
+    public void removeMarkFile(Long reportID, Long markFileUUID, Long markFileVersionID);
 
     public FileDetailsDTO getFileDetails(Long detailID, Locale currentLocale);
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v
diff -u -r1.80 -r1.81
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	3 Jul 2009 05:36:27 -0000	1.80
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	23 Jul 2009 04:45:52 -0000	1.81
@@ -27,6 +27,7 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -183,7 +184,8 @@
     /**
      * (non-Javadoc)
      * 
-     * @see org.lamsfoundation.lams.tool.ToolContentManager#copyToolContent(java.lang.Long, java.lang.Long)
+     * @see org.lamsfoundation.lams.tool.ToolContentManager#copyToolContent(java.lang.Long,
+     *      java.lang.Long)
      */
     public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException {
 	if (toContentId == null) {
@@ -225,8 +227,9 @@
     }
 
     /**
-     * If the toolContentID does not exist, then get default tool content id from tool core and initialize a emtpy
-     * <code>SubmitFilesContent</code> return.
+     * If the toolContentID does not exist, then get default tool content id
+     * from tool core and initialize a emtpy <code>SubmitFilesContent</code>
+     * return.
      * 
      * @param toolContentId
      * @return
@@ -291,7 +294,8 @@
     }
 
     /**
-     * Export the XML fragment for the tool's content, along with any files needed for the content.
+     * Export the XML fragment for the tool's content, along with any files
+     * needed for the content.
      * 
      * @throws ExportToolContentException
      */
@@ -356,12 +360,14 @@
     }
 
     /**
-     * Get the definitions for possible output for an activity, based on the toolContentId. These may be definitions
-     * that are always available for the tool (e.g. number of marks for Multiple Choice) or a custom definition created
-     * for a particular activity such as the answer to the third question contains the word Koala and hence the need for
-     * the toolContentId
+     * Get the definitions for possible output for an activity, based on the
+     * toolContentId. These may be definitions that are always available for the
+     * tool (e.g. number of marks for Multiple Choice) or a custom definition
+     * created for a particular activity such as the answer to the third
+     * question contains the word Koala and hence the need for the toolContentId
      * 
-     * @return SortedMap of ToolOutputDefinitions with the key being the name of each definition
+     * @return SortedMap of ToolOutputDefinitions with the key being the name of
+     *         each definition
      */
     public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Long toolContentId, int definitionType)
 	    throws ToolException {
@@ -407,11 +413,12 @@
     }
 
     /**
-     * This method verifies the credentials of the SubmitFiles Tool and gives it the <code>Ticket</code> to login and
-     * access the Content Repository.
+     * This method verifies the credentials of the SubmitFiles Tool and gives it
+     * the <code>Ticket</code> to login and access the Content Repository.
      * 
-     * A valid ticket is needed in order to access the content from the repository. This method would be called evertime
-     * the tool needs to upload/download files from the content repository.
+     * A valid ticket is needed in order to access the content from the
+     * repository. This method would be called evertime the tool needs to
+     * upload/download files from the content repository.
      * 
      * @return ITicket The ticket for repostory access
      * @throws SubmitFilesException
@@ -432,13 +439,13 @@
     }
 
     /**
-     * This method deletes the content with the given <code>uuid</code> and <code>versionID</code> from the content
-     * repository
+     * This method deletes the content with the given <code>uuid</code> and
+     * <code>versionID</code> from the content repository
      * 
      * @param uuid
-     *                The <code>uuid</code> of the node to be deleted
+     *            The <code>uuid</code> of the node to be deleted
      * @param versionID
-     *                The <code>version_id</code> of the node to be deleted.
+     *            The <code>version_id</code> of the node to be deleted.
      * @throws SubmitFilesException
      */
     public void deleteFromRepository(Long uuid, Long versionID) throws SubmitFilesException {
@@ -577,8 +584,9 @@
     /**
      * Get the tool output for the given tool output names.
      * 
-     * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.util.List<String>, java.lang.Long,
-     *      java.lang.Long)
+     * @see 
+     *      org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.util
+     *      .List<String>, java.lang.Long, java.lang.Long)
      */
     public SortedMap<String, ToolOutput> getToolOutput(List<String> names, Long toolSessionId, Long learnerId) {
 	return new TreeMap<String, ToolOutput>();
@@ -587,8 +595,8 @@
     /**
      * Get the tool output for the given tool output name.
      * 
-     * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.lang.String, java.lang.Long,
-     *      java.lang.Long)
+     * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.lang.String,
+     *      java.lang.Long, java.lang.Long)
      */
     public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
 	return null;
@@ -597,7 +605,8 @@
     /**
      * (non-Javadoc)
      * 
-     * @see org.lamsfoundation.lams.tool.ToolSessionManager# uploadFileToContent(Long,FormFile )
+     * @see org.lamsfoundation.lams.tool.ToolSessionManager#
+     *      uploadFileToContent(Long,FormFile )
      */
     public InstructionFiles uploadFileToContent(Long contentID, FormFile uploadFile, String fileType)
 	    throws SubmitFilesException {
@@ -619,7 +628,8 @@
     /**
      * (non-Javadoc)
      * 
-     * @see org.lamsfoundation.lams.tool.ToolSessionManager# uploadFileToSession(Long,FormFile,String,Long )
+     * @see org.lamsfoundation.lams.tool.ToolSessionManager#
+     *      uploadFileToSession(Long,FormFile,String,Long )
      */
     public void uploadFileToSession(Long sessionID, FormFile uploadFile, String fileDescription, Integer userID)
 	    throws SubmitFilesException {
@@ -711,8 +721,9 @@
     }
 
     /**
-     * This method save SubmissionDetails list into a map container: key is user id, value is a list container, which
-     * contains all <code>FileDetailsDTO</code> object belong to this user.
+     * This method save SubmissionDetails list into a map container: key is user
+     * id, value is a list container, which contains all
+     * <code>FileDetailsDTO</code> object belong to this user.
      */
     public SortedMap getFilesUploadedBySession(Long sessionID, Locale currentLocale) {
 	List list = submissionDetailsDAO.getSubmissionDetailsBySession(sessionID);
@@ -760,11 +771,46 @@
 	return submitUserDAO.getUsersBySession(sessionID);
     }
 
-    public void updateMarks(Long reportID, Float marks, String comments) {
+    public void updateMarks(Long reportID, Float marks, String comments, FormFile markFile) throws InvalidParameterException, RepositoryCheckedException {
+
+	    IToolContentHandler toolContentHandler = getSbmtToolContentHandler();
+	    SubmitFilesReport report = submitFilesReportDAO.getReportByID(reportID);
+	    if (report != null) {
+		report.setComments(comments);
+		report.setMarks(marks);
+		
+		// If there is a new file, delete the existing and add the mark file
+		if (markFile != null && !StringUtils.isEmpty(markFile.getFileName())) {
+		    
+		    // Delete the existing
+		    if (report.getMarkFileUUID() != null) {
+			toolContentHandler.deleteFile(report.getMarkFileUUID());
+			report.setMarkFileName(null);
+			report.setMarkFileUUID(null);
+			report.setMarkFileVersionID(null);
+		    }
+		    
+		    // Add the new file
+		    NodeKey nodeKey = this.processFile(markFile, IToolContentHandler.TYPE_ONLINE);
+		    //NodeKey nodeKey = toolContentHandler.uploadFile(marksFileInputStream, marksFileName, null, IToolContentHandler.TYPE_ONLINE);
+
+		    report.setMarkFileName(markFile.getFileName());
+		    report.setMarkFileUUID(nodeKey.getUuid());	
+		    report.setMarkFileVersionID(nodeKey.getVersion());
+		}
+	
+		submitFilesReportDAO.update(report);
+	    }
+	
+    }
+    
+    public void removeMarkFile (Long reportID, Long markFileUUID, Long markFileVersionID) {
 	SubmitFilesReport report = submitFilesReportDAO.getReportByID(reportID);
 	if (report != null) {
-	    report.setComments(comments);
-	    report.setMarks(marks);
+	    deleteFromRepository(markFileUUID, markFileVersionID);
+	    report.setMarkFileName(null);
+	    report.setMarkFileUUID(null);
+	    report.setMarkFileVersionID(null);
 	    submitFilesReportDAO.update(report);
 	}
     }
@@ -976,7 +1022,8 @@
     }
 
     /**
-     * Set the description, throws away the title value as this is not supported in 2.0
+     * Set the description, throws away the title value as this is not supported
+     * in 2.0
      */
     public void setReflectiveData(Long toolContentId, String title, String description) throws ToolException,
 	    DataMissingException {
@@ -1046,31 +1093,31 @@
 
     /**
      * @param submitFilesContentDAO
-     *                The submitFilesContentDAO to set.
+     *            The submitFilesContentDAO to set.
      */
     public void setSubmitFilesContentDAO(ISubmitFilesContentDAO submitFilesContentDAO) {
 	this.submitFilesContentDAO = submitFilesContentDAO;
     }
 
     /**
      * @param submitFilesReportDAO
-     *                The submitFilesReportDAO to set.
+     *            The submitFilesReportDAO to set.
      */
     public void setSubmitFilesReportDAO(ISubmitFilesReportDAO submitFilesReportDAO) {
 	this.submitFilesReportDAO = submitFilesReportDAO;
     }
 
     /**
      * @param submitFilesSessionDAO
-     *                The submitFilesSessionDAO to set.
+     *            The submitFilesSessionDAO to set.
      */
     public void setSubmitFilesSessionDAO(ISubmitFilesSessionDAO submitFilesSessionDAO) {
 	this.submitFilesSessionDAO = submitFilesSessionDAO;
     }
 
     /**
      * @param submissionDetailsDAO
-     *                The submissionDetailsDAO to set.
+     *            The submissionDetailsDAO to set.
      */
     public void setSubmissionDetailsDAO(ISubmissionDetailsDAO submissionDetailsDAO) {
 	this.submissionDetailsDAO = submissionDetailsDAO;
@@ -1085,7 +1132,7 @@
 
     /**
      * @param sbmtToolContentHandler
-     *                The sbmtToolContentHandler to set.
+     *            The sbmtToolContentHandler to set.
      */
     public void setSbmtToolContentHandler(IToolContentHandler sbmtToolContentHandler) {
 	this.sbmtToolContentHandler = sbmtToolContentHandler;
@@ -1100,7 +1147,7 @@
 
     /**
      * @param learnerDAO
-     *                The learnerDAO to set.
+     *            The learnerDAO to set.
      */
     public void setSubmitUserDAO(ISubmitUserDAO learnerDAO) {
 	submitUserDAO = learnerDAO;
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java,v
diff -u -r1.21 -r1.22
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	3 Sep 2008 02:11:21 -0000	1.21
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	23 Jul 2009 04:45:52 -0000	1.22
@@ -76,4 +76,7 @@
 	public static final String EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE = "notify_learners_on_mark_release";
 
 	public static final String EVENT_NAME_NOTIFY_TEACHERS_ON_FILE_SUBMIT = "notify_teachers_on_file_submit";
+	
+	public static final String EVENT_NAME_NOTIFY_LEARNERS_ON_MARKED_FILE = "notify_learners_on_marked_file";
+	
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MarkAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MarkAction.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MarkAction.java	23 Jul 2009 04:45:51 -0000	1.1
@@ -0,0 +1,219 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id: MarkAction.java,v 1.1 2009/07/23 04:45:51 lfoxton Exp $ */
+package org.lamsfoundation.lams.tool.sbmt.web;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.contentrepository.InvalidParameterException;
+import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
+import org.lamsfoundation.lams.events.IEventNotificationService;
+import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
+import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO;
+import org.lamsfoundation.lams.tool.sbmt.form.MarkForm;
+import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
+import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
+import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.NumberUtil;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+
+/**
+ * @author lfoxton
+ * @struts.action path="/mark" parameter="method" scope="request"
+ *                validate="false" name="sbmtMarkForm"
+ * 
+ * @struts.action-forward name="listMark" path="/monitoring/mark/mark.jsp"
+ * @struts.action-forward name="updateMark"
+ *                        path="/monitoring/mark/updatemark.jsp"
+ * @struts.action-forward name="listAllMarks"
+ *                        path="/monitoring/mark/allmarks.jsp"
+ * 
+ */
+public class MarkAction extends LamsDispatchAction {
+
+    private ISubmitFilesService submitFilesService;
+
+    /**
+     * Update mark.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws RepositoryCheckedException 
+     * @throws InvalidParameterException 
+     */
+    public ActionForward updateMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws InvalidParameterException, RepositoryCheckedException {
+
+	MarkForm markForm = (MarkForm) form;
+
+	ActionMessages errors = new ActionMessages();
+	// Check whether the mark is valid.
+	Float marks = null;
+	String markStr = markForm.getMarks();
+	try {
+	    marks = NumberUtil.getLocalisedFloat(markStr, request.getLocale());
+	} catch (Exception e) {
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("errors.mark.invalid.number"));
+	}
+
+	String comments = WebUtil.readStrParam(request, "comments", true);
+	if (!errors.isEmpty()) {
+	    submitFilesService = getSubmitFilesService();
+	    List report = new ArrayList<FileDetailsDTO>();
+	    FileDetailsDTO fileDetail = submitFilesService.getFileDetails(markForm.getDetailID(), request.getLocale());
+	    // echo back the input, even they are wrong.
+	    fileDetail.setComments(comments);
+	    fileDetail.setMarks(markStr);
+	    report.add(fileDetail);
+
+	    request.setAttribute("report", report);
+	    request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, markForm.getToolSessionID());
+
+	    saveErrors(request, errors);
+	    return mapping.findForward("updateMark");
+	}
+
+	if (submitFilesService == null) {
+	    submitFilesService = getSubmitFilesService();
+	}
+
+	// Update the mark based on the form
+	submitFilesService.updateMarks(markForm.getReportID(), marks, comments, markForm.getMarkFile());
+
+	// Return to the appropriate screen based upon the updateMode
+	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, markForm.getToolSessionID());
+	if (StringUtils.equals(markForm.getUpdateMode(), "listMark")) {
+	    List report = submitFilesService.getFilesUploadedByUser(markForm.getUserID(), markForm.getToolSessionID(),
+		    request.getLocale());
+	    request.setAttribute("report", report);
+	    return mapping.findForward("listMark");
+	} else {
+	    Map report = submitFilesService.getFilesUploadedBySession(markForm.getToolSessionID(), request.getLocale());
+	    request.setAttribute("reports", report);
+	    return mapping.findForward("listAllMarks");
+	}
+    }
+
+    /**
+     * Display update mark initial page.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    public ActionForward newMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	MarkForm markForm = (MarkForm) form;
+
+	if (submitFilesService == null) {
+	    submitFilesService = getSubmitFilesService();
+	}
+
+	FileDetailsDTO fileDetailsDTO = submitFilesService.getFileDetails(markForm.getDetailID(), request.getLocale());
+	updateMarkForm(markForm, fileDetailsDTO);
+
+	List report = new ArrayList<FileDetailsDTO>();
+	report.add(submitFilesService.getFileDetails(markForm.getDetailID(), request.getLocale()));
+
+	request.setAttribute("updateMode", markForm.getUpdateMode());
+	request.setAttribute("toolSessionID", markForm.getToolSessionID());
+	request.setAttribute("report", report);
+
+	return mapping.findForward("updateMark");
+    }
+
+    /**
+     * Update the form
+     * @param markForm
+     * @param fileDetailsDTO
+     */
+    private void updateMarkForm(MarkForm markForm, FileDetailsDTO fileDetailsDTO) {
+
+	if (fileDetailsDTO.getMarks() != null) {
+	    markForm.setMarks(fileDetailsDTO.getMarks().toString());
+	}
+	markForm.setReportID(fileDetailsDTO.getReportID());
+	markForm.setComments(fileDetailsDTO.getComments());
+	markForm.setMarkFileUUID(fileDetailsDTO.getMarkFileUUID());
+	markForm.setMarkFileVersionID(fileDetailsDTO.getMarkFileVersionID());
+    }
+
+    /**
+     * Remove a mark file
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    public ActionForward removeMarkFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	MarkForm markForm = (MarkForm) form;
+
+	if (submitFilesService == null) {
+	    submitFilesService = getSubmitFilesService();
+	}
+
+	submitFilesService.removeMarkFile(markForm.getReportID(), markForm.getMarkFileUUID(), markForm
+		.getMarkFileVersionID());
+
+	FileDetailsDTO fileDetailsDTO = submitFilesService.getFileDetails(markForm.getDetailID(), request.getLocale());
+	updateMarkForm(markForm, fileDetailsDTO);
+
+	List report = new ArrayList<FileDetailsDTO>();
+	report.add(submitFilesService.getFileDetails(markForm.getDetailID(), request.getLocale()));
+
+	request.setAttribute("updateMode", markForm.getUpdateMode());
+	request.setAttribute("toolSessionID", markForm.getToolSessionID());
+	request.setAttribute("report", report);
+
+	return mapping.findForward("updateMark");
+    }
+
+    private ISubmitFilesService getSubmitFilesService() {
+	return SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
+    }
+}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java,v
diff -u -r1.47 -r1.48
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	10 Oct 2008 00:37:16 -0000	1.47
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	23 Jul 2009 04:45:51 -0000	1.48
@@ -38,7 +38,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -47,7 +46,6 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.DynaActionForm;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
@@ -63,7 +61,6 @@
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
 import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.util.NumberUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -72,10 +69,10 @@
 
 /**
  * @author Manpreet Minhas
- * @struts.action path="/monitoring" parameter="method" scope="request" validate="false" name="SbmtMonitoringForm"
+ * @struts.action path="/monitoring" parameter="method" scope="request"
+ *                validate="false" name="SbmtMonitoringForm"
  * 
  * @struts.action-forward name="listMark" path="/monitoring/mark/mark.jsp"
- * @struts.action-forward name="updateMark" path="/monitoring/mark/updatemark.jsp"
  * @struts.action-forward name="listAllMarks" path="/monitoring/mark/allmarks.jsp"
  * 
  * @struts.action-forward name="success" path="/monitoring/monitoring.jsp"
@@ -328,96 +325,6 @@
     }
 
     /**
-     * Display update mark initial page.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
-    public ActionForward newMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-
-	Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
-	Long detailID = new Long(WebUtil.readLongParam(request, "detailID"));
-	String updateMode = request.getParameter("updateMode");
-
-	submitFilesService = getSubmitFilesService();
-
-	List report = new ArrayList<FileDetailsDTO>();
-	report.add(submitFilesService.getFileDetails(detailID, request.getLocale()));
-
-	request.setAttribute("report", report);
-	request.setAttribute("updateMode", updateMode);
-	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
-
-	return mapping.findForward("updateMark");
-    }
-
-    /**
-     * Update mark.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
-    public ActionForward updateMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
-	Integer userID = WebUtil.readIntParam(request, "userID");
-	Long detailID = new Long(WebUtil.readLongParam(request, "detailID"));
-	String updateMode = request.getParameter("updateMode");
-	Long reportID = new Long(WebUtil.readLongParam(request, "reportID"));
-
-	ActionMessages errors = new ActionMessages();
-	// Check whether the mark is valid.
-	Float marks = null;
-	String markStr = request.getParameter("marks");
-	try {
-	    marks = NumberUtil.getLocalisedFloat(markStr, request.getLocale());
-	} catch (Exception e) {
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("errors.mark.invalid.number"));
-	}
-
-	String comments = WebUtil.readStrParam(request, "comments", true);
-	if (!errors.isEmpty()) {
-	    submitFilesService = getSubmitFilesService();
-	    List report = new ArrayList<FileDetailsDTO>();
-	    FileDetailsDTO fileDetail = submitFilesService.getFileDetails(detailID, request.getLocale());
-	    // echo back the input, even they are wrong.
-	    fileDetail.setComments(comments);
-	    fileDetail.setMarks(markStr);
-	    report.add(fileDetail);
-
-	    request.setAttribute("report", report);
-	    request.setAttribute("updateMode", updateMode);
-	    request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
-
-	    saveErrors(request, errors);
-	    return mapping.findForward("updateMark");
-	}
-
-	// get service then update report table
-	submitFilesService = getSubmitFilesService();
-
-	submitFilesService.updateMarks(reportID, marks, comments);
-
-	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
-	if (StringUtils.equals(updateMode, "listMark")) {
-	    List report = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale());
-	    request.setAttribute("report", report);
-	    return mapping.findForward("listMark");
-	} else {
-	    Map report = submitFilesService.getFilesUploadedBySession(sessionID, request.getLocale());
-	    request.setAttribute("reports", report);
-	    return mapping.findForward("listAllMarks");
-	}
-    }
-
-    /**
      * View mark of all learner from same tool content ID.
      * 
      * @param mapping
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.40 -r1.41
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	23 Feb 2009 20:33:53 -0000	1.40
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	23 Jul 2009 04:45:52 -0000	1.41
@@ -29,6 +29,10 @@
       name="reflectionForm"
       type="org.lamsfoundation.lams.tool.sbmt.form.ReflectionForm"
     />
+    <form-bean
+      name="sbmtMarkForm"
+      type="org.lamsfoundation.lams.tool.sbmt.form.MarkForm"
+    />
 
 <form-bean name="SbmtMonitoringForm" type="org.apache.struts.action.DynaActionForm">
 
@@ -146,6 +150,31 @@
       />
     </action>
     <action
+      path="/mark"
+      type="org.lamsfoundation.lams.tool.sbmt.web.MarkAction"
+      name="sbmtMarkForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="listMark"
+        path="/monitoring/mark/mark.jsp"
+        redirect="false"
+      />
+      <forward
+        name="updateMark"
+        path="/monitoring/mark/updatemark.jsp"
+        redirect="false"
+      />
+      <forward
+        name="listAllMarks"
+        path="/monitoring/mark/allmarks.jsp"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/authoring"
       type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction"
       name="SbmtAuthoringForm"
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/sbmtlearner.jsp,v
diff -u -r1.26 -r1.27
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	1 Mar 2009 01:46:24 -0000	1.26
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	23 Jul 2009 04:45:52 -0000	1.27
@@ -162,7 +162,7 @@
 								</td>
 								<td>
 									<c:choose>
-										<c:when test="${empty file.comments}">
+										<c:when test="${empty file.marks}">
 											<fmt:message key="label.learner.notAvailable" />
 										</c:when>
 										<c:otherwise>
@@ -171,6 +171,29 @@
 									</c:choose>
 								</td>
 							</tr>
+							<tr>
+								<!--Sixth row displaying the marked file-->
+								<td class="field-name">
+									<fmt:message key="label.monitor.mark.markedFile" />
+								</td>
+								<td>
+									<c:choose>
+										<c:when test="${empty file.markFileUUID}">
+											<fmt:message key="label.learner.notAvailable" />
+										</c:when>
+										<c:otherwise>
+											<c:out value="${file.markFileName}" />
+											<c:set var="markFileDownloadURL">
+											<c:url
+												value="/download?uuid=${file.markFileUUID}&versionID=${file.markFileVersionID}&preferDownload=true" />
+											</c:set>
+											<a href="${markFileDownloadURL}"><fmt:message key="label.download" />
+											</a>
+
+										</c:otherwise>
+									</c:choose>
+								</td>
+							</tr>
 						</table>
 					</div>
 				</c:forEach>
Index: lams_tool_sbmt/web/monitoring/mark/allmarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/allmarks.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	7 May 2008 03:49:44 -0000	1.8
+++ lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	23 Jul 2009 04:45:51 -0000	1.9
@@ -9,8 +9,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/common.js"></script>
 	<script type="text/javascript">
 		function updateMark(detailId,reportId,sessionId,userId){
-			var act = "<c:url value="/monitoring.do"/>";
-			location.href=act + "?method=newMark&updateMode=listAllMarks&userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId+"&reportID="+reportId;
+			location.href="<lams:WebAppURL/>mark.do?method=newMark&updateMode=listAllMarks&userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId+"&reportID="+reportId;
 		}
 		function closeAndRefreshParentMonitoringWindow() {
 			refreshParentMonitoringWindow();
Index: lams_tool_sbmt/web/monitoring/mark/filelist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/filelist.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_sbmt/web/monitoring/mark/filelist.jsp	18 Oct 2006 19:49:51 -0000	1.5
+++ lams_tool_sbmt/web/monitoring/mark/filelist.jsp	23 Jul 2009 04:45:52 -0000	1.6
@@ -35,9 +35,34 @@
 		</c:choose>
 	</td>
 </tr>
+<tr>
+	<td class="field-name">
+		<fmt:message key="label.monitor.mark.markedFile" />
+		:
+	</td>
+	<td>
+		<c:choose>
+			<c:when test="${empty fileInfo.markFileUUID}">
+				<fmt:message key="label.learner.notAvailable" />
+			</c:when>
+			<c:otherwise>
+				<c:out value="${fileInfo.markFileName}" />
+				<c:set var="markFileViewURL">
+					<html:rewrite page="/download/?uuid=${fileInfo.markFileUUID}&versionID=${fileInfo.markFileVersionID}&preferDownload=false" />
+				</c:set>
+				<a href="javascript:launchInstructionsPopup('<c:out value='${markFileViewURL}' escapeXml='false'/>')" class="button"> <fmt:message key="label.view" /> </a>&nbsp;
+				<c:set var="markFileDownloadURL">
+					<html:rewrite page="/download/?uuid=${fileInfo.markFileUUID}&versionID=${fileInfo.markFileVersionID}&preferDownload=true" />
+				</c:set>
+				<a href="<c:out value='${markFileDownloadURL}' escapeXml='false'/>"  class="button"> <fmt:message key="label.download" /> </a>
+			</c:otherwise>
+		</c:choose>
+	</td>
+</tr>
 
 <tr>
 	<td colspan="2">
 		<hr size="1" style="width:500px"/>
+		<br />
 	</td>
 </tr>
Index: lams_tool_sbmt/web/monitoring/mark/mark.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/mark.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_sbmt/web/monitoring/mark/mark.jsp	7 May 2008 03:49:44 -0000	1.9
+++ lams_tool_sbmt/web/monitoring/mark/mark.jsp	23 Jul 2009 04:45:52 -0000	1.10
@@ -9,16 +9,16 @@
 	<c:set var="lams">
 		<lams:LAMSURL />
 	</c:set>
+	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/common.js"></script>
 	<script type="text/javascript">
 		function updateMark(detailId,reportId,sessionId,userId){
-			var act = "<c:url value="/monitoring.do"/>";
-			location.href=act + "?method=newMark&updateMode=listMark&userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId+"&reportID="+reportId;
+			location.href="<lams:WebAppURL/>mark.do?method=newMark&updateMode=listMark&userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId+"&reportID="+reportId;
 		}
 		function closeAndRefreshParentMonitoringWindow() {
 			refreshParentMonitoringWindow();
 			window.close();
-		}  				
+		}  			
 	</script>
 </lams:head>
 <body class="stripes">
@@ -40,6 +40,5 @@
 				</table>
 			</div>
 		<div id="footer"></div>
-		</div>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_sbmt/web/monitoring/mark/updatemark.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/updatemark.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	14 Dec 2008 22:55:15 -0000	1.11
+++ lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	23 Jul 2009 04:45:52 -0000	1.12
@@ -1,78 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <%@include file="/common/taglibs.jsp"%>
+
 <lams:html>
 <lams:head>
 	<title><fmt:message key="activity.title" /></title>
 	<lams:css/>
+	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/common.js"></script>
+	
+	<script type="text/javascript">
+		function removeMarkFile() {
+
+			var answer = confirm('<fmt:message key="message.monitor.mark.confirmDeleteFile"/>');
+			if (answer) {	
+				document.getElementById("method").value = "removeMarkFile";
+				document.getElementById("updateMarkForm").submit();
+			}
+		}
+	</script>
+	
 </lams:head>
 
 <body class="stripes">
 		<div id="content">
-		<h1>
-			<fmt:message key="label.monitoring.updateMarks.button"/>
-		</h1>
-			<c:forEach var="fileInfo"  items="${report}" varStatus="status">
-				<form id="updateMarkForm" method="post" action="<c:url value='/monitoring.do'/>">
-					<input type="hidden" name="method" value="updateMark" />
-					<input type="hidden" name="toolSessionID" value="${toolSessionID}" />
-					<input type="hidden" name="reportID" value="${fileInfo.reportID}" />
-					<input type="hidden" name="detailID" value="${fileInfo.submissionID}" />
-					<input type="hidden" name="userID" value="${fileInfo.owner.userID}" />
-					<input type="hidden" name="updateMode" value="${updateMode}" />
-						<table cellpadding="0">
-							<%@include file="fileinfo.jsp"%>
-							<tr>
-								<td colspan="2">
-									<%@include file="/common/messages.jsp"%>
-								</td>
-							</tr>
-						
-							<tr>
-								<td class="field-name"  style="text-align: left;">
-									<fmt:message key="label.learner.marks" />
-								</td>
-								<td>
-									<input type="text" name="marks" value='<c:out value="${fileInfo.marks}"  escapeXml="false"/>'>
-								</td>
-							</tr>
-							<tr>
-								<td colspan="2">
-									<span  class="field-name"><fmt:message key="label.learner.comments" /><BR></span>
-									<lams:FCKEditor id="comments"
-										value="${fileInfo.comments}"
-										toolbarSet="Default-Learner"></lams:FCKEditor>
-								</td>
-							</tr>
-							<tr>
-								<td colspan="2">
-									<c:if test="${updateMode == 'listMark'}">
-										<c:set var="cancelUrl">
-											<c:url value="/monitoring.do"/>?method=listMark&userID=${fileInfo.owner.userID}&toolSessionID=${toolSessionID}
-										</c:set>
-									</c:if>
-									<c:if test="${updateMode == 'listAllMarks'}">
-										<c:set var="cancelUrl">
-											<c:url value="/monitoring.do"/>?method=listAllMarks&toolSessionID=${toolSessionID}
-										</c:set>
-									</c:if>
-										<a href="${cancelUrl}" class="button">
-											<fmt:message key="label.cancel" />
-										</a>
-									&nbsp;&nbsp;
-									<a href="javascript:document.getElementById('updateMarkForm').submit();" class="button">
-										<fmt:message key="label.monitoring.saveMarks.button" />
-									</a>
-								</td>
-							</tr>
-						</table>
-				</form>
+			<h1>
+				<fmt:message key="label.monitoring.updateMarks.button"/>
+			</h1>
+			<c:forEach var="fileInfo"  items="${report}" varStatus="status">	
+				<html:form action="/mark.do" method="post" styleId="updateMarkForm" enctype="multipart/form-data">
+				
+					<html:hidden property="method" value="updateMark" styleId="method" />
+					<html:hidden property="toolSessionID" />
+					<html:hidden property="reportID" />
+					<html:hidden property="detailID"  />
+					<html:hidden property="userID"  />
+					<html:hidden property="updateMode" />
+					<html:hidden property="markFileUUID" />
+					<html:hidden property="markFileVersionID" />
+					
+					<table cellpadding="0">
+						<%@include file="fileinfo.jsp"%>
+						<tr>
+							<td colspan="2">
+								<%@include file="/common/messages.jsp"%>
+							</td>
+						</tr>
+					
+						<tr>
+							<td class="field-name"  style="text-align: left;">
+								<fmt:message key="label.learner.marks" />
+							</td>
+							<td>
+								<html:text property="marks" />
+							</td>
+						</tr>
+						<tr>
+							<td class="field-name"  style="text-align: left;">
+								<fmt:message key="label.monitor.mark.updoad" />
+							</td>
+							<td>
+								<c:if test="${not empty fileInfo.markFileUUID}">
+									${fileInfo.markFileName}
+									
+									
+									<c:set var="viewMarkFileURL">
+										<html:rewrite page="/download/?uuid=${fileInfo.markFileUUID}&versionID=${fileInfo.markFileVersionID}&preferDownload=false" />
+									</c:set>
+									<a href="javascript:launchInstructionsPopup('<c:out value='${viewMarkFileURL}' escapeXml='false'/>')" class="button"> <fmt:message key="label.view" /> </a>&nbsp;
+									
+									<c:set var="downloadMarkFileURL">
+										<html:rewrite page="/download/?uuid=${fileInfo.markFileUUID}&versionID=${fileInfo.markFileVersionID}&preferDownload=true" />
+									</c:set>
+									<a href="<c:out value='${downloadMarkFileURL}' escapeXml='false'/>"  class="button"> <fmt:message key="label.download" /> </a>&nbsp;
+									
+									<a href="javascript:removeMarkFile()"  class="button"> <fmt:message key="label.authoring.online.delete" /> </a>
+									
+									<br />
+									<br />
+									<fmt:message key="label.monitor.mark.replaceFile" />: 
+								</c:if>
+								<html:file property="markFile" />
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2">
+								<span  class="field-name"><fmt:message key="label.learner.comments" /><BR></span>
+								<lams:FCKEditor id="comments"
+									value="${fileInfo.comments}"
+									toolbarSet="Default-Learner"></lams:FCKEditor>
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2">
+								<br />
+								<c:if test="${updateMode == 'listMark'}">
+									<c:set var="cancelUrl">
+										<c:url value="/monitoring.do"/>?method=listMark&userID=${fileInfo.owner.userID}&toolSessionID=${toolSessionID}
+									</c:set>
+								</c:if>
+								<c:if test="${updateMode == 'listAllMarks'}">
+									<c:set var="cancelUrl">
+										<c:url value="/monitoring.do"/>?method=listAllMarks&toolSessionID=${toolSessionID}
+									</c:set>
+								</c:if>
+								<a href="${cancelUrl}" class="button">
+									<fmt:message key="label.cancel" />
+								</a>
+								
+								&nbsp;&nbsp;
+								
+								<a href="javascript:document.getElementById('updateMarkForm').submit();" class="button">
+									<fmt:message key="label.monitoring.saveMarks.button" />
+								</a>
+							</td>
+						</tr>
+					</table>
+				</html:form>
 			</c:forEach>
-			</div>
+		</div>
 
 		<div id="footer"></div>
-		</div>
 </body>
 </lams:html>
\ No newline at end of file