Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -re570134b86338055e4fabad4761e69fbb47a57e0
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision e570134b86338055e4fabad4761e69fbb47a57e0)
@@ -55,7 +55,6 @@
  * @author Steve Ni
  */
 @Controller
-@RequestMapping("/authoring")
 public class AuthoringController {
     private Logger log = Logger.getLogger(AuthoringController.class);
 
@@ -123,7 +122,6 @@
      * @throws InvocationTargetException
      * @throws Exception
      */
-    @RequestMapping("/updateContent")
     public String updateContent(@ModelAttribute AuthoringForm authoringForm, Errors errors, HttpServletRequest request)
 	    throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -re570134b86338055e4fabad4761e69fbb47a57e0
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java	(.../LearnerController.java)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java	(.../LearnerController.java)	(revision e570134b86338055e4fabad4761e69fbb47a57e0)
@@ -63,7 +63,6 @@
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.FileUtil;
-import org.lamsfoundation.lams.util.FileValidatorSpringUtil;
 import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -74,7 +73,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
-import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -107,7 +105,7 @@
     /**
      * The initial page of learner in Submission tool. This page will list all uploaded files and learn
      */
-    @RequestMapping("/learner")
+    @RequestMapping("")
     public String unspecified(@ModelAttribute LearnerForm learnerForm, HttpServletRequest request) {
 	// initial session Map
 	SessionMap sessionMap = new SessionMap();
@@ -126,7 +124,9 @@
 	    mode = ToolAccessMode.LEARNER;
 	}
 
-	Long sessionID = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID));
+	String sessionIDStr = WebUtil.readStrParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+	Long sessionID = Long.valueOf(sessionIDStr);
+	request.setAttribute("toolSessionID", sessionID);
 
 	// get session from shared session.
 	HttpSession ss = SessionManager.getSession();
@@ -270,7 +270,6 @@
     /**
      * Loads the main learner page with the details currently in the session map
      */
