Index: lams_tool_task/.classpath
===================================================================
diff -u -r9218936edd87260de73e773054cb605a336133b1 -r74467b8916b85a9d0376e4c2d8f7deaf4511450c
--- lams_tool_task/.classpath	(.../.classpath)	(revision 9218936edd87260de73e773054cb605a336133b1)
+++ lams_tool_task/.classpath	(.../.classpath)	(revision 74467b8916b85a9d0376e4c2d8f7deaf4511450c)
@@ -2,11 +2,10 @@
 <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/com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
+	<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/" />
+			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java
===================================================================
diff -u -re4625a3ec2ff39bfe424a857788a54497ff64b7a -r74467b8916b85a9d0376e4c2d8f7deaf4511450c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision e4625a3ec2ff39bfe424a857788a54497ff64b7a)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 74467b8916b85a9d0376e4c2d8f7deaf4511450c)
@@ -43,7 +43,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionForm;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.taskList.TaskListConstants;
@@ -69,6 +68,7 @@
 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.RequestMethod;
 
 /**
  * The main action in author mode. All the authoring operations are located in
@@ -301,7 +301,7 @@
      * @return
      * @throws ServletException
      */
-    @RequestMapping("/update")
+    @RequestMapping(path = "/update", method = RequestMethod.POST)
     public String updateContent(@ModelAttribute TaskListForm taskListForm, HttpServletRequest request)
 	    throws Exception {
 
@@ -504,7 +504,7 @@
      * @return
      * @throws ServletException
      */
-    @RequestMapping("/saveOrUpdateItem")
+    @RequestMapping(path = "/saveOrUpdateItem", method = RequestMethod.POST)
     public String saveOrUpdateItem(@ModelAttribute TaskListItemForm taskListItemForm, Errors errors,
 	    HttpServletRequest request) {
 
@@ -825,17 +825,17 @@
     }
 
     @RequestMapping("/initPedagogicalPlannerForm")
-    public String initPedagogicalPlannerForm(ActionForm form, HttpServletRequest request) {
-	TaskListPedagogicalPlannerForm plannerForm = (TaskListPedagogicalPlannerForm) form;
+    public String initPedagogicalPlannerForm(@ModelAttribute TaskListPedagogicalPlannerForm plannerForm,
+	    HttpServletRequest request) {
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	TaskList taskList = taskListService.getTaskListByContentId(toolContentID);
 	plannerForm.fillForm(taskList);
 	return "pages/authoring/pedagogicalPlannerForm";
     }
 
-    @RequestMapping("/saveOrUpdatePedagogicalPlannerForm")
-    public String saveOrUpdatePedagogicalPlannerForm(TaskListPedagogicalPlannerForm plannerForm, Errors errors,
-	    HttpServletRequest request) throws IOException {
+    @RequestMapping(path = "/saveOrUpdatePedagogicalPlannerForm", method = RequestMethod.POST)
+    public String saveOrUpdatePedagogicalPlannerForm(@ModelAttribute TaskListPedagogicalPlannerForm plannerForm,
+	    Errors errors, HttpServletRequest request) throws IOException {
 	plannerForm.validate(errors);
 	if (!errors.hasErrors()) {
 	    TaskList taskList = taskListService.getTaskListByContentId(plannerForm.getToolContentID());
@@ -886,9 +886,8 @@
     }
 
     @RequestMapping("/createPedagogicalPlannerItem")
-    public String createPedagogicalPlannerItem(ActionForm form, HttpServletRequest request)
-	    throws IOException, ServletException {
-	TaskListPedagogicalPlannerForm plannerForm = (TaskListPedagogicalPlannerForm) form;
+    public String createPedagogicalPlannerItem(@ModelAttribute TaskListPedagogicalPlannerForm plannerForm,
+	    HttpServletRequest request) {
 	plannerForm.setTaskListItem(plannerForm.getTaskListItemCount().intValue(), "");
 	return "pages/authoring/pedagogicalPlannerForm";
     }
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringTaskListConditionController.java
===================================================================
diff -u -rcad516bd852b193b61c821c5177cecacf3e5d016 -r74467b8916b85a9d0376e4c2d8f7deaf4511450c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringTaskListConditionController.java	(.../AuthoringTaskListConditionController.java)	(revision cad516bd852b193b61c821c5177cecacf3e5d016)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringTaskListConditionController.java	(.../AuthoringTaskListConditionController.java)	(revision 74467b8916b85a9d0376e4c2d8f7deaf4511450c)
@@ -32,39 +32,25 @@
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
-import org.apache.struts.util.LabelValueBean;
-import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.taskList.TaskListConstants;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListCondition;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItem;
-import org.lamsfoundation.lams.tool.taskList.service.ITaskListService;
 import org.lamsfoundation.lams.tool.taskList.service.TaskListException;
 import org.lamsfoundation.lams.tool.taskList.util.TaskListConditionComparator;
 import org.lamsfoundation.lams.tool.taskList.util.TaskListItemComparator;
 import org.lamsfoundation.lams.tool.taskList.web.form.TaskListConditionForm;
 import org.lamsfoundation.lams.tool.taskList.web.form.TaskListForm;
 import org.lamsfoundation.lams.util.WebUtil;
-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.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 /**
  * Auxiliary action in author mode. It contains operations with TaskListCondition. The rest of operations are located in
@@ -78,7 +64,6 @@
 @RequestMapping("/authoringCondition")
 public class AuthoringTaskListConditionController {
 
-    
     /**
      * Display same entire authoring page content from HttpSession variable.
      *
@@ -88,13 +73,14 @@
      * @throws ServletException
      */
     @RequestMapping("/showConditions")
-    public String showConditions(@ModelAttribute TaskListForm taskListForm, HttpServletRequest request) throws ServletException {
-	
+    public String showConditions(@ModelAttribute TaskListForm taskListForm, HttpServletRequest request)
+	    throws ServletException {
+
 	String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(sessionMapID);
 	TaskListForm existForm = (TaskListForm) sessionMap.get(TaskListConstants.ATTR_TASKLIST_FORM);
-	
+
 	try {
 	    PropertyUtils.copyProperties(taskListForm, existForm);
 	} catch (Exception e) {
@@ -114,7 +100,7 @@
      */
     @RequestMapping("/newConditionInit")
     public String newConditionInit(@ModelAttribute TaskListForm taskListForm, HttpServletRequest request) {
-	
+
 	TaskListConditionForm taskListConditionForm = new TaskListConditionForm();
 	String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID);
 	taskListConditionForm.setSessionMapID(sessionMapID);
@@ -123,7 +109,6 @@
 	return "pages/authoring/parts/addcondition";
     }
 
-    
     /**
      * Display edit page for existed taskList item.
      *
@@ -133,7 +118,8 @@
      * @return
      */
     @RequestMapping("/editCondition")
-    public String editCondition(@ModelAttribute TaskListConditionForm taskListConditionForm, HttpServletRequest request) {
+    public String editCondition(@ModelAttribute TaskListConditionForm taskListConditionForm,
+	    HttpServletRequest request) {
 
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);
@@ -167,8 +153,9 @@
      * @return
      * @throws ServletException
      */
-    @RequestMapping("/saveOrUpdateCondition")
-    public String saveOrUpdateCondition(@ModelAttribute TaskListConditionForm taskListConditionForm,  Errors errors, HttpServletRequest request) {
+    @RequestMapping(path = "/saveOrUpdateCondition", method = RequestMethod.POST)
+    public String saveOrUpdateCondition(@ModelAttribute TaskListConditionForm taskListConditionForm, Errors errors,
+	    HttpServletRequest request) {
 
 	validateTaskListCondition(taskListConditionForm, errors, request);
 	if (errors.hasErrors()) {
@@ -185,15 +172,14 @@
 		populateFormWithPossibleItems(taskListConditionForm, request);
 		return "pages/authoring/parts/addcondition";
 	    }
-		
+
 	}
 	// set session map ID so that itemlist.jsp can get sessionMAP
 	request.setAttribute(TaskListConstants.ATTR_SESSION_MAP_ID, taskListConditionForm.getSessionMapID());
 	// return null to close this window
 	return "pages/authoring/parts/conditionlist";
     }
 
-
     /**
      * Remove taskList item from HttpSession list and update page display. As authoring rule, all persist only happen
      * when user submit whole page. So this remove is just impact HttpSession values.
@@ -204,7 +190,8 @@
      * @return
      */
     @RequestMapping("/removeCondition")
-    public String removeCondition(@ModelAttribute TaskListConditionForm taskListConditionForm, HttpServletRequest request) {
+    public String removeCondition(@ModelAttribute TaskListConditionForm taskListConditionForm,
+	    HttpServletRequest request) {
 
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);
@@ -355,8 +342,8 @@
      * @param form
      * @param request
      */
-    private void populateConditionToForm(int sequenceId, TaskListCondition condition, TaskListConditionForm taskListConditionForm,
-	    HttpServletRequest request) {
+    private void populateConditionToForm(int sequenceId, TaskListCondition condition,
+	    TaskListConditionForm taskListConditionForm, HttpServletRequest request) {
 	if (sequenceId >= 0) {
 	    taskListConditionForm.setSequenceId(new Integer(sequenceId).toString());
 	}
@@ -379,7 +366,8 @@
      * @param form
      * @param request
      */
-    private void populateFormWithPossibleItems(TaskListConditionForm taskListConditionForm, HttpServletRequest request) {
+    private void populateFormWithPossibleItems(TaskListConditionForm taskListConditionForm,
+	    HttpServletRequest request) {
 
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);
@@ -389,13 +377,13 @@
 	SortedSet<TaskListItem> itemList = getTaskListItemList(sessionMap);
 
 	// Initialise the LabelValueBeans in the possibleOptions array.
-	Map<String, String> possibleItems = new HashMap<String, String>(itemList.size());
+	Map<String, String> possibleItems = new HashMap<>(itemList.size());
 
 	for (TaskListItem item : itemList) {
 	    possibleItems.put(String.valueOf(item.getSequenceId()), item.getTitle());
 	}
 	taskListConditionForm.setPossibleItems(possibleItems);
-	
+
     }
 
     /**
@@ -457,8 +445,8 @@
      * @param conditionForm
      * @return
      */
-    private void validateTaskListCondition(TaskListConditionForm taskListConditionForm, Errors errors, HttpServletRequest request) {
-	
+    private void validateTaskListCondition(TaskListConditionForm taskListConditionForm, Errors errors,
+	    HttpServletRequest request) {
 
 	String formConditionName = taskListConditionForm.getName();
 	if (StringUtils.isBlank(formConditionName)) {
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java
===================================================================
diff -u -rf6ce54cbdcb162abd293ff196f9c5961cedcba6f -r74467b8916b85a9d0376e4c2d8f7deaf4511450c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java	(.../LearningController.java)	(revision f6ce54cbdcb162abd293ff196f9c5961cedcba6f)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java	(.../LearningController.java)	(revision 74467b8916b85a9d0376e4c2d8f7deaf4511450c)
@@ -1,4 +1,4 @@
-/****************************************************************
+/* ***************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
@@ -37,7 +37,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.upload.FormFile;
+
 import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -72,6 +72,7 @@
 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.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -428,7 +429,8 @@
      * @param response
      * @return
      */
-    @RequestMapping("/saveNewTask")
+
+    @RequestMapping(path = "/saveNewTask", method = RequestMethod.POST)
     public String saveNewTask(@ModelAttribute TaskListItemForm taskListItemForm, Errors errors,
 	    HttpServletRequest request) {
 	// get back SessionMap
@@ -482,7 +484,7 @@
      * @param response
      * @return
      */
-    @RequestMapping("/addNewComment")
+    @RequestMapping(path = "/addNewComment", method = RequestMethod.POST)
     public String addNewComment(@ModelAttribute TaskListItemForm taskListItemForm, HttpServletRequest request) {
 
 	String mode = request.getParameter(AttributeNames.ATTR_MODE);
@@ -629,7 +631,7 @@
      * @param response
      * @return
      */
-    @RequestMapping("/submitReflection")
+    @RequestMapping(path = "/submitReflection", method = RequestMethod.POST)
     public String submitReflection(@ModelAttribute ReflectionForm reflectionForm, Errors errors,
 	    HttpServletRequest request, HttpServletResponse response) {
 
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/MonitoringController.java
===================================================================
diff -u -re4625a3ec2ff39bfe424a857788a54497ff64b7a -r74467b8916b85a9d0376e4c2d8f7deaf4511450c
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision e4625a3ec2ff39bfe424a857788a54497ff64b7a)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 74467b8916b85a9d0376e4c2d8f7deaf4511450c)
@@ -34,7 +34,6 @@
 import java.util.Set;
 import java.util.TimeZone;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -133,7 +132,7 @@
 
     @RequestMapping("/itemSummary")
     public String itemSummary(HttpServletRequest request) {
-	
+
 	String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(sessionMapID);
@@ -402,7 +401,7 @@
 	out.write(userUid.toString());
 	out.flush();
 	out.close();
-	return "redirect:/monitoring/summary.do";
+	return "pages/monitoring/monitoring";
     }
 
     /**
Fisheye: Tag 74467b8916b85a9d0376e4c2d8f7deaf4511450c refers to a dead (removed) revision in file `lams_tool_task/web/WEB-INF/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -rcad516bd852b193b61c821c5177cecacf3e5d016 -r74467b8916b85a9d0376e4c2d8f7deaf4511450c
--- lams_tool_task/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision cad516bd852b193b61c821c5177cecacf3e5d016)
+++ lams_tool_task/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 74467b8916b85a9d0376e4c2d8f7deaf4511450c)
@@ -54,9 +54,8 @@
 </div>
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowAnonymousVariableName}" 
-		styleId="${allowAnonymousVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowAnonymousVariableName}" 
+		id="${allowAnonymousVariableName}"/>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_task/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -rcad516bd852b193b61c821c5177cecacf3e5d016 -r74467b8916b85a9d0376e4c2d8f7deaf4511450c
--- lams_tool_task/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision cad516bd852b193b61c821c5177cecacf3e5d016)
+++ lams_tool_task/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 74467b8916b85a9d0376e4c2d8f7deaf4511450c)
@@ -86,7 +86,7 @@
 <!-- begin text search form content -->
 	
 <c:if test="${wrapInFormTag}">
-	<form action="${action}" id="${formID}" name="${formID}">
+	<form:form action="${action}" id="${formID}" name="${formID}">
 </c:if>
 		<form:hidden path="sessionMapID" />
 		<h4><fmt:message key="${headingLabelKey}" /></h4>
@@ -131,6 +131,6 @@
 		<a href="#" onclick="location.href='${cancelAction}'" class="button space-left"><fmt:message key="${cancelButtonLabelKey}" />
 		</a>
 	</lams:ImgButtonWrapper>
-	</form>
+	</form:form>
 </c:if>
 <!-- end text search form content -->
\ No newline at end of file
Fisheye: Tag 74467b8916b85a9d0376e4c2d8f7deaf4511450c refers to a dead (removed) revision in file `lams_tool_task/web/WEB-INF/tlds/struts/struts-bean-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74467b8916b85a9d0376e4c2d8f7deaf4511450c refers to a dead (removed) revision in file `lams_tool_task/web/WEB-INF/tlds/struts/struts-bean.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74467b8916b85a9d0376e4c2d8f7deaf4511450c refers to a dead (removed) revision in file `lams_tool_task/web/WEB-INF/tlds/struts/struts-html-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74467b8916b85a9d0376e4c2d8f7deaf4511450c refers to a dead (removed) revision in file `lams_tool_task/web/WEB-INF/tlds/struts/struts-html.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74467b8916b85a9d0376e4c2d8f7deaf4511450c refers to a dead (removed) revision in file `lams_tool_task/web/WEB-INF/tlds/struts/struts-logic-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74467b8916b85a9d0376e4c2d8f7deaf4511450c refers to a dead (removed) revision in file `lams_tool_task/web/WEB-INF/tlds/struts/struts-logic.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74467b8916b85a9d0376e4c2d8f7deaf4511450c refers to a dead (removed) revision in file `lams_tool_task/web/WEB-INF/tlds/struts/struts-nested.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74467b8916b85a9d0376e4c2d8f7deaf4511450c refers to a dead (removed) revision in file `lams_tool_task/web/WEB-INF/tlds/struts/struts-tiles-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 74467b8916b85a9d0376e4c2d8f7deaf4511450c refers to a dead (removed) revision in file `lams_tool_task/web/WEB-INF/tlds/struts/struts-tiles.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/web/WEB-INF/web.xml
===================================================================
diff -u -rb9f506afc78a6f28e20a87ef15915076fd9d839f -r74467b8916b85a9d0376e4c2d8f7deaf4511450c
--- lams_tool_task/web/WEB-INF/web.xml	(.../web.xml)	(revision b9f506afc78a6f28e20a87ef15915076fd9d839f)
+++ lams_tool_task/web/WEB-INF/web.xml	(.../web.xml)	(revision 74467b8916b85a9d0376e4c2d8f7deaf4511450c)
@@ -124,44 +124,7 @@
 
 
 	<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_task/web/common/messages.jsp
===================================================================
diff -u -rbfb35f4f0e90063d8ea06eea71a7f6768ee0f1dc -r74467b8916b85a9d0376e4c2d8f7deaf4511450c
--- lams_tool_task/web/common/messages.jsp	(.../messages.jsp)	(revision bfb35f4f0e90063d8ea06eea71a7f6768ee0f1dc)
+++ lams_tool_task/web/common/messages.jsp	(.../messages.jsp)	(revision 74467b8916b85a9d0376e4c2d8f7deaf4511450c)
@@ -1,8 +1,12 @@
 <%-- Error Messages --%>
+<form:errors path="*" />
+
+<%-- Success Messages -
 <logic:messagesPresent>
 	<lams:Alert id="error" type="danger" close="false">
 	        <html:messages id="error">
 	            <c:out value="${error}" escapeXml="false"/><br/>
 	        </html:messages>
 	</lams:Alert>
 </logic:messagesPresent>
+--%>
\ No newline at end of file
Index: lams_tool_task/web/common/monitorheader.jsp
===================================================================
diff -u -r83ca314c18ea866bb79570b6e7da25eb8729b3b4 -r74467b8916b85a9d0376e4c2d8f7deaf4511450c
--- lams_tool_task/web/common/monitorheader.jsp	(.../monitorheader.jsp)	(revision 83ca314c18ea866bb79570b6e7da25eb8729b3b4)
+++ lams_tool_task/web/common/monitorheader.jsp	(.../monitorheader.jsp)	(revision 74467b8916b85a9d0376e4c2d8f7deaf4511450c)
@@ -4,7 +4,7 @@
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
  <!-- ********************  CSS ********************** -->
-<link href="<html:rewrite page='/includes/css/taskList.css'/>" rel="stylesheet" type="text/css">
+<link href="<lams:WebAppURL/>includes/css/taskList.css" rel="stylesheet" type="text/css">
 <lams:css/>
 <link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
Index: lams_tool_task/web/pages/learning/parts/addtask.jsp
===================================================================
diff -u -re4625a3ec2ff39bfe424a857788a54497ff64b7a -r74467b8916b85a9d0376e4c2d8f7deaf4511450c
--- lams_tool_task/web/pages/learning/parts/addtask.jsp	(.../addtask.jsp)	(revision e4625a3ec2ff39bfe424a857788a54497ff64b7a)
+++ lams_tool_task/web/pages/learning/parts/addtask.jsp	(.../addtask.jsp)	(revision 74467b8916b85a9d0376e4c2d8f7deaf4511450c)
@@ -28,7 +28,7 @@
 <body>
 
 
-	<form:form action="/learning/saveNewTask" modelAttribute="taskListItemForm" method="post" id="taskListItemForm">
+	<form:form action="saveNewTask.do" modelAttribute="taskListItemForm" method="post" id="taskListItemForm">
 		<form:hidden path="mode" />
 		<form:hidden path="sessionMapID" />
 
@@ -41,7 +41,7 @@
 			<label for="taskTitle">
 			<fmt:message key="label.authoring.basic.resource.title.input" />
 			</label>
-			<input id="taskTitle" name="title" cssClass="form-control" tabindex="1" />
+			<form:input id="taskTitle" path="title" cssClass="form-control" tabindex="1" />
 		</div>
 		<div class="form-group">
 			<label for="description"><fmt:message key="label.learning.comment.or.instruction" /></label>
Index: lams_tool_task/web/pages/learning/parts/itemdetails.jsp
===================================================================
diff -u -re4625a3ec2ff39bfe424a857788a54497ff64b7a -r74467b8916b85a9d0376e4c2d8f7deaf4511450c
--- lams_tool_task/web/pages/learning/parts/itemdetails.jsp	(.../itemdetails.jsp)	(revision e4625a3ec2ff39bfe424a857788a54497ff64b7a)
+++ lams_tool_task/web/pages/learning/parts/itemdetails.jsp	(.../itemdetails.jsp)	(revision 74467b8916b85a9d0376e4c2d8f7deaf4511450c)
@@ -6,7 +6,7 @@
 			<hr class="msg-hr">
 			<!-- Comments Part -->
 			<c:if test="${item.commentsAllowed}">
-				<form:form action="/learning/addNewComment.do?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${item.uid}"
+				<form:form action="addNewComment.do?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${item.uid}"
 					modelAttribute="taskListItemForm" method="post" enctype="multipart/form-data" onsubmit="disableButtons()">
 
 					<%@ include file="commentlist.jsp"%>
@@ -15,7 +15,7 @@
 
 						<div class="form-group voffset5">
 							<label for="comment"><fmt:message key="label.preview.add.comment" /></label>
-							<textarea name="comment" rows="2" id="comment" cssClass="form-control" index="${item.uid}"></textarea>
+							<textarea name="comment" rows="2" id="comment" class="form-control" index="${item.uid}"></textarea>
 							<c:if test="${(mode != 'teacher') && !itemDTO.commentRequirementsMet}">
 								<div class="help-block">
 									<fmt:message key="label.learning.info.add.comment.required" />
@@ -33,7 +33,7 @@
 			<!-- Uploaded Attachments -->
 			<c:if test="${item.filesAllowed}">
 				<hr class="msg-hr">				
-				<form:form action="/learning/uploadFile.do?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${item.uid}"
+				<form:form action="uploadFile.do?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${item.uid}"
 					modelAttribute="taskListItemForm" method="post" enctype="multipart/form-data" onsubmit="return validateFiles();">
 					<c:choose>
 						<c:when test="${(mode != 'teacher') && !itemDTO.attachmentRequirementsMet}">
Index: lams_tool_task/web/pages/learning/parts/notebook.jsp
===================================================================
diff -u -re4625a3ec2ff39bfe424a857788a54497ff64b7a -r74467b8916b85a9d0376e4c2d8f7deaf4511450c
--- lams_tool_task/web/pages/learning/parts/notebook.jsp	(.../notebook.jsp)	(revision e4625a3ec2ff39bfe424a857788a54497ff64b7a)
+++ lams_tool_task/web/pages/learning/parts/notebook.jsp	(.../notebook.jsp)	(revision 74467b8916b85a9d0376e4c2d8f7deaf4511450c)
@@ -18,7 +18,7 @@
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-	<form:form action="/learning/submitReflection" modelAttribute="reflectionForm" method="post" onsubmit="disableFinishButton();" id="messageForm">
+	<form:form action="submitReflection.do" modelAttribute="reflectionForm" method="post" onsubmit="disableFinishButton();" id="messageForm">
 		<form:hidden path="userID" />
 		<form:hidden path="sessionMapID" />
 
Index: lams_tool_task/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -re4625a3ec2ff39bfe424a857788a54497ff64b7a -r74467b8916b85a9d0376e4c2d8f7deaf4511450c
--- lams_tool_task/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision e4625a3ec2ff39bfe424a857788a54497ff64b7a)
+++ lams_tool_task/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 74467b8916b85a9d0376e4c2d8f7deaf4511450c)
@@ -30,7 +30,7 @@
 	</tr>
 </table>
 
-<c:url  var="authoringUrl" value="/definelater.do">
+<c:url  var="authoringUrl" value="/authoring/definelater.do">
 	<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 	<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 </c:url>
Index: lams_tool_task/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r412fe7a30d27bd7402ae872029af8dd655d4a638 -r74467b8916b85a9d0376e4c2d8f7deaf4511450c
--- lams_tool_task/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 412fe7a30d27bd7402ae872029af8dd655d4a638)
+++ lams_tool_task/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 74467b8916b85a9d0376e4c2d8f7deaf4511450c)
@@ -65,6 +65,7 @@
 	<c:set var="title"><fmt:message key="activity.title" /></c:set>
 	<lams:Page title="${title}" type="navbar">
 	
+	
 		<lams:Tabs title="${title}" control="true" helpToolSignature="<%= TaskListConstants.TOOL_SIGNATURE %>" helpModule="monitoring">
 			<lams:Tab id="1" key="monitoring.tab.summary" />
 			<lams:Tab id="2" key="monitoring.tab.edit.activity" />			
Index: lams_tool_vote/.classpath
===================================================================
diff -u -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 -r74467b8916b85a9d0376e4c2d8f7deaf4511450c
--- lams_tool_vote/.classpath	(.../.classpath)	(revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6)
+++ lams_tool_vote/.classpath	(.../.classpath)	(revision 74467b8916b85a9d0376e4c2d8f7deaf4511450c)
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
-	<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/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
-		<attributes>
-			<attribute name="javadoc_location" value="http://tomcat.apache.org/tomcat-8.0-doc/servletapi/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_contentrepository"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.2.Final.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
-		<attributes>
-			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-lang/javadocs/api-2.6/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/jackson-core-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/jackson-databind-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/noStruts"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/java"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/lams_contentrepository"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
+	<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/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
+		<attributes>
+			<attribute name="javadoc_location" value="http://tomcat.apache.org/tomcat-8.0-doc/servletapi/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.2.Final.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
+		<attributes>
+			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-lang/javadocs/api-2.6/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/jackson-core-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/jackson-databind-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/noStruts"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>