Index: lams_tool_sbmt/.classpath
===================================================================
diff -u -r9218936edd87260de73e773054cb605a336133b1 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/.classpath	(.../.classpath)	(revision 9218936edd87260de73e773054cb605a336133b1)
+++ lams_tool_sbmt/.classpath	(.../.classpath)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/noStruts"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-5.0.10.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/"/>
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
===================================================================
diff -u -rfefb3d42a0ef4f8c5b602fc1634c7e7ce619eea6 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision fefb3d42a0ef4f8c5b602fc1634c7e7ce619eea6)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -27,7 +27,6 @@
 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.exception.InvalidParameterException;
 import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException;
@@ -92,7 +91,7 @@
 
     /**
      * Get a the details for a single file uploaded by a learner
-     * 
+     *
      * @param detailId
      * @return SubmissionDetails
      */
@@ -150,14 +149,14 @@
     /**
      * Mark the original file uploaded by a learner as deleted. Does not delete the file
      * from the content repository.
-     * 
+     *
      * @param detailID
      */
     public void removeLearnerFile(Long detailID, UserDTO monitor);
 
     /**
      * Mark a deleted original file as not deleted. Undoes what removeLearnerFile().
-     * 
+     *
      * @param detailID
      */
     public void restoreLearnerFile(Long detailID, UserDTO monitor);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -rfefb3d42a0ef4f8c5b602fc1634c7e7ce619eea6 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision fefb3d42a0ef4f8c5b602fc1634c7e7ce619eea6)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -41,7 +41,6 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.ICredentials;
 import org.lamsfoundation.lams.contentrepository.ITicket;
@@ -272,8 +271,8 @@
 	List<SubmissionDetails> leaderSubmissions = submissionDetailsDAO.getBySessionAndLearner(fromUser.getSessionID(),
 		fromUser.getUserID());
 
-	List<SubmissionDetails> existingSubmissions = submissionDetailsDAO
-		.getBySessionAndLearner(toUser.getSessionID(), toUser.getUserID());
+	List<SubmissionDetails> existingSubmissions = submissionDetailsDAO.getBySessionAndLearner(toUser.getSessionID(),
+		toUser.getUserID());
 
 	// Note: uuid never changes once a file is uploaded as this is the key from the content repository.
 	for (SubmissionDetails leadersubmission : leaderSubmissions) {
@@ -314,7 +313,7 @@
 	    } else {
 		usersubmission.setReport(null);
 	    }
-	    
+
 	    submissionDetailsDAO.save(usersubmission);
 	}
     }
@@ -700,7 +699,6 @@
 	return new ArrayList(details);
     }
 
-    
     @Override
     public SubmissionDetails getSubmissionDetail(Long detailId) {
 	return submissionDetailsDAO.getSubmissionDetailsByID(detailId);
@@ -783,7 +781,7 @@
 		    report.setMarks(marks);
 
 		    // If there is a new file, delete the existing and add the mark file
-		    if ( nodeKey != null) {
+		    if (nodeKey != null) {
 
 			// Delete the existing
 			if (report.getMarkFileUUID() != null) {
@@ -854,7 +852,7 @@
 		    submitFilesReportDAO.update(report);
 		}
 	    }
-	    
+
 	} else {
 	    SubmitFilesReport report = submitFilesReportDAO.getReportByID(reportID);
 	    if (report != null) {
@@ -1505,5 +1503,4 @@
 	return (groupLeader != null) && user.getUserID().equals(groupLeader.getUserID());
     }
 
-
 }
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java
===================================================================
diff -u -rfefb3d42a0ef4f8c5b602fc1634c7e7ce619eea6 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java	(.../LearnerController.java)	(revision fefb3d42a0ef4f8c5b602fc1634c7e7ce619eea6)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java	(.../LearnerController.java)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -24,7 +24,6 @@
 package org.lamsfoundation.lams.tool.sbmt.web.controller;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
@@ -123,14 +122,14 @@
 	    mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, LearnerController.MODE_OPTIONAL);
 	} catch (Exception e) {
 	}
-	
+
 	String sessionIDStr = WebUtil.readStrParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
 	Long sessionID = Long.valueOf(sessionIDStr);
 	request.setAttribute("toolSessionID", sessionID);
