Index: lams_tool_leader/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u
--- lams_tool_leader/web/WEB-INF/spring-servlet.xml	(revision 0)
+++ lams_tool_leader/web/WEB-INF/spring-servlet.xml	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+           				   http://www.springframework.org/schema/context 
+   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
+	<!-- Spring MVC -->
+	<context:component-scan base-package="org.lamsfoundation.lams.tool.survey.web.controller" />
+	
+	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+		<property name="prefix" value="/" />
+		<property name="suffix" value=".jsp" />
+	</bean>
+</beans>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/web.xml
===================================================================
diff -u -rad8707a3e0b0501d651993f3da9dd0ba975f39fc -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_leader/web/WEB-INF/web.xml	(.../web.xml)	(revision ad8707a3e0b0501d651993f3da9dd0ba975f39fc)
+++ lams_tool_leader/web/WEB-INF/web.xml	(.../web.xml)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -65,24 +65,8 @@
 	</listener>
 
 	<servlet>
-		<servlet-name>action</servlet-name>
-		<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-		<init-param>
-			<param-name>config</param-name>
-			<param-value>/WEB-INF/struts-config.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>debug</param-name>
-			<param-value>999</param-value>
-		</init-param>
-		<init-param>
-			<param-name>detail</param-name>
-			<param-value>2</param-value>
-		</init-param>
-		<init-param>
-			<param-name>validate</param-name>
-			<param-value>true</param-value>
-		</init-param>
+		<servlet-name>spring</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlett</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 
@@ -103,7 +87,7 @@
 	</servlet>
 
 	<servlet-mapping>
-		<servlet-name>action</servlet-name>
+		<servlet-name>spring</servlet-name>
 		<url-pattern>*.do</url-pattern>
 	</servlet-mapping>
 
Index: lams_tool_leader/web/common/messages.jsp
===================================================================
diff -u -r10fc9107a51311d5661be69bde813ce5afdbdffd -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_leader/web/common/messages.jsp	(.../messages.jsp)	(revision 10fc9107a51311d5661be69bde813ce5afdbdffd)
+++ lams_tool_leader/web/common/messages.jsp	(.../messages.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -1,8 +1,10 @@
 <%-- Error 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>
+
+ <c:set var="errorKey" value="GLOBAL" /> 
+ <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+     <lams:Alert id="error" type="danger" close="false"> 
+         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+             <c:out value="${error}" /> 
+         </c:forEach> 
+     </lams:Alert> 
+</c:if>
Index: lams_tool_leader/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_leader/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0)
+++ lams_tool_leader/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -10,67 +10,58 @@
 	<c:set var="tool">
 		<lams:WebAppURL />
 	</c:set>
-	
 	<lams:head>
 		<title>
-		<fmt:message key="activity.title" />
-	</title>
+			<fmt:message key="activity.title" />
+		</title>
 	<lams:headItems />
 	<c:set var="lams">
-	<lams:LAMSURL />
+		<lams:LAMSURL />
 	</c:set>
 	<c:set var="tool">
 		<lams:WebAppURL />
 	</c:set>
-	
 	<lams:headItems/>
-	<script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
+		<script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
 	</lams:head>
 	<body class="stripes" onload="init();">
-			<form:form action="authoring/updateContent.do"  modelAttribute="authoringForm" id="authoringForm" method="post" >
-
-	<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
-
-	<c:set var="title"><fmt:message key="activity.title" /></c:set>
-	<lams:Page title="${title}" type="navbar">		
-	
-		<lams:Tabs control="true" title="${title}" helpToolSignature="<%= LeaderselectionConstants.TOOL_SIGNATURE %>" helpModule="authoring">
-			<lams:Tab id="1" key="button.basic" />
-		</lams:Tabs>   
-		
-		<form:hidden path="currentTab" id="currentTab" />
-		<form:hidden path="sessionMapID" />
-		
-		<lams:TabBodyArea>
-			<div id="message" style="text-align: center;">
-				<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>			
-			</div>
-               
-			<%-- Page tabs --%>
-            <lams:TabBodys>
-				<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-            </lams:TabBodys>
-                
-			<lams:AuthoringButton formID="authoringForm"
-				clearSessionActionUrl="/clearsession.do" toolSignature="lalead11"
-				cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
-				toolContentID="${sessionMap.toolContentID}"
-				accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode=='teacher'}"
-				customiseSessionID="${sessionMap.sessionID}" 
-				contentFolderID="${sessionMap.contentFolderID}" />
-		</lams:TabBodyArea>
-	</lams:Page>
-	
-</form:form>
-
-<div id="footer"></div>
-
+		<form:form action="authoring/updateContent.do"  modelAttribute="authoringForm" id="authoringForm" method="post" >
+			<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
+			<c:set var="title">
+				<fmt:message key="activity.title" />
+			</c:set>
+			<lams:Page title="${title}" type="navbar">		
+				<lams:Tabs control="true" title="${title}" helpToolSignature="<%= LeaderselectionConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+					<lams:Tab id="1" key="button.basic" />
+				</lams:Tabs>   
+				<form:hidden path="currentTab" id="currentTab" />
+				<form:hidden path="sessionMapID" />
+				<lams:TabBodyArea>
+					<div id="message" style="text-align: center;">
+						 <c:set var="errorKey" value="GLOBAL" /> 
+						 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+						     <lams:Alert id="error" type="danger" close="false"> 
+						         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+						             <c:out value="${error}" /> 
+						         </c:forEach> 
+						     </lams:Alert> 
+						</c:if>		
+					</div>
+					<%-- Page tabs --%>
+		            <lams:TabBodys>
+						<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
+	           		</lams:TabBodys>
+					<lams:AuthoringButton formID="authoringForm"
+						clearSessionActionUrl="/clearsession.do" toolSignature="lalead11"
+						cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
+						toolContentID="${sessionMap.toolContentID}"
+						accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode=='teacher'}"
+						customiseSessionID="${sessionMap.sessionID}" 
+						contentFolderID="${sessionMap.contentFolderID}" />
+					</lams:TabBodyArea>
+				</lams:Page>
+			</form:form>
+		<div id="footer"></div>
 	</body>
 </lams:html>
 
