Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r526f2623d307de7209d8db600485f0d1cbfd6645 -rc594c716c5d793a4a86c95161a6b3be7ebd70af7
--- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 526f2623d307de7209d8db600485f0d1cbfd6645)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision c594c716c5d793a4a86c95161a6b3be7ebd70af7)
@@ -38,7 +38,8 @@
 label.learner.dateMarksReleased  =Date marks released
 label.learner.notAvailable  =Not available
 label.learner.noUpload  =No files have been uploaded yet.
-label.learner.uploadMessage  =Only one file can be uploaded at a time - Maximum file size is 1.0 MB
+label.learner.uploadMessage  =Uploaded file must not be executable and not exceed size of {0}
+errors.maxfilesize  =Uploaded file exceeded maximum size: {0}
 learner.finish.without.upload  =No files have been uploaded yet. Files can not be uploaded once you choose OK.
 label.monitoring.heading  =Monitoring
 label.monitoring.heading.userlist  =Summary
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -rc594c716c5d793a4a86c95161a6b3be7ebd70af7
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	(.../SbmtConstants.java)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	(.../SbmtConstants.java)	(revision c594c716c5d793a4a86c95161a6b3be7ebd70af7)
@@ -79,6 +79,8 @@
 
     public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity";
 
+    public static final String ATTR_UPLOAD_MAX_FILE_SIZE = "uploadMaxFileSize";
+
     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";
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -r0f06a3fe1469600b56093d09d01c0922ab1cb3db -rc594c716c5d793a4a86c95161a6b3be7ebd70af7
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 0f06a3fe1469600b56093d09d01c0922ab1cb3db)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision c594c716c5d793a4a86c95161a6b3be7ebd70af7)
@@ -64,6 +64,8 @@
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.FileValidatorUtil;
@@ -76,14 +78,6 @@
 /**
  * @author Manpreet Minhas
  * @author Steve.Ni
- *
- *
- *
- *
- *
- *
- *
- *
  */
 public class LearnerAction extends DispatchAction {
 
@@ -157,6 +151,8 @@
 	sessionMap.put(SbmtConstants.ATTR_LIMIT_UPLOAD_NUMBER, content.getLimitUploadNumber());
 	sessionMap.put(SbmtConstants.ATTR_USER_FINISHED, learner.isFinished());
 
+	sessionMap.put(SbmtConstants.ATTR_UPLOAD_MAX_FILE_SIZE, 
+		FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE)));
 	setLearnerDTO(request, sessionMap, learner, filesUploaded, mode);
 
 	// if content in use, return special page.
@@ -351,11 +347,11 @@
 	FileValidatorUtil.validateFileSize(learnerForm.getFile(), false, errors);
 
 	if (learnerForm.getFile() != null) {
-	    DispatchAction.log.debug("Learner submit file : " + learnerForm.getFile().getFileName());
+	    LearnerAction.logger.debug("Learner submit file : " + learnerForm.getFile().getFileName());
 	}
 
 	if (learnerForm.getFile() != null && FileUtil.isExecutableFile(learnerForm.getFile().getFileName())) {
-	    DispatchAction.log.debug("File is executatable : " + learnerForm.getFile().getFileName());
+	    LearnerAction.logger.debug("File is executatable : " + learnerForm.getFile().getFileName());
 	    ActionMessage msg = new ActionMessage("error.attachment.executable");
 	    errors.add(ActionMessages.GLOBAL_MESSAGE, msg);
 	}
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r6d719cda7801d12cbb580d8fa8da5cf282649865 -rc594c716c5d793a4a86c95161a6b3be7ebd70af7
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 6d719cda7801d12cbb580d8fa8da5cf282649865)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision c594c716c5d793a4a86c95161a6b3be7ebd70af7)
@@ -233,6 +233,11 @@
 								<label for="file"><fmt:message key="label.learner.filePath" />&nbsp;<span style="color: red">*</span></label>
 								<html:file property="file" styleClass="btn btn-sm btn-file"
 									disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" />
+								<p class="help-block">
+									<fmt:message key="label.learner.uploadMessage">
+										<fmt:param>${sessionMap.uploadMaxFileSize}</fmt:param>
+									</fmt:message>
+								</p>
 							</div>
 							<div class="form-group">
 								<!--File Description row -->