-	
-        if (mode == null) {
-            mode = ToolAccessMode.LEARNER;
-        }
+
+	if (mode == null) {
+	    mode = ToolAccessMode.LEARNER;
+	}
 	// get session from shared session.
 	HttpSession ss = SessionManager.getSession();
 
@@ -408,15 +407,15 @@
     // validate uploaded form
     private boolean validateUploadForm(LearnerForm learnerForm, HttpServletRequest request) {
 	Locale preferredLocale = (Locale) request.getSession().getAttribute(LocaleFilter.PREFERRED_LOCALE_KEY);
-	
-	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<String, String>();
+
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 	if (learnerForm.getFile() == null || StringUtils.isBlank(learnerForm.getFile().getName())) {
 	    errorMap.add("GLOBAL", messageService.getMessage("learner.form.filepath.displayname"));
 	}
 	if (StringUtils.isBlank(learnerForm.getDescription())) {
 	    errorMap.add("GLOBAL", messageService.getMessage("label.learner.fileDescription"));
 	} else if (learnerForm.getDescription().length() > LearnerForm.DESCRIPTION_LENGTH) {
-	    errorMap.add("GLOBAL", "errors.maxdescsize");
+	    errorMap.add("GLOBAL", messageService.getMessage("errors.maxdescsize"));
 	}
 
 	FileValidatorSpringUtil.validateFileSize(learnerForm.getFile().getSize(), false, errorMap);
@@ -427,7 +426,7 @@
 
 	if (learnerForm.getFile() != null && FileUtil.isExecutableFile(learnerForm.getFile().getName())) {
 	    LearnerController.logger.debug("File is executatable : " + learnerForm.getFile().getName());
-	    errorMap.add("GLOBAL", "error.attachment.executable");
+	    errorMap.add("GLOBAL", messageService.getMessage("error.attachment.executable"));
 	}
 
 	if (!errorMap.isEmpty()) {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MarkController.java
===================================================================
diff -u -rfefb3d42a0ef4f8c5b602fc1634c7e7ce619eea6 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MarkController.java	(.../MarkController.java)	(revision fefb3d42a0ef4f8c5b602fc1634c7e7ce619eea6)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MarkController.java	(.../MarkController.java)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -35,6 +35,7 @@
 import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.web.form.MarkForm;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.NumberUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -66,6 +67,10 @@
     @Qualifier("submitFilesService")
     private ISubmitFilesService submitFilesService;
 
+    @Autowired
+    @Qualifier("sbmtMessageService")
+    private MessageService messageService;
+
     /**
      * Update mark.
      */
@@ -76,11 +81,11 @@
 	// Check whether the mark is valid.
 	Float marks = null;
 	String markStr = markForm.getMarks();
-	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<String, String>();
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 	try {
 	    marks = NumberUtil.getLocalisedFloat(markStr, request.getLocale());
 	} catch (Exception e) {
-	    errorMap.add("GLOBAL", "errors.mark.invalid.number");
+	    errorMap.add("GLOBAL", messageService.getMessage("errors.mark.invalid.number"));
 	}
 
 	String comments = WebUtil.readStrParam(request, "comments", true);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java
===================================================================
diff -u -rfefb3d42a0ef4f8c5b602fc1634c7e7ce619eea6 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision fefb3d42a0ef4f8c5b602fc1634c7e7ce619eea6)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -44,7 +44,6 @@
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.struts.action.ActionMessage;
 import org.lamsfoundation.lams.tool.sbmt.SbmtConstants;
 import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
@@ -55,7 +54,6 @@
 import org.lamsfoundation.lams.tool.sbmt.dto.SessionDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.StatisticDTO;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
-import org.lamsfoundation.lams.tool.sbmt.web.form.MarkForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.MessageService;
@@ -68,7 +66,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 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.ResponseBody;
 import org.springframework.web.util.HtmlUtils;
@@ -267,6 +264,7 @@
      * Release mark
      */
     @RequestMapping("/releaseMarks")
+    @ResponseBody
     public void releaseMarks(HttpServletRequest request, HttpServletResponse response) {
 
 	// get service then update report table
@@ -297,7 +295,7 @@
 	// return FileDetailsDTO list according to the given sessionID
 	Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID, request.getLocale());
 	// construct Excel file format and download
-	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<String, String>();
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 	try {
 	    // create an empty excel file
 	    HSSFWorkbook wb = new HSSFWorkbook();
@@ -374,17 +372,17 @@
 	    response.getOutputStream().flush();
 	} catch (Exception e) {
 	    logger.error(e);
-	    errorMap.add("monitoring.download.error", e.toString());
+	    errorMap.add(messageService.getMessage("monitoring.download.error"), e.toString());
 	}
 
 	if (!errorMap.isEmpty()) {
 	    try {
 		PrintWriter out = response.getWriter();
 		Iterator<String> it = errorMap.keySet().iterator();
-	         while(it.hasNext()){
-	           String theKey = (String)it.next();
-	           out.write(theKey);
-	         }
+		while (it.hasNext()) {
+		    String theKey = it.next();
+		    out.write(theKey);
+		}
 		out.flush();
 	    } catch (IOException e) {
 	    }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/AuthoringForm.java
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/AuthoringForm.java	(.../AuthoringForm.java)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/AuthoringForm.java	(.../AuthoringForm.java)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -2,8 +2,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.validator.ValidatorForm;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 
 /**
@@ -32,7 +30,7 @@
     // file and display fields
 
     private boolean limitUpload;
-    
+
     private boolean useSelectLeaderToolOuput;
 
     private int limitUploadNumber;
@@ -178,12 +176,12 @@
     public void setNotifyTeachersOnFileSubmit(boolean notifyTeachersOnFileSubmit) {
 	this.notifyTeachersOnFileSubmit = notifyTeachersOnFileSubmit;
     }
-    
+
     public boolean isUseSelectLeaderToolOuput() {
-   	return useSelectLeaderToolOuput;
+	return useSelectLeaderToolOuput;
     }
 
     public void setUseSelectLeaderToolOuput(boolean useSelectLeaderToolOuput) {
-   	this.useSelectLeaderToolOuput = useSelectLeaderToolOuput;
+	this.useSelectLeaderToolOuput = useSelectLeaderToolOuput;
     }
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/ReflectionForm.java
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/ReflectionForm.java	(.../ReflectionForm.java)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/ReflectionForm.java	(.../ReflectionForm.java)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -21,11 +21,9 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.sbmt.web.form;
 
 import org.apache.log4j.Logger;
-import org.apache.struts.validator.ValidatorForm;
 
 /**
  *
Fisheye: Tag 0846a8d71b94a193280999c0576aa7512c2fca9d refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb32cbfc76a3cd150823b3696160d5fd4fa6cde84 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b32cbfc76a3cd150823b3696160d5fd4fa6cde84)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -4,6 +4,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
@@ -89,7 +90,7 @@
 				</c:if>
 			</c:if>
 			<c:if test="${empty toolSessionId}">
-				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<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>
 				</c:if>
Index: lams_tool_sbmt/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r35a96de80ddf8f88a34d7f75eaf71748db934044 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
+++ lams_tool_sbmt/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -refa51a5d0464d96fada4e5a70f1fb86c2d726717 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision efa51a5d0464d96fada4e5a70f1fb86c2d726717)
+++ lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_sbmt/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r36e474218e1201198ba926e57e56c7a885db1a9f -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 36e474218e1201198ba926e57e56c7a885db1a9f)
+++ lams_tool_sbmt/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -34,7 +34,6 @@
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <c:set var="class" value=""/>
 <c:if test="${id == 1}">
Index: lams_tool_sbmt/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u -r6bed0e62245e6c9ce454d4bc54920a0b41dac9bc -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 6bed0e62245e6c9ce454d4bc54920a0b41dac9bc)
+++ lams_tool_sbmt/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -30,7 +30,6 @@
 
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <div class="panel-body panel-monitor-body">
 	 <jsp:doBody />
Index: lams_tool_sbmt/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -32,7 +32,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 <%-- Required attributes --%>
Fisheye: Tag 0846a8d71b94a193280999c0576aa7512c2fca9d refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tlds/struts/struts-bean-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0846a8d71b94a193280999c0576aa7512c2fca9d refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tlds/struts/struts-bean.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0846a8d71b94a193280999c0576aa7512c2fca9d refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tlds/struts/struts-html-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0846a8d71b94a193280999c0576aa7512c2fca9d refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tlds/struts/struts-html.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0846a8d71b94a193280999c0576aa7512c2fca9d refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tlds/struts/struts-logic-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0846a8d71b94a193280999c0576aa7512c2fca9d refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tlds/struts/struts-logic.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0846a8d71b94a193280999c0576aa7512c2fca9d refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tlds/struts/struts-nested.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0846a8d71b94a193280999c0576aa7512c2fca9d refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tlds/struts/struts-tiles-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0846a8d71b94a193280999c0576aa7512c2fca9d refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tlds/struts/struts-tiles.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -157,43 +157,7 @@
 	</error-page>
 
 	<jsp-config>
-
 		<!-- ======================================================== -->
-		<!-- Struts Tag Library Descriptors -->
-		<!-- ======================================================== -->
-		<taglib>
-			<taglib-uri>tags-bean</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-bean-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
-		</taglib>
-		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
 		<taglib>
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -r3c1a078fa0607bbbe0f78641ffebb16ebbb3114a -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 3c1a078fa0607bbbe0f78641ffebb16ebbb3114a)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -32,7 +32,7 @@
 	<form:hidden path="toolContentID" />
 	<form:hidden path="contentFolderID" />
 	
-	<lams:Page title="${title}" type="navbar">
+	<lams:Page title="${title}" type="navbar" formID="authoringForm">
 		
 		<lams:Tabs control="true" title="${title}" helpToolSignature="<%= SbmtConstants.TOOL_SIGNATURE %>" helpModule="authoring">
 			<lams:Tab id="1" key="label.authoring.heading.basic" />
Index: lams_tool_sbmt/web/common/taglibs.jsp
===================================================================
diff -u -re998cf2de8c4714022559cb5f67e61b677a2dd28 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
+++ lams_tool_sbmt/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -1,7 +1,5 @@
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
+
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
Index: lams_tool_sbmt/web/learner/definelater.jsp
===================================================================
diff -u -r129b9d294bcaafb1b0aafa5dc613b103bb084c66 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/learner/definelater.jsp	(.../definelater.jsp)	(revision 129b9d294bcaafb1b0aafa5dc613b103bb084c66)
+++ lams_tool_sbmt/web/learner/definelater.jsp	(.../definelater.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -13,7 +13,7 @@
 		<fmt:message key="activity.title"></fmt:message>
 	</c:set>
 
-	<lams:Page type="learner" title="${title}">
+	<lams:Page type="learner" title="${title}" formID="learnerForm">
 		<lams:DefineLater />
 		<div id="footer"></div>
 	</lams:Page>
Index: lams_tool_sbmt/web/learner/notebook.jsp
===================================================================
diff -u -r3c1a078fa0607bbbe0f78641ffebb16ebbb3114a -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 3c1a078fa0607bbbe0f78641ffebb16ebbb3114a)
+++ lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -17,7 +17,7 @@
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-	<lams:Page type="learner" title="${sessionMap.title}">
+	<lams:Page type="learner" title="${sessionMap.title}" formID="learnerForm">
 
 		<%@ include file="/common/messages.jsp"%>
 
Index: lams_tool_sbmt/web/learner/redirectAfterSubmit.jsp
===================================================================
diff -u -rfefb3d42a0ef4f8c5b602fc1634c7e7ce619eea6 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/learner/redirectAfterSubmit.jsp	(.../redirectAfterSubmit.jsp)	(revision fefb3d42a0ef4f8c5b602fc1634c7e7ce619eea6)
+++ lams_tool_sbmt/web/learner/redirectAfterSubmit.jsp	(.../redirectAfterSubmit.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -14,7 +14,7 @@
 </lams:head>
 
 <body class="stripes">
-<lams:Page type="admin">
+<lams:Page type="admin" formID="learnerForm">
 	<div class="text-center" style="margin-top: 10px; margin-bottom: 15px;">
 		<i class="fa fa-2x fa-refresh fa-spin text-primary"></i>
 	</div>
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -rfefb3d42a0ef4f8c5b602fc1634c7e7ce619eea6 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision fefb3d42a0ef4f8c5b602fc1634c7e7ce619eea6)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -123,7 +123,7 @@
 
 <body class="stripes">
 
-	<lams:Page type="learner" title="${sessionMap.title}">
+	<lams:Page type="learner" title="${sessionMap.title}" formID="learnerForm">
 		<div class="panel">
 			<c:out value="${sessionMap.instruction}" escapeXml="false" />
 		</div>
Index: lams_tool_sbmt/web/learner/submissionDeadline.jsp
===================================================================
diff -u -r3c1a078fa0607bbbe0f78641ffebb16ebbb3114a -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/learner/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 3c1a078fa0607bbbe0f78641ffebb16ebbb3114a)
+++ lams_tool_sbmt/web/learner/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -27,7 +27,7 @@
 		<fmt:message key="activity.title"></fmt:message>
 	</c:set>
 
-	<lams:Page type="learner" title="${title}">
+	<lams:Page type="learner" title="${title}" formID="learnerForm">
 
 		<lams:Alert id="submissionDeadline" close="false" type="danger">
 			<fmt:message key="authoring.info.teacher.set.restriction">
Index: lams_tool_sbmt/web/learner/waitForLeaderTimeLimit.jsp
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/learner/waitForLeaderTimeLimit.jsp	(.../waitForLeaderTimeLimit.jsp)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/web/learner/waitForLeaderTimeLimit.jsp	(.../waitForLeaderTimeLimit.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -19,7 +19,7 @@
 </lams:head>
 <body class="stripes">
 
-	<lams:Page type="learner" title="${content.title}">
+	<lams:Page type="learner" title="${content.title}" formID="learnerForm">
 				
 		<c:if test="${isLeadershipEnabled}">
 			<lams:LeaderDisplay username="${sessionMap.groupLeader.firstName} ${sessionMap.groupLeader.lastName}" userId="${sessionMap.groupLeader.userId}"/>
Index: lams_tool_sbmt/web/learner/waitforleader.jsp
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/learner/waitforleader.jsp	(.../waitforleader.jsp)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/web/learner/waitforleader.jsp	(.../waitforleader.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -19,7 +19,7 @@
 </lams:head>
 <body class="stripes">
 
-	<lams:Page type="learner" title="${content.title}">
+	<lams:Page type="learner" title="${content.title}" formID="learnerForm">
 	
 				
 		<c:if test="${isLeadershipEnabled}">
Index: lams_tool_sbmt/web/monitoring/mark/allmarks.jsp
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	(.../allmarks.jsp)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	(.../allmarks.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -19,7 +19,7 @@
 	<script type="text/javascript" src="${lams}includes/javascript/readmore.min.js"></script>
 	<script type="text/javascript">
 		function updateMark(detailId,reportId,sessionId,userId){
-			location.href="<lams:WebAppURL/>mark.do?method=newMark&updateMode=listAllMarks&userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId+"&reportID="+reportId;
+			location.href="<lams:WebAppURL/>mark/newMark.do?updateMode=listAllMarks&userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId+"&reportID="+reportId;
 		}
 		</script>
 </lams:head>
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
diff -u -rfefb3d42a0ef4f8c5b602fc1634c7e7ce619eea6 -r0846a8d71b94a193280999c0576aa7512c2fca9d
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision fefb3d42a0ef4f8c5b602fc1634c7e7ce619eea6)
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
@@ -124,13 +124,12 @@
 	}
 
 	function releaseMarks(sessionId) {
-		var url = "<c:url value="/monitoring.do"/>";
+		var url = "<c:url value="/monitoring/releaseMarks.do"/>";
 		
 		$("#messageArea_Busy").show();
 		$("#messageArea").load(
 			url,
 			{
-				method: "releaseMarks",
 				toolSessionID: sessionId, 
 				reqID: (new Date()).getTime()
 			},
@@ -199,9 +198,7 @@
 		</button>
 		<form action="monitoring/downloadMarks.do" method="post" style="display:inline">
 			<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>
+			<input type="submit" name="downloadMarks" value="<fmt:message key="label.monitoring.downloadMarks.button" />" class="btn btn-default loffset5 voffset10" />
 		</form>
 	</P>