Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java
===================================================================
diff -u -r3c1a078fa0607bbbe0f78641ffebb16ebbb3114a -r516c44cd3de0552a5aca39293035dd7326f6d8e3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 3c1a078fa0607bbbe0f78641ffebb16ebbb3114a)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 516c44cd3de0552a5aca39293035dd7326f6d8e3)
@@ -122,7 +122,7 @@
 	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 	errorMap = validate(authoringForm, request);
 	if (!errorMap.isEmpty()) {
-	    return "redirect:/";
+	    return "authoring/authoring";
 	}
 
 	SubmitFilesContent content = getContent(authoringForm);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java
===================================================================
diff -u -r0846a8d71b94a193280999c0576aa7512c2fca9d -r516c44cd3de0552a5aca39293035dd7326f6d8e3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java	(.../LearnerController.java)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java	(.../LearnerController.java)	(revision 516c44cd3de0552a5aca39293035dd7326f6d8e3)
@@ -77,7 +77,6 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -299,8 +298,7 @@
      * more submission use.
      */
     @RequestMapping("/uploadFile")
-    public String uploadFile(@ModelAttribute LearnerForm learnerForm, @RequestParam("file") MultipartFile file,
-	    HttpServletRequest request) {
+    public String uploadFile(@ModelAttribute LearnerForm learnerForm, HttpServletRequest request) {
 
 	String sessionMapID = learnerForm.getSessionMapID();
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
@@ -326,7 +324,7 @@
 	    ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
 	    setLearnerDTO(request, sessionMap, learner, filesUploaded, mode);
 
-	    return "redirect:/";
+	    return "learner/sbmtlearner";
 	}
 
 	// get session from shared session.
@@ -335,7 +333,7 @@
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	Integer userID = user.getUserID();
 
-	file = learnerForm.getFile();
+	MultipartFile file = learnerForm.getFile();
 	String fileDescription = learnerForm.getDescription();
 	// reset fields and display a new form for next new file upload
 	learnerForm.setDescription("");
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/ReflectController.java
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -r516c44cd3de0552a5aca39293035dd7326f6d8e3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/ReflectController.java	(.../ReflectController.java)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/ReflectController.java	(.../ReflectController.java)	(revision 516c44cd3de0552a5aca39293035dd7326f6d8e3)
@@ -13,14 +13,16 @@
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.web.form.ReflectionForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
 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.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -37,6 +39,10 @@
     @Qualifier("submitFilesService")
     private ISubmitFilesService submitFilesService;
 
+    @Autowired
+    @Qualifier("sbmtMessageService")
+    private static MessageService messageService;
+
     /**
      * Display empty reflection form.
      */
@@ -110,20 +116,19 @@
     //		Private mehtods
     //**********************************************************************************************
 
-    public static void validateBeforeFinish(Errors errors, HttpServletRequest request,
-	    ISubmitFilesService submitFilesService) {
+    public static void validateBeforeFinish(HttpServletRequest request, ISubmitFilesService submitFilesService) {
 	String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 
 	HttpSession ss = SessionManager.getSession();
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	Integer userID = user.getUserID();
-
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 	List list = submitFilesService.getFilesUploadedByUser(userID, sessionId, request.getLocale(), false);
 	int minUpload = (Integer) sessionMap.get(SbmtConstants.PARAM_MIN_UPLOAD);
 	if (minUpload > 0) {
-	    errors.reject("error.learning.minimum.upload.number.less");
+	    errorMap.add("GLOBAL", messageService.getMessage("error.learning.minimum.upload.number.less"));
 	}
     }
 }
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r0846a8d71b94a193280999c0576aa7512c2fca9d -r516c44cd3de0552a5aca39293035dd7326f6d8e3
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 516c44cd3de0552a5aca39293035dd7326f6d8e3)
@@ -89,7 +89,7 @@
 					</c:if>
 				</c:if>
 			</c:if>
-			<c:if test="${empty toolSessionId}">
+			<c:if test="${empty toolSessionId and not empty formID}">
 				<c:set var="toolForm" value="${requestScope[formID]}" />
 				<c:if test="${not empty toolForm}"> 
 				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
@@ -435,4 +435,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
+</c:choose>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -r0846a8d71b94a193280999c0576aa7512c2fca9d -r516c44cd3de0552a5aca39293035dd7326f6d8e3
--- lams_tool_sbmt/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
+++ lams_tool_sbmt/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 516c44cd3de0552a5aca39293035dd7326f6d8e3)
@@ -32,11 +32,11 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 <%-- Required attributes --%>
 <%@ attribute name="sessionMapID" required="true" rtexprvalue="true" %>
-<%@ attribute name="wrapInFormTag" required="true" rtexprvalue="true" %>
 
 <%-- Optional attributes --%>
 <%@ attribute name="action" required="false" rtexprvalue="true" %>
@@ -52,10 +52,10 @@
 
 <%-- Default value for message key --%>
 <c:if test="${empty action}">
-	<c:set var="action" value="authoring/textsearch.do" scope="request"/>
+	<c:set var="action" value="textsearch.do" scope="request"/>
 </c:if>
 <c:if test="${empty cancelAction}">
-	<c:set var="cancelAction" value="authoring/textsearchCancel.do" scope="request"/>
+	<c:set var="cancelAction" value="textsearchCancel.do" scope="request"/>
 </c:if>
 <c:if test="${empty formID}">
 	<c:set var="formID" value="textSearchForm" scope="request"/>
@@ -84,52 +84,40 @@
 
 <!-- begin text search form content -->
 	
-<c:if test="${wrapInFormTag}">
-	<form action="${action}" id="${formID}" name="${formID}">
-</c:if>
-		<input type="hidden" name="sessionMapID" />
-		<h4><fmt:message key="${headingLabelKey}" /></h4>
-		<table>
-			<tr>
-				<td>
-					<fmt:message key="${allWordsLabelKey}" />
-				</td>
-				<td>
-					<input type="text" size="40" name="allWords" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${phraseLabelKey}" />
-				</td>
-				<td>
-					<input type="text" size="40" name="phrase" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${anyWordsLabelKey}" />
-				</td>
-				<td>
-					<input type="text" size="40" name="anyWords" /> 
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${excludedWordsLabelKey}" />
-				</td>
-				<td>
-					<input type="text" size="40" name="excludedWords" /> 
-				</td>
-			</tr>
-		</table>
-<c:if test="${wrapInFormTag}">
-	<lams:ImgButtonWrapper>
-		<a href="#" onclick="${formID}.submit();" class="button-add-item"><fmt:message key="${saveButtonLabelKey}" />
-		</a>
-		<a href="#" onclick="location.href='${cancelAction}'" class="button space-left"><fmt:message key="${cancelButtonLabelKey}" />
-		</a>
-	</lams:ImgButtonWrapper>
-	</form>
-</c:if>
+	<form:hidden path="sessionMapID" />
+	<h4><fmt:message key="${headingLabelKey}" /></h4>
+	<table>
+		<tr>
+			<td>
+				<fmt:message key="${allWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="allWords" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${phraseLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="phrase" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${anyWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="anyWords" /> 
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${excludedWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="excludedWords" /> 
+			</td>
+		</tr>
+	</table>
 <!-- end text search form content -->
\ No newline at end of file
Fisheye: Tag 516c44cd3de0552a5aca39293035dd7326f6d8e3 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/validation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 516c44cd3de0552a5aca39293035dd7326f6d8e3 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/validator-rules.xml'.
Fisheye: No comparison available.  Pass `N' to diff?