Index: lams_tool_leader/web/pages/authoring/basic.jsp
===================================================================
diff -u -ra6f139bf7f2aeceb96792867e30e3de3959bd1f0 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_leader/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a6f139bf7f2aeceb96792867e30e3de3959bd1f0)
+++ lams_tool_leader/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -1,15 +1,14 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
-<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
+<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
+<c:set var="sessionMapID" value="${authoringForm.sessionMapID}" />
 
 <!-- ========== Basic Tab ========== -->
 <div class="form-group">
     <label for="title"><fmt:message key="label.authoring.basic.title"/></label>
-    <html:text property="title" styleClass="form-control"></html:text>
+    <form:textarea path="title" cssClass="form-control"/>
 </div>
 <div class="form-group">
     <label for="instructions"><fmt:message key="label.authoring.basic.instructions" /></label>
-    <lams:CKEditor id="instructions" value="${formBean.instructions}" contentFolderID="${sessionMap.contentFolderID}"></lams:CKEditor>
+    <lams:CKEditor id="instructions" value="${authoringForm.instructions}" contentFolderID="${sessionMap.contentFolderID}"></lams:CKEditor>
 </div>
Index: lams_tool_leader/web/pages/learning/defineLater.jsp
===================================================================
diff -u -r10fc9107a51311d5661be69bde813ce5afdbdffd -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_leader/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 10fc9107a51311d5661be69bde813ce5afdbdffd)
+++ lams_tool_leader/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -1,5 +1,16 @@
+<!DOCTYPE html>
+
 <%@ include file="/common/taglibs.jsp"%>
 
+<lams:html>
+	<tiles:insert attribute="header" />
+	<body class="stripes">
+		<tiles:insert attribute="body" />
+		<div class="footer">
+		</div>					
+	</body>
+</lams:html>
+
 <c:set var="title" scope="request">
 	<fmt:message key="activity.title" />
 </c:set>
Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
diff -u -r5831c6c974ca7fef986ffd207d708a2a56bf39f1 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 5831c6c974ca7fef986ffd207d708a2a56bf39f1)
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -1,6 +1,34 @@
+<!DOCTYPE html>
+
 <%@ include file="/common/taglibs.jsp"%>
 
