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>