-    @RequestMapping("/refresh")
     public String refresh(@ModelAttribute LearnerForm learnerForm, HttpServletRequest request) {
 	String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
@@ -296,8 +295,9 @@
      * Implements learner upload submission function. This function also display the page again for learner uploading
      * more submission use.
      */
+    @RequestMapping("/uploadFile")
     public String uploadFile(@ModelAttribute LearnerForm learnerForm, @RequestParam("file") MultipartFile file,
-	    Errors errors, HttpServletRequest request) {
+	    HttpServletRequest request) {
 
 	String sessionMapID = learnerForm.getSessionMapID();
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
@@ -309,7 +309,7 @@
 	LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionID, request,
 		applicationContext.getServletContext());
 
-	if (validateUploadForm(learnerForm, errors, request)) {
+	if (validateUploadForm(learnerForm, request)) {
 	    // get session from shared session.
 	    HttpSession ss = SessionManager.getSession();
 	    // get back login user DTO
@@ -401,7 +401,7 @@
     }
 
     // validate uploaded form
-    private boolean validateUploadForm(LearnerForm learnerForm, Errors errors, HttpServletRequest request) {
+    private boolean validateUploadForm(LearnerForm learnerForm, HttpServletRequest request) {
 	Locale preferredLocale = (Locale) request.getSession().getAttribute(LocaleFilter.PREFERRED_LOCALE_KEY);
 	List<String> messages = new ArrayList<>();
 	if (learnerForm.getFile() == null || StringUtils.isBlank(learnerForm.getFile().getName())) {
@@ -413,7 +413,7 @@
 	    messages.add("errors.maxdescsize");
 	}
 
-	FileValidatorSpringUtil.validateFileSize(learnerForm.getFile(), false, errors);
+//	FileValidatorSpringUtil.validateFileSize(learnerForm.getFile(), false, errors);
 
 	if (learnerForm.getFile() != null) {
 	    LearnerController.logger.debug("Learner submit file : " + learnerForm.getFile().getName());
@@ -423,7 +423,7 @@
 	    LearnerController.logger.debug("File is executatable : " + learnerForm.getFile().getName());
 	    messages.add("error.attachment.executable");
 	}
-	
+
 	if (messages != null && !messages.isEmpty()) {
 	    request.setAttribute("messages", messages);
 	    return true;
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -re570134b86338055e4fabad4761e69fbb47a57e0
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision e570134b86338055e4fabad4761e69fbb47a57e0)
@@ -119,7 +119,7 @@
     /**
      * Default ActionForward for Monitor
      */
-    @RequestMapping("/monitoring")
+    @RequestMapping("")
     public String unspecified(HttpServletRequest request) {
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
 	Long contentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -re570134b86338055e4fabad4761e69fbb47a57e0
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision e570134b86338055e4fabad4761e69fbb47a57e0)
@@ -27,8 +27,8 @@
 	<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
 	<c:set var="title"><fmt:message key="activity.title" /></c:set>
 	
-	<form:hidden path="mode" value="${sessionMap.mode}" />
-	<form:hidden path="dispatch" value="updateContent" />
+	<input type="hidden" name="mode" value="${mode}" />
+	<input type="hidden" name="dispatch" value="updateContent" />
 	<form:hidden path="sessionMapID" />
 	<form:hidden path="toolContentID" />
 	<form:hidden path="contentFolderID" />
Index: lams_tool_sbmt/web/learner/redirectAfterSubmit.jsp
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -re570134b86338055e4fabad4761e69fbb47a57e0
--- lams_tool_sbmt/web/learner/redirectAfterSubmit.jsp	(.../redirectAfterSubmit.jsp)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/web/learner/redirectAfterSubmit.jsp	(.../redirectAfterSubmit.jsp)	(revision e570134b86338055e4fabad4761e69fbb47a57e0)
@@ -8,7 +8,7 @@
 <%@ include file="/common/header.jsp"%>
 <script language="JavaScript" type="text/JavaScript">
 	$(document).ready(function(){
-		window.location.href = '<lams:WebAppURL />/learner.do?method=refresh&sessionMapID=${sessionMapID}';
+		window.location.href = '<lams:WebAppURL />learner.do?method=refresh&sessionMapID=${sessionMapID}';
 	});
 </script>
 </lams:head>
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -re570134b86338055e4fabad4761e69fbb47a57e0
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision e570134b86338055e4fabad4761e69fbb47a57e0)
@@ -48,11 +48,11 @@
 			}
 		}
 		function finish() {
-			var finishUrl = "<html:rewrite page='/learner.do?method=finish&sessionMapID=${sessionMapID}'/>";
+			var finishUrl = "<lams:WebAppURL />learner.do?method=finish&sessionMapID=${sessionMapID}";
 			return submitCount(finishUrl);
 		}
 		function notebook() {
-			var continueUrl = "<html:rewrite page='/learning/newReflection.do?sessionMapID=${sessionMapID}'/>";
+			var continueUrl = "<lams:WebAppURL />learning/newReflection.do?sessionMapID=${sessionMapID}";
 			return submitCount(continueUrl);
 		}
 		function validate() {
@@ -286,11 +286,11 @@
 
 			<c:if test="${!displayForm && hasEditRight}">
 
-				<form:form action="/learner?method=uploadFile" modelAttribute="learnerForm" id="learnerForm" method="post" enctype="multipart/form-data" onsubmit="return validate();" >
+				<form:form action="learner/uploadFile.do" modelAttribute="learnerForm" id="learnerForm" method="post" enctype="multipart/form-data" onsubmit="return validate();" >
 					<form:hidden path="sessionMapID" />
 
 					<!-- Hidden fields -->
-					<form:hidden path="toolSessionID" value="${sessionMap.toolSessionID}" />
+					<input type="hidden" name="toolSessionID" value="${toolSessionID}" />
 
 					<!--File path row -->
 					<div class="panel panel-default">
@@ -308,7 +308,7 @@
 								<!--File Description row -->
 								<label for="description"><fmt:message key="label.learner.fileDescription" />&nbsp;<span
 									style="color: red">*</span></label>
-								<html:textarea id="description" cssClass="form-control" path="description"/>
+								<form:textarea id="description" cssClass="form-control" path="description"></form:textarea>
 								<div id="desc-error-msg" class="text-danger" style="display: none;"></div>
 							</div>
 							<p class="help-block"><small><fmt:message key="errors.required"><fmt:param>*</fmt:param></fmt:message></small></p>
Index: lams_tool_sbmt/web/learner/submissionDeadline.jsp
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -re570134b86338055e4fabad4761e69fbb47a57e0
--- lams_tool_sbmt/web/learner/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/web/learner/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision e570134b86338055e4fabad4761e69fbb47a57e0)
@@ -11,11 +11,11 @@
 	<script type="text/javascript">
 		function finish() {
 			document.getElementById("finishButton").disabled = true;
-			var finishUrl = "<html:rewrite page='/learner.do?method=finish&sessionMapID=${sessionMapID}'/>";
+			var finishUrl = "<lams:WebAppURL />learner.do?method=finish&sessionMapID=${sessionMapID}";
 			location.href = finishUrl;
 		}
 		function notebook() {
-			var finishUrl = "<html:rewrite page='/learning/newReflection.do?sessionMapID=${sessionMapID}'/>";
+			var finishUrl = "<lams:WebAppURL />learning/newReflection.do?sessionMapID=${sessionMapID}";
 			location.href = finishUrl;
 		}
 	</script>
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -re570134b86338055e4fabad4761e69fbb47a57e0
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision e570134b86338055e4fabad4761e69fbb47a57e0)
@@ -197,13 +197,13 @@
 					 class="btn btn-default loffset5 voffset10" >
 			<fmt:message key="label.monitoring.releaseMarks.button" />
 		</button>
-		<form:form action="monitoring.do" style="display:inline">
-			<form:hidden path="method" value="downloadMarks" />
-			<form:hidden path="toolSessionID" value="${sessionDto.sessionID}" />
+		<form action="monitoring.do" method="post" style="display:inline">
+			<input type="hidden" name="method" value="downloadMarks" />
+			<input type="hidden" name="toolSessionID" value="${sessionDto.sessionID}" />
 			<input type="submit" name="downloadMarks" class="btn btn-default loffset5 voffset10" >
 				<fmt:message key="label.monitoring.downloadMarks.button" />
 			</input>
-		</form:form>
+		</form>
 	</P>
 		
 	<c:if test="${isGroupedActivity}">