-<script type="text/javascript">
+<lams:html>
+	<c:set var="lams">
+		<lams:LAMSURL />
+	</c:set>
+	<c:set var="tool">
+		<lams:WebAppURL />
+	</c:set>
+	
+	<lams:head>  
+		<title>
+			<fmt:message key="activity.title" />
+		</title>
+		<lams:css/>
+		<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet" />
+		<style type="text/css">
+	    	.dialog{display: none;}
+	    	.ui-dialog-titlebar-close{display: none;}
+	    	.ui-widget-overlay{opacity:0.9;}
+	    </style>
+	
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	</lams:head>
+	
+	<body class="stripes">
+		<script type="text/javascript">
 	$(window).load(function(){
 		$("#leaderSelectionDialog").modal({
 			show: ${isSelectLeaderActive},
@@ -75,107 +103,112 @@
 			}
 		};
 	</c:if>
-</script>
+		</script>
 
-<lams:Page type="learner" title="${content.title}">
-
-	<c:choose>
-		<c:when test="${not empty groupLeader}">
-			<lams:LeaderDisplay username="${groupLeader.firstName} ${groupLeader.lastName}" userId="${groupLeader.userId}"/>
-		</c:when>
-		<c:otherwise>
-			<lams:Alert type="warning" id="no-leader" close="false">
-                <h4>
-                    <fmt:message key="label.no.leader.yet.title" />
-                </h4>
-                <p>
-				    <fmt:message key="label.no.leader.yet.body" />
-                </p>
-			</lams:Alert>
-		</c:otherwise>
-	</c:choose>
-
-	<div>
-		<fmt:message key="label.users.from.group" />
-	</div>
-
-	<div id="usersInGroup">
-		<c:forEach var="user" items="${groupUsers}" varStatus="status">
-			<div id="user-${user.userId}" class="voffset5">
-				<lams:Portrait userId="${user.userId}"/>
-				<span class="portrait-sm-lineheight">
-					<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
-				</span>
+		<lams:Page type="learner" title="${content.title}">
+			<c:choose>
+				<c:when test="${not empty groupLeader}">
+					<lams:LeaderDisplay username="${groupLeader.firstName} ${groupLeader.lastName}" userId="${groupLeader.userId}"/>
+				</c:when>
+				<c:otherwise>
+					<lams:Alert type="warning" id="no-leader" close="false">
+		                <h4>
+		                    <fmt:message key="label.no.leader.yet.title" />
+		                </h4>
+		                <p>
+						    <fmt:message key="label.no.leader.yet.body" />
+		                </p>
+					</lams:Alert>
+				</c:otherwise>
+			</c:choose>
+		
+			<div>
+				<fmt:message key="label.users.from.group" />
 			</div>
-		</c:forEach>
-	</div>
-
-	<div id="actionbuttons" class="voffset20">
-		<button type="button" onclick="location.reload();" class="btn btn-sm btn-default">
-			<i class="fa fa-refresh"></i> 
-			<span class="hidden-xs">
-				<fmt:message key="label.refresh" />
-			</span>
-		</button>
 		
-		<c:if test="${!isSelectLeaderActive}">
-			<html:link href="#nogo" styleClass="btn btn-primary pull-right na" styleId="finishButton" onclick="finishActivity()">
-				<span class="nextActivity"> <c:choose>
-						<c:when test="${activityPosition.last}">
-							<fmt:message key="button.submit" />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key="button.finish" />
-						</c:otherwise>
-					</c:choose>
-				</span>
-			</html:link>
-		</c:if>
-	</div>
-	
-</lams:Page>
-
-<div id="leaderSelectionDialog" class="modal fade">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true">&times;</span>
+			<div id="usersInGroup">
+				<c:forEach var="user" items="${groupUsers}" varStatus="status">
+					<div id="user-${user.userId}" class="voffset5">
+						<lams:Portrait userId="${user.userId}"/>
+						<span class="portrait-sm-lineheight">
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		
+			<div id="actionbuttons" class="voffset20">
+				<button type="button" onclick="location.reload();" class="btn btn-sm btn-default">
+					<i class="fa fa-refresh"></i> 
+					<span class="hidden-xs">
+						<fmt:message key="label.refresh" />
+					</span>
 				</button>
-				<div class="modal-title" id="exampleModalLabel">${content.title}</div>
+				
+				<c:if test="${!isSelectLeaderActive}">
+					<a href="#nogo" class="btn btn-primary pull-right na" id="finishButton" onclick="finishActivity()">
+						<span class="nextActivity"> <c:choose>
+								<c:when test="${activityPosition.last}">
+									<fmt:message key="button.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.finish" />
+								</c:otherwise>
+							</c:choose>
+						</span>
+					</a>
+				</c:if>
 			</div>
-			<div class="modal-body">
-				<!-- begin -->
-				<div class="panel" id="leaderInstructions">
-					<c:out value="${content.instructions}" escapeXml="false" />
-				</div>
-				<div class="lead">
-					<fmt:message key="label.are.you.going.to.be.leader" />
-				</div>
+			
+		</lams:Page>
 
-				<div class="voffset10">
-					<fmt:message key="label.users.from.group" />
-				</div>
-
-				<div id="usersInGroup" class="voffset10">
-					<c:forEach var="user" items="${groupUsers}" varStatus="status">
-						<div id="user-${user.userId}" class="voffset2">
-							<div class="user loffset10" id="user-${user.userId}">
-								<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
-							</div>
+		<div id="leaderSelectionDialog" class="modal fade">
+			<div class="modal-dialog" role="document">
+				<div class="modal-content">
+					<div class="modal-header">
+						<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+							<span aria-hidden="true">&times;</span>
+						</button>
+						<div class="modal-title" id="exampleModalLabel">${content.title}</div>
+					</div>
+					<div class="modal-body">
+						<!-- begin -->
+						<div class="panel" id="leaderInstructions">
+							<c:out value="${content.instructions}" escapeXml="false" />
 						</div>
-					</c:forEach>
+						<div class="lead">
+							<fmt:message key="label.are.you.going.to.be.leader" />
+						</div>
+	
+						<div class="voffset10">
+							<fmt:message key="label.users.from.group" />
+						</div>
+	
+						<div id="usersInGroup" class="voffset10">
+							<c:forEach var="user" items="${groupUsers}" varStatus="status">
+								<div id="user-${user.userId}" class="voffset2">
+									<div class="user loffset10" id="user-${user.userId}">
+										<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+									</div>
+								</div>
+							</c:forEach>
+						</div>
+					</div>
+
+					<div class="modal-footer">
+						<button data-dismiss="modal" class="btn btn-sm btn-default">
+							<fmt:message key="label.no" />
+						</button>
+						<button onclick="leaderSelection();" class="btn btn-sm btn-primary">
+							<fmt:message key="label.yes.become.leader" />
+						</button>
+					</div>
 				</div>
 			</div>
-
-			<div class="modal-footer">
-				<button data-dismiss="modal" class="btn btn-sm btn-default">
-					<fmt:message key="label.no" />
-				</button>
-				<button onclick="leaderSelection();" class="btn btn-sm btn-primary">
-					<fmt:message key="label.yes.become.leader" />
-				</button>
-			</div>
 		</div>
-	</div>
-</div>
+
+		<div class="footer">
+		</div>					
+	</body>
+</lams:html>
+
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java
===================================================================
diff -u -re1f494e2cf97728e4ae12e61620608cdc6c19ae3 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java	(.../AuthoringNotebookConditionController.java)	(revision e1f494e2cf97728e4ae12e61620608cdc6c19ae3)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java	(.../AuthoringNotebookConditionController.java)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -44,7 +44,8 @@
 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;
 
@@ -75,7 +76,8 @@
      * @return
      */
     @RequestMapping("newConditionInit")
-    private String newConditionInit(@ModelAttribute NotebookConditionForm notebookConditionForm, HttpServletRequest request) {
+    private String newConditionInit(@ModelAttribute NotebookConditionForm notebookConditionForm,
+	    HttpServletRequest request) {
 	String sessionMapID = WebUtil.readStrParam(request, NotebookConstants.ATTR_SESSION_MAP_ID);
 	notebookConditionForm.setSessionMapID(sessionMapID);
 	notebookConditionForm.setOrderId(-1);
@@ -125,21 +127,24 @@
      */
     @RequestMapping("/saveOrUpdateCondition")
     private String saveOrUpdateCondition(
-	    @ModelAttribute("notebookConditionForm") NotebookConditionForm notebookConditionForm, Errors errors,
+	    @ModelAttribute("notebookConditionForm") NotebookConditionForm notebookConditionForm,
 	    HttpServletRequest request) {
 
-	validateNotebookCondition(notebookConditionForm, errors, request);
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+	validateNotebookCondition(notebookConditionForm, errorMap, request);
 
-	if (errors.hasErrors()) {
+	if (!errorMap.isEmpty()) {
+	    request.setAttribute("errorMap", errorMap);
 	    return "pages/authoring/addCondition";
 	}
 
 	try {
 	    extractFormToNotebookCondition(request, notebookConditionForm);
 	} catch (Exception e) {
 	    // any upload exception will display as normal error message rather then throw exception directly
-	    errors.reject(null, null, messageService.getMessage(NotebookConstants.ERROR_MSG_CONDITION, e.getMessage()));
-	    if (errors.hasErrors()) {
+	    errorMap.add("GLOBAL", messageService.getMessage(NotebookConstants.ERROR_MSG_CONDITION, e.getMessage()));
+	    if (!errorMap.isEmpty()) {
+		request.setAttribute("errorMap", errorMap);
 		return "pages/authoring/addCondition";
 	    }
 	}
@@ -301,8 +306,8 @@
      * @param notebookConditionForm
      * @param request
      */
-    private void populateConditionToForm(int orderId, NotebookCondition condition, NotebookConditionForm notebookConditionForm,
-	    HttpServletRequest request) {
+    private void populateConditionToForm(int orderId, NotebookCondition condition,
+	    NotebookConditionForm notebookConditionForm, HttpServletRequest request) {
 	notebookConditionForm.populateForm(condition);
 	if (orderId >= 0) {
 	    notebookConditionForm.setOrderId(orderId + 1);
@@ -354,12 +359,12 @@
      * @param notebookConditionForm
      * @return
      */
-    private void validateNotebookCondition( NotebookConditionForm notebookConditionForm, Errors errors,
-	    HttpServletRequest request) {
+    private void validateNotebookCondition(NotebookConditionForm notebookConditionForm,
+	    MultiValueMap<String, String> errorMap, HttpServletRequest request) {
 
 	String formConditionName = notebookConditionForm.getDisplayName();
 	if (StringUtils.isBlank(formConditionName)) {
-	    errors.reject(null, null, messageService.getMessage(NotebookConstants.ERROR_MSG_NAME_BLANK));
+	    errorMap.add("GLOBAL", messageService.getMessage(NotebookConstants.ERROR_MSG_NAME_BLANK));
 	} else {
 
 	    Integer formConditionSequenceId = notebookConditionForm.getOrderId();
@@ -370,7 +375,7 @@
 	    for (NotebookCondition condition : conditionList) {
 		if (formConditionName.equals(condition.getName())
 			&& !formConditionSequenceId.equals(new Integer(condition.getOrderId() - 1).toString())) {
-		    errors.reject(null, null, messageService.getMessage(NotebookConstants.ERROR_MSG_NAME_DUPLICATED));
+		    errorMap.add("GLOBAL", messageService.getMessage(NotebookConstants.ERROR_MSG_NAME_DUPLICATED));
 		    break;
 		}
 	    }
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r6dfff2871fa49eb6d8dcc49ede08552a8d73e8b3 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 6dfff2871fa49eb6d8dcc49ede08552a8d73e8b3)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -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"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -123,11 +122,11 @@
     }  				
 </script>	
 <div id="saveCancelButtons" >
-		<html:link href="javascript:doSubmit_Form_Only();" styleId="saveButton" property="submit" styleClass="btn btn-primary pull-right">
+		<a href="javascript:doSubmit_Form_Only();" id="saveButton" property="submit" class="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:;" property="cancel" styleId="cancelButton" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
+		</a>
+		<a href="javascript:;" property="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
 			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
+		</a>
 </div>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r540199b8a30f643c2ca5960c007e5bef74acd397 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 540199b8a30f643c2ca5960c007e5bef74acd397)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -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_notebook/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r5bdde98b1e94d44d239a50549987293714a5bef1 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 5bdde98b1e94d44d239a50549987293714a5bef1)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -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>
@@ -284,42 +283,42 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);" 
-							styleClass="form-control form-control-inline">
-						<html:option value="0">
+					<select property="${formContentPrefix}minimumRates" idd="minimum-rates" onmouseup="validateRatingLimits(true);" 
+							class="form-control form-control-inline">
+						<option value="0">
 							<fmt:message key="${noMinimumLabel}" />
-						</html:option>
-						<html:option value="1">1</html:option>
-						<html:option value="2">2</html:option>
-						<html:option value="3">3</html:option>
-						<html:option value="4">4</html:option>
-						<html:option value="5">5</html:option>
-						<html:option value="6">6</html:option>
-						<html:option value="7">7</html:option>
-						<html:option value="8">8</html:option>
-						<html:option value="9">9</html:option>
-						<html:option value="10">10</html:option>
-					</html:select>
+						</option>
+						<option value="1">1</option>
+						<option value="2">2</option>
+						<option value="3">3</option>
+						<option value="4">4</option>
+						<option value="5">5</option>
+						<option value="6">6</option>
+						<option value="7">7</option>
+						<option value="8">8</option>
+						<option value="9">9</option>
+						<option value="10">10</option>
+					</select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);" 
-							styleClass="form-control form-control-inline">
-						<html:option value="0">
+					<select property="${formContentPrefix}maximumRates" idd="maximum-rates" onmouseup="validateRatingLimits(false);" 
+							class="form-control form-control-inline">
+						<option value="0">
 							<fmt:message key="${noMaximumLabel}" />
-						</html:option>
-						<html:option value="1">1</html:option>
-						<html:option value="2">2</html:option>
-						<html:option value="3">3</html:option>
-						<html:option value="4">4</html:option>
-						<html:option value="5">5</html:option>
-						<html:option value="6">6</html:option>
-						<html:option value="7">7</html:option>
-						<html:option value="8">8</html:option>
-						<html:option value="9">9</html:option>
-						<html:option value="10">10</html:option>
-					</html:select>
+						</option>
+						<option value="1">1</option>
+						<option value="2">2</option>
+						<option value="3">3</option>
+						<option value="4">4</option>
+						<option value="5">5</option>
+						<option value="6">6</option>
+						<option value="7">7</option>
+						<option value="8">8</option>
+						<option value="9">9</option>
+						<option value="10">10</option>
+					</select>
 				</div>
 			</c:if>
 	
Index: lams_tool_notebook/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r500ae45f4243aa718eac7436bc903b4f137a3aa7 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_notebook/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 500ae45f4243aa718eac7436bc903b4f137a3aa7)
+++ lams_tool_notebook/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -1,8 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
@@ -42,23 +41,23 @@
 
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowCommentsVariableName}" value="1"
-		styleId="${allowCommentsVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowCommentsVariableName}" value="1"
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
 
 <div id="likedislike">
 <div class="loffset20">
-		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radio path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radio path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowAnonymousVariableName}" 
-		styleId="${allowAnonymousVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowAnonymousVariableName}" 
+		id="${allowAnonymousVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb32cbfc76a3cd150823b3696160d5fd4fa6cde84 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b32cbfc76a3cd150823b3696160d5fd4fa6cde84)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -89,7 +89,6 @@
 				</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:if test="${not empty toolForm}"> 
 				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
 				</c:if>
Index: lams_tool_notebook/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r35a96de80ddf8f88a34d7f75eaf71748db934044 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_notebook/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
+++ lams_tool_notebook/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -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_notebook/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -refa51a5d0464d96fada4e5a70f1fb86c2d726717 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision efa51a5d0464d96fada4e5a70f1fb86c2d726717)
+++ lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -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_notebook/web/common/messages.jsp
===================================================================
diff -u -r749b841adf6115016059d15ddfa58aee5b11e26d -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_notebook/web/common/messages.jsp	(.../messages.jsp)	(revision 749b841adf6115016059d15ddfa58aee5b11e26d)
+++ lams_tool_notebook/web/common/messages.jsp	(.../messages.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -1,7 +1,9 @@
 <%-- Error Messages --%>
-<c:set var="hasErrors"><form:errors path='*'/></c:set>
-<c:if test="${not empty hasErrors}">
-	<lams:Alert id="error" type="danger" close="false">
-		<form:errors path="*"/>
-	</lams:Alert>
+<c:set var="errorKey" value="GLOBAL" /> 
+<c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+    <lams:Alert id="error" type="danger" close="false"> 
+        <c:forEach var="error" items="${errorMap[errorKey]}"> 
+            <c:out value="${error}" /> 
+        </c:forEach> 
+    </lams:Alert> 
 </c:if>
\ No newline at end of file
Index: lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r749b841adf6115016059d15ddfa58aee5b11e26d -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 749b841adf6115016059d15ddfa58aee5b11e26d)
+++ lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -16,7 +16,7 @@
 <body style="width: 550px">
 	<%@ include file="/common/messages.jsp"%>
 	<h4 class="space-left" style="float:left"><fmt:message key="label.authoring.basic.instructions" /></h4>
-	<form:form action="/pedagogicalPlanner.do?dispatch=saveOrUpdatePedagogicalPlannerForm" modelAttribute="pedagogicalPlannerForm" id="pedagogicalPlannerForm" method="post">
+	<form:form action="/pedagogicalPlanner/saveOrUpdatePedagogicalPlannerForm.do" modelAttribute="pedagogicalPlannerForm" id="pedagogicalPlannerForm" method="post">
 		<form:hidden path="toolContentID" id="toolContentID" />
 		<form:hidden path="valid" i="vdalid" />
 		<form:hidden path="callID" id="callID" />
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
diff -u -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0)
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -20,7 +20,7 @@
 			CKEDITOR.instances["entryText"].focus();
 		</c:when>		
 		<c:otherwise>
-			document.learningForm.focusedInput.focus();
+			document.forms.learningForm.focusedInput.focus();
 		</c:otherwise>
 		</c:choose>
 		document.getElementById("finishButton").style.visibility = 'visible';
@@ -50,13 +50,13 @@
 			}
 		</c:when>		
 		<c:otherwise>
-			if (forceResponse =="true" && document.learningForm.focusedInput.value == "") {
+			if (forceResponse =="true" && document.forms.learningForm.focusedInput.value == "") {
 
 				retValue = confirm("<fmt:message>message.learner.blank.alertforceResponse</fmt:message>");
 				textAreaReady();
 				return retValue;
 				
-			} else if  (forceResponse =="false" && document.learningForm.focusedInput.value == "" && mode == "learner") {
+			} else if  (forceResponse =="false" && document.forms.learningForm.focusedInput.value == "" && mode == "learner") {
 	
 				if (!confirm("<fmt:message>message.learner.blank.input</fmt:message>")) {
 					// otherwise, focus on the text area
@@ -151,7 +151,7 @@
 
 			<c:if test="${mode != 'teacher'}">
 				<div class="right-buttons voffset5">
-					<button href="#nogo" class="btn btn-primary pull-right na" id="finishButton"
+					<button href="#nogo" class="btn btn-primary pull-right na" id="finishButton" type="button"
 						onclick="submitForm('finish')">
 						<c:choose>
 							<c:when test="${activityPosition.last}">
Index: lams_tool_notebook/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -re1f494e2cf97728e4ae12e61620608cdc6c19ae3 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_notebook/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision e1f494e2cf97728e4ae12e61620608cdc6c19ae3)
+++ lams_tool_notebook/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -32,7 +32,7 @@
 				<form:form action="learning/finishActivity.do" method="post" onsubmit="disableFinishButton();" modelAttribute="messageForm" id="messageForm">
 					<form:hidden path="toolSessionID" />
 		
-					<button href="#nogo" style="btn btn-primary pull-right voffset10 na" styleId="finishButton"
+					<button href="#nogo" class="btn btn-primary pull-right voffset10 na" id="finishButton" type="button"
 						onclick="submitForm('finish')">
 						<c:choose>
 							<c:when test="${activityPosition.last}">
Index: lams_tool_notebook/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r749b841adf6115016059d15ddfa58aee5b11e26d -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_notebook/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 749b841adf6115016059d15ddfa58aee5b11e26d)
+++ lams_tool_notebook/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -31,7 +31,7 @@
 	</lams:head>
 	<body class="stripes">
 		<script type="text/javascript">
-			var statisticsURL = "<c:url value='/monitoring.do'/>?dispatch=getStatistics&toolContentID=${notebookDTO.toolContentId}&reqID=";
+			var statisticsURL = "<c:url value='/monitoring/getStatistics.do?toolContentID=${notebookDTO.toolContentId}&reqID=";
 		</script>
 
 		<c:set var="title"><fmt:message key="activity.title" /></c:set>
Index: lams_tool_notebook/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r8b96d871bf93fc27f6f6d086977dc8c95d5e7f90 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 8b96d871bf93fc27f6f6d086977dc8c95d5e7f90)
+++ lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -28,7 +28,7 @@
 		lams: '${lams}',
 		submissionDeadline: '${submissionDeadline}',
 		submissionDateString: '${submissionDateString}',
-		setSubmissionDeadlineUrl: '<c:url value="/monitoring.do?dispatch=setSubmissionDeadline"/>',
+		setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline"/>',
 		toolContentID: '${param.toolContentID}',
 		messageNotification: '<fmt:message key="monitor.summary.notification" />',
 		messageRestrictionSet: '<fmt:message key="monitor.summary.date.restriction.set" />',
@@ -43,7 +43,7 @@
 			
 			jQuery("#group${sessionId}").jqGrid({
 			
-				url: "<c:url value='/monitoring.do'/>?dispatch=getUsers&toolSessionID=${sessionId}",
+				url: "<c:url value='/monitoring/getUsersdo?toolSessionID=${sessionId}'",
 				datatype: 'json',
 				jsonReader : {
 				     root: "rows",
@@ -118,7 +118,7 @@
  					}).text(comment).appendTo(subgrid); 
   					
  					$(".editable${sessionId}_" + rowId + "_t").jinplace({
- 					    url: "<c:url value='/monitoring.do'/>?dispatch=saveTeacherComment&userUid=" + userUid,
+ 					    url: "<c:url value='/monitoring/saveTeacherComment.do?userUid= + ${userUid}' />"
  					    textOnly: true,
  					    placeholder: '<fmt:message key="label.click.to.edit" />',
  					    okButton: "<fmt:message key='button.ok' />",
Index: lams_tool_survey/.classpath
===================================================================
diff -u -r9218936edd87260de73e773054cb605a336133b1 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_survey/.classpath	(.../.classpath)	(revision 9218936edd87260de73e773054cb605a336133b1)
+++ lams_tool_survey/.classpath	(.../.classpath)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -3,10 +3,9 @@
 	<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="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<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">
@@ -28,5 +27,6 @@
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/jcl-over-slf4j-1.7.7.jbossorg-1.jar"/>
 	<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>
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringConditionController.java
===================================================================
diff -u -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringConditionController.java	(.../AuthoringConditionController.java)	(revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringConditionController.java	(.../AuthoringConditionController.java)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -35,7 +35,6 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
-import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.tool.survey.SurveyConstants;
 import org.lamsfoundation.lams.tool.survey.model.SurveyCondition;
@@ -139,8 +138,6 @@
     public String saveOrUpdateCondition(@ModelAttribute("surveyConditionForm") SurveyConditionForm surveyConditionForm,
 	    HttpServletRequest request) {
 
-//	ActionErrors errors = validateSurveyCondition(conditionForm, request);
-
 	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 	validateSurveyCondition(surveyConditionForm, request, errorMap);
 	if (!errorMap.isEmpty()) {
@@ -445,7 +442,4 @@
 
     }
 
-    private ActionMessages validate(SurveyConditionForm form, HttpServletRequest request) {
-	return new ActionMessages();
-    }
 }
\ No newline at end of file
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java
===================================================================
diff -u -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -45,9 +45,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -74,7 +71,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -94,7 +90,7 @@
     @Autowired
     @Qualifier("lasurvSurveyService")
     private ISurveyService surveyService;
-    
+
     @Autowired
     @Qualifier("lasurvMessageService")
     private MessageService messageService;
@@ -308,7 +304,7 @@
 	    HttpServletRequest request) throws Exception {
 	// get instructions:
 	List<String> instructionList = getInstructionsFromRequest(request);
-	
+
 	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 	validateSurveyItem(surveyItemForm, instructionList, errorMap);
 
@@ -879,22 +875,7 @@
      * @param instructionList
      * @return
      */
-    private ActionErrors validateSurveyItem(QuestionForm itemForm, List<String> instructionList) {
-	ActionErrors errors = new ActionErrors();
-	if (StringUtils.isBlank(itemForm.getQuestion().getDescription())) {
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(SurveyConstants.ERROR_MSG_DESC_BLANK));
-	}
 
-	short type = getQuestionType(itemForm);
-	if (type != SurveyConstants.QUESTION_TYPE_TEXT_ENTRY) {
-	    if (instructionList == null || instructionList.size() < 2) {
-		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(SurveyConstants.ERROR_MSG_LESS_OPTIONS));
-	    }
-	}
-
-	return errors;
-    }
-
     /**
      * Ajax call, will add one more input line for new survey item instruction.
      *
@@ -959,15 +940,16 @@
 	return getListFromSession(sessionMap, SurveyConstants.ATTR_DELETED_CONDITION_LIST);
     }
 
-    private void validateSurveyItem(QuestionForm itemForm, List<String> instructionList, MultiValueMap<String, String> errorMap) {
+    private void validateSurveyItem(QuestionForm itemForm, List<String> instructionList,
+	    MultiValueMap<String, String> errorMap) {
 	if (StringUtils.isBlank(itemForm.getQuestion().getDescription())) {
 	    errorMap.add("GLOBAL", messageService.getMessage(SurveyConstants.ERROR_MSG_DESC_BLANK));
 	}
 
 	short type = getQuestionType(itemForm);
 	if (type != SurveyConstants.QUESTION_TYPE_TEXT_ENTRY) {
 	    if (instructionList == null || instructionList.size() < 2) {
-		 errorMap.add("GLOBAL", messageService.getMessage(SurveyConstants.ERROR_MSG_LESS_OPTIONS));
+		errorMap.add("GLOBAL", messageService.getMessage(SurveyConstants.ERROR_MSG_LESS_OPTIONS));
 	    }
 	}
     }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java
===================================================================
diff -u -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java	(.../LearningController.java)	(revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java	(.../LearningController.java)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -243,7 +243,7 @@
     }
 
     @RequestMapping("/nextQuestion")
-    private String nextQuestion(AnswerForm surveyForm, MultiValueMap<String, String> errorMap,
+    private String nextQuestion(@ModelAttribute("surveyForm") AnswerForm surveyForm, MultiValueMap<String, String> errorMap,
 	    HttpServletRequest request) {
 	Integer questionSeqID = surveyForm.getQuestionSeqID();
 	String sessionMapID = surveyForm.getSessionMapID();
@@ -286,7 +286,7 @@
     }
 
     @RequestMapping("/previousQuestion")
-    private String previousQuestion(AnswerForm surveyForm, MultiValueMap<String, String> errorMap,
+    private String previousQuestion(@ModelAttribute("surveyForm") AnswerForm surveyForm, MultiValueMap<String, String> errorMap,
 	    HttpServletRequest request) {
 	Integer questionSeqID = surveyForm.getQuestionSeqID();
 	String sessionMapID = surveyForm.getSessionMapID();
@@ -520,7 +520,7 @@
      * @return
      */
     @RequestMapping("/newReflection")
-    private String newReflection(ReflectionForm messageForm, HttpServletRequest request) {
+    private String newReflection(@ModelAttribute("messageForm") ReflectionForm messageForm, HttpServletRequest request) {
 
 	// get session value
 	String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
@@ -542,6 +542,7 @@
 	    messageForm.setEntryText(entry.getEntry());
 	}
 
+	request.setAttribute("messageForm", messageForm);
 	return "pages/learning/notebook";
     }
 
@@ -555,7 +556,7 @@
      * @return
      */
     @RequestMapping("/submitReflection")
-    private String submitReflection(ReflectionForm messageForm, HttpServletRequest request) {
+    private String submitReflection(@ModelAttribute("messageForm") ReflectionForm messageForm, HttpServletRequest request) {
 	Integer userId = messageForm.getUserID();
 
 	String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
@@ -577,8 +578,8 @@
 	    entry.setLastModified(new Date());
 	    surveyService.updateEntry(entry);
 	}
-
-	return "redirect:/finish";
+	request.setAttribute("messageForm", messageForm);
+	return "redirect:/learning/finish.do";
     }
 
     // *************************************************************************************
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java
===================================================================
diff -u -rbd320e8b9a1e0e966b4a9f1ca718f06c593c34d9 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision bd320e8b9a1e0e966b4a9f1ca718f06c593c34d9)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -46,7 +46,6 @@
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.struts.action.ActionMessage;
 import org.lamsfoundation.lams.tool.survey.SurveyConstants;
 import org.lamsfoundation.lams.tool.survey.dto.AnswerDTO;
 import org.lamsfoundation.lams.tool.survey.model.Survey;
@@ -67,6 +66,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.util.HtmlUtils;
 
@@ -494,7 +495,9 @@
 
 	} catch (Exception e) {
 	    MonitoringController.log.error(e);
-	    errors = new ActionMessage("error.monitoring.export.excel", e.toString()).toString();
+	    MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+	    errorMap.add("error.monitoring.export.excel", e.toString());
+	    errors= errorMap.toString();
 	}
 
 	if (errors != null) {
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyForm.java
===================================================================
diff -u -r333795a363a0275e5f1fd182c9f6acaf7a8b7edd -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyForm.java	(.../SurveyForm.java)	(revision 333795a363a0275e5f1fd182c9f6acaf7a8b7edd)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyForm.java	(.../SurveyForm.java)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -27,7 +27,6 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.tool.survey.model.Survey;
 
 /**
@@ -46,8 +45,6 @@
     private String sessionMapID;
     private String contentFolderID;
     private int currentTab;
-    private FormFile offlineFile;
-    private FormFile onlineFile;
 
     private Survey survey;
 
@@ -86,22 +83,8 @@
 	this.currentTab = currentTab;
     }
 
-    public FormFile getOfflineFile() {
-	return offlineFile;
-    }
+   
 
-    public void setOfflineFile(FormFile offlineFile) {
-	this.offlineFile = offlineFile;
-    }
-
-    public FormFile getOnlineFile() {
-	return onlineFile;
-    }
-
-    public void setOnlineFile(FormFile onlineFile) {
-	this.onlineFile = onlineFile;
-    }
-
     public Survey getSurvey() {
 	return survey;
     }
Fisheye: Tag c05d26819a155980f333e1a4aea16afe974119e3 refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/tlds/struts/struts-bean-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c05d26819a155980f333e1a4aea16afe974119e3 refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/tlds/struts/struts-bean.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c05d26819a155980f333e1a4aea16afe974119e3 refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/tlds/struts/struts-html-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c05d26819a155980f333e1a4aea16afe974119e3 refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/tlds/struts/struts-html.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c05d26819a155980f333e1a4aea16afe974119e3 refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/tlds/struts/struts-logic-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c05d26819a155980f333e1a4aea16afe974119e3 refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/tlds/struts/struts-logic.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c05d26819a155980f333e1a4aea16afe974119e3 refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/tlds/struts/struts-nested.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c05d26819a155980f333e1a4aea16afe974119e3 refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/tlds/struts/struts-tiles-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c05d26819a155980f333e1a4aea16afe974119e3 refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/tlds/struts/struts-tiles.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c05d26819a155980f333e1a4aea16afe974119e3 refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/validation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_survey/web/common/messages.jsp
===================================================================
diff -u -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_survey/web/common/messages.jsp	(.../messages.jsp)	(revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0)
+++ lams_tool_survey/web/common/messages.jsp	(.../messages.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -1,5 +1,4 @@
 <%-- Error Messages --%>
-<%-- Error Messages --%>
  <c:set var="errorKey" value="GLOBAL" /> 
  <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
      <lams:Alert id="error" type="danger" close="false"> 
Index: lams_tool_survey/web/pages/learning/notebook.jsp
===================================================================
diff -u -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 -rc05d26819a155980f333e1a4aea16afe974119e3
--- lams_tool_survey/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0)
+++ lams_tool_survey/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
@@ -17,7 +17,7 @@
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-	<form:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();" id="messageForm" modelAttribute="messageForm">
+	<form:form action="submitReflection.do" method="post" onsubmit="disableFinishButton();" id="messageForm" modelAttribute="messageForm">
 		<form:hidden path="userID" />
 		<form:hidden path="sessionMapID" />