Index: lams_tool_zoom/.classpath
===================================================================
diff -u -r4a35d56f0a434034b6e650ad6b2cabf9a309714f -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/.classpath	(.../.classpath)	(revision 4a35d56f0a434034b6e650ad6b2cabf9a309714f)
+++ lams_tool_zoom/.classpath	(.../.classpath)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -2,8 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
-	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
+	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
 	<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>
@@ -26,5 +25,6 @@
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/codec/main/commons-codec-1.10.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_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dbupdates/patch20180917.sql
===================================================================
diff -u
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dbupdates/patch20180917.sql	(revision 0)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dbupdates/patch20180917.sql	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -0,0 +1,23 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-4440 Change tool access URLs after migration to Spring MVC
+UPDATE lams_tool SET 
+	author_url = 'tool/lazoom10/authoring/start.do',
+	learner_url = 'tool/lazoom10/learning/start.do?mode=learner',
+	learner_preview_url = 'tool/lazoom10/learning/start.do?mode=author',
+	learner_progress_url = 'tool/lazoom10/learning/start.do?mode=teacher',
+	monitor_url = 'tool/lazoom10/monitoring/start.do',
+	admin_url = 'tool/lazoom10/admin/start.do'
+WHERE tool_signature = 'lazoom10';
+
+UPDATE lams_tool SET tool_version='20180917' WHERE tool_signature='lazoom10';
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomConstants.java
===================================================================
diff -u -reeaae70bac24a36a5f05a5d56638df29c1a495c5 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomConstants.java	(.../ZoomConstants.java)	(revision eeaae70bac24a36a5f05a5d56638df29c1a495c5)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomConstants.java	(.../ZoomConstants.java)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -51,7 +51,7 @@
     // Tool signature
     public static final String TOOL_SIGNATURE = "lazoom10";
     public static final String TOOL_CONTRIBUTE_URL = "tool/" + TOOL_SIGNATURE
-	    + "/monitoring.do?dispatch=startMeeting&toolContentID=";
+	    + "/monitoring/startMeeting.do?toolContentID=";
 
     public static final long JWT_EXPIRATION_MILISECONDS = 5000;
     public static final String ZOOM_API_URL = "https://api.zoom.us/v2/";
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomUtil.java
===================================================================
diff -u -r266434d5ec15cc4026c93a740c3110c046b1d88a -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomUtil.java	(.../ZoomUtil.java)	(revision 266434d5ec15cc4026c93a740c3110c046b1d88a)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomUtil.java	(.../ZoomUtil.java)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -27,35 +27,36 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.tool.zoom.model.Zoom;
 import org.lamsfoundation.lams.tool.zoom.service.IZoomService;
+import org.lamsfoundation.lams.util.MessageService;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 
 public class ZoomUtil {
 
     /**
      * Creates and starts a Zoom meeting
      */
-    public static ActionErrors startMeeting(IZoomService zoomService, Zoom zoom, HttpServletRequest request)
-	    throws IOException {
-	ActionErrors errors = new ActionErrors();
+    public static MultiValueMap<String, String> startMeeting(IZoomService zoomService, MessageService messageService,
+	    Zoom zoom, HttpServletRequest request) throws IOException {
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+
 	String meetingURL = zoom.getMeetingStartUrl();
 	if (meetingURL == null) {
 	    Boolean apiOK = zoomService.chooseApi(zoom.getUid());
 	    if (apiOK == null) {
-		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.api.none.configured"));
+		errorMap.add("GLOBAL", messageService.getMessage("error.api.none.configured"));
 		request.setAttribute("skipContent", true);
 	    } else {
 		if (!apiOK) {
-		    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.api.reuse"));
+		    errorMap.add("GLOBAL", messageService.getMessage("error.api.reuse"));
 		}
 		meetingURL = zoomService.createMeeting(zoom.getUid());
 	    }
 	}
 
 	request.setAttribute(ZoomConstants.ATTR_MEETING_URL, meetingURL);
-	return errors;
+	return errorMap;
     }
 }
\ No newline at end of file
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AdminController.java
===================================================================
diff -u -r6a6275134085f309616b1514c4315beaa9988690 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AdminController.java	(.../AdminController.java)	(revision 6a6275134085f309616b1514c4315beaa9988690)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AdminController.java	(.../AdminController.java)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -27,53 +27,49 @@
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
-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.actions.DispatchAction;
 import org.lamsfoundation.lams.tool.zoom.model.ZoomApi;
 import org.lamsfoundation.lams.tool.zoom.service.IZoomService;
-import org.lamsfoundation.lams.tool.zoom.service.ZoomServiceProxy;
 import org.lamsfoundation.lams.util.JsonUtil;
+import org.lamsfoundation.lams.util.MessageService;
+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 com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-public class AdminController extends DispatchAction {
+@Controller
+@RequestMapping("/admin")
+public class AdminController {
+    private static final Logger logger = Logger.getLogger(AdminController.class);
 
+    @Autowired
+    @Qualifier("zoomService")
     private IZoomService zoomService;
 
-    private static final Logger logger = Logger.getLogger(AdminController.class);
+    @Autowired
+    @Qualifier("zoomMessageService")
+    private MessageService messageService;
 
-    @Override
-    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
-	// set up zoomService
-	zoomService = ZoomServiceProxy.getZoomService(this.getServlet().getServletContext());
-	return super.execute(mapping, form, request, response);
-    }
-
-    @Override
-    public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    @RequestMapping("/start")
+    public String start(HttpServletRequest request) throws Exception {
 	List<ZoomApi> apis = zoomService.getApis();
 	ArrayNode apisJSON = JsonNodeFactory.instance.arrayNode();
 	for (ZoomApi api : apis) {
 	    apisJSON.add(api.toJSON());
 	}
 	request.setAttribute("apis", apisJSON);
-	return mapping.findForward("success");
+	return "pages/admin/view";
     }
 
-    public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    @RequestMapping("/save")
+    public String save(HttpServletRequest request) throws Exception {
 	String apisJSONString = request.getParameter("apisJSON");
 	ArrayNode apisJSON = JsonUtil.readArray(apisJSONString);
 	List<ZoomApi> apis = new LinkedList<ZoomApi>();
@@ -88,17 +84,17 @@
 	    logger.debug("Saved " + apis.size() + " Zoom APIs");
 	}
 
-	ActionErrors errors = new ActionErrors();
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 	apis = zoomService.getApis();
 	for (ZoomApi api : apis) {
 	    if (!zoomService.pingZoomApi(api.getUid())) {
-		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.api.ping", api.getEmail()));
+		errorMap.add("GLOBAL", messageService.getMessage("error.api.ping", new Object[] { api.getEmail() }));
 	    }
 	}
-	if (!errors.isEmpty()) {
-	    this.addErrors(request, errors);
+	if (!errorMap.isEmpty()) {
+	    request.setAttribute("errorMap", errorMap);
 	}
 
-	return unspecified(mapping, form, request, response);
+	return start(request);
     }
 }
\ No newline at end of file
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AuthoringController.java
===================================================================
diff -u -r6a6275134085f309616b1514c4315beaa9988690 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 6a6275134085f309616b1514c4315beaa9988690)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -31,49 +31,40 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.beanutils.BeanUtils;
-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.actions.DispatchAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.zoom.model.Zoom;
 import org.lamsfoundation.lams.tool.zoom.service.IZoomService;
-import org.lamsfoundation.lams.tool.zoom.service.ZoomServiceProxy;
 import org.lamsfoundation.lams.tool.zoom.util.ZoomConstants;
 import org.lamsfoundation.lams.tool.zoom.web.forms.AuthoringForm;
 import org.lamsfoundation.lams.util.CommonConstants;
+import org.lamsfoundation.lams.util.MessageService;
 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.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
 
-public class AuthoringController extends DispatchAction {
+@Controller
+@RequestMapping("/authoring")
+public class AuthoringController {
 
+    @Autowired
+    @Qualifier("zoomService")
     private IZoomService zoomService;
 
-    @Override
-    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    @Autowired
+    @Qualifier("zoomMessageService")
+    private MessageService messageService;
 
-	// set up zoomService
-	zoomService = ZoomServiceProxy.getZoomService(this.getServlet().getServletContext());
+    @RequestMapping("/start")
+    public String start(@ModelAttribute AuthoringForm authoringForm, HttpServletRequest request)
+	    throws ServletException {
 
-	return super.execute(mapping, form, request, response);
-    }
-
-    /**
-     * Default method when no dispatch parameter is specified. It is expected that the parameter
-     * <code>toolContentID</code> will be passed in. This will be used to retrieve content for this tool.
-     *
-     * @throws ServletException
-     *
-     */
-    @Override
-    protected ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws ServletException {
-
 	// Extract toolContentID from parameters.
 	Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 
@@ -101,38 +92,37 @@
 	}
 
 	// Set up the authForm.
-	AuthoringForm authForm = (AuthoringForm) form;
-	copyProperties(authForm, zoom);
+	copyProperties(authoringForm, zoom);
 
 	// Set up sessionMap
 	SessionMap<String, Object> map = createSessionMap(zoom, mode, contentFolderID, toolContentID);
-	authForm.setSessionMapID(map.getSessionID());
+	authoringForm.setSessionMapID(map.getSessionID());
 
 	// add the sessionMap to HTTPSession.
 	request.getSession().setAttribute(map.getSessionID(), map);
 	request.setAttribute(ZoomConstants.ATTR_SESSION_MAP, map);
 
 	if (zoomService.getApis().isEmpty()) {
-	    ActionErrors errors = new ActionErrors();
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.api.none.configured"));
-	    this.addErrors(request, errors);
+	    MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>(1);
+	    errorMap.add("GLOBAL", messageService.getMessage("error.api.none.configured"));
+	    request.setAttribute("errorMap", errorMap);
 	}
 
-	return mapping.findForward("success");
+	return "pages/authoring/authoring";
     }
 
-    public ActionForward updateContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    @RequestMapping("/updateContent")
+    public String updateContent(@ModelAttribute AuthoringForm authoringForm, HttpServletRequest request,
 	    HttpServletResponse response) {
 
 	// get authForm and session map.
-	AuthoringForm authForm = (AuthoringForm) form;
-	SessionMap<String, Object> map = getSessionMap(request, authForm);
+	SessionMap<String, Object> map = getSessionMap(request, authoringForm);
 
 	// get zoom content.
 	Zoom zoom = zoomService.getZoomByContentId((Long) map.get(ZoomConstants.KEY_TOOL_CONTENT_ID));
 
 	// update zoom content using form inputs
-	copyProperties(zoom, authForm);
+	copyProperties(zoom, authoringForm);
 
 	// set the update date
 	zoom.setUpdateDate(new Date());
@@ -144,11 +134,11 @@
 	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	// add the sessionMapID to form
-	authForm.setSessionMapID(map.getSessionID());
+	authoringForm.setSessionMapID(map.getSessionID());
 
 	request.setAttribute(ZoomConstants.ATTR_SESSION_MAP, map);
 
-	return mapping.findForward("success");
+	return "pages/authoring/authoring";
     }
 
     /* ========== Private Methods */
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/ClearSessionController.java
===================================================================
diff -u -r6a6275134085f309616b1514c4315beaa9988690 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/ClearSessionController.java	(.../ClearSessionController.java)	(revision 6a6275134085f309616b1514c4315beaa9988690)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/ClearSessionController.java	(.../ClearSessionController.java)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -23,29 +23,38 @@
 
 package org.lamsfoundation.lams.tool.zoom.web.controller;
 
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.lamsfoundation.lams.tool.ToolAccessMode;
-import org.lamsfoundation.lams.web.action.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.web.controller.LamsAuthoringFinishController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.context.WebApplicationContext;
 
 /**
  * This class give a chance to clear HttpSession when user save/close authoring page.
  *
  * @author Steve.Ni
- *
- *
- *
- *
- *
- * @version $Revision$
  */
-public class ClearSessionController extends LamsAuthoringFinishAction {
+@Controller
+public class ClearSessionController extends LamsAuthoringFinishController {
+    @Autowired
+    private WebApplicationContext applicationContext;
 
+    @RequestMapping("/clearsession")
+    public void execute(HttpServletRequest request, HttpServletResponse response) throws IOException {
+	super.execute(request, response, applicationContext);
+    }
+
     @Override
     public void clearSession(String customiseSessionID, HttpSession session, ToolAccessMode mode) {
 	if (mode.isAuthor()) {
 	    session.removeAttribute(customiseSessionID);
 	}
     }
-
 }
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/LearningController.java
===================================================================
diff -u -r6a6275134085f309616b1514c4315beaa9988690 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/LearningController.java	(.../LearningController.java)	(revision 6a6275134085f309616b1514c4315beaa9988690)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/LearningController.java	(.../LearningController.java)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -30,11 +30,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
-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.actions.DispatchAction;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -46,41 +41,47 @@
 import org.lamsfoundation.lams.tool.zoom.model.ZoomSession;
 import org.lamsfoundation.lams.tool.zoom.model.ZoomUser;
 import org.lamsfoundation.lams.tool.zoom.service.IZoomService;
-import org.lamsfoundation.lams.tool.zoom.service.ZoomServiceProxy;
 import org.lamsfoundation.lams.tool.zoom.util.ZoomConstants;
 import org.lamsfoundation.lams.tool.zoom.util.ZoomUtil;
 import org.lamsfoundation.lams.tool.zoom.web.forms.LearningForm;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.context.WebApplicationContext;
 
-public class LearningController extends DispatchAction {
+@Controller
+@RequestMapping("/learning")
+public class LearningController {
 
     private static final Logger logger = Logger.getLogger(LearningController.class);
 
+    @Autowired
+    @Qualifier("zoomService")
     private IZoomService zoomService;
 
-    @Override
-    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    @Autowired
+    @Qualifier("zoomMessageService")
+    private MessageService messageService;
 
-	// set up zoomService
-	zoomService = ZoomServiceProxy.getZoomService(this.getServlet().getServletContext());
+    @Autowired
+    private WebApplicationContext applicationContext;
 
-	return super.execute(mapping, form, request, response);
-    }
+    @RequestMapping("finishActivity")
+    public String finishActivity(@ModelAttribute LearningForm learningForm, HttpServletRequest request)
+	    throws IOException {
 
-    public ActionForward finishActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException {
-
 	Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
 
 	ZoomUser user = getCurrentUser(toolSessionID);
 
 	if (user != null) {
-
-	    LearningForm learningForm = (LearningForm) form;
-
 	    if (user.getNotebookEntryUID() == null) {
 		user.setNotebookEntryUID(zoomService.createNotebookEntry(toolSessionID,
 			CoreNotebookConstants.NOTEBOOK_TOOL, ZoomConstants.TOOL_SIGNATURE, user.getUserId().intValue(),
@@ -96,12 +97,10 @@
 	    logger.error("finishActivity(): couldn't find/create ZoomUser in toolSessionID: " + toolSessionID);
 	}
 
-	ToolSessionManager sessionMgrService = ZoomServiceProxy.getZoomSessionManager(getServlet().getServletContext());
+	ToolSessionManager sessionMgrService = (ToolSessionManager) zoomService;
 
 	String nextActivityUrl = sessionMgrService.leaveToolSession(toolSessionID, user.getUserId().longValue());
-	response.sendRedirect(nextActivityUrl);
-
-	return null;
+	return "redirect:" + nextActivityUrl;
     }
 
     private ZoomUser getCurrentUser(Long toolSessionId) {
@@ -119,38 +118,35 @@
 	return user;
     }
 
-    public ActionForward openNotebook(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    @RequestMapping("/openNotebook")
+    public String openNotebook(@ModelAttribute LearningForm learningForm, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
-	LearningForm lrnForm = (LearningForm) form;
-
 	// set the finished flag
-	ZoomUser user = getCurrentUser(lrnForm.getToolSessionID());
+	ZoomUser user = getCurrentUser(learningForm.getToolSessionID());
 	ContentDTO contentDTO = new ContentDTO(user.getZoomSession().getZoom());
 
 	request.setAttribute(ZoomConstants.ATTR_CONTENT_DTO, contentDTO);
 
 	NotebookEntry notebookEntry = zoomService.getNotebookEntry(user.getNotebookEntryUID());
 
 	if (notebookEntry != null) {
-	    lrnForm.setEntryText(notebookEntry.getEntry());
+	    learningForm.setEntryText(notebookEntry.getEntry());
 	}
 
-	WebUtil.putActivityPositionInRequestByToolSessionId(lrnForm.getToolSessionID(), request,
-		getServlet().getServletContext());
+	WebUtil.putActivityPositionInRequestByToolSessionId(learningForm.getToolSessionID(), request,
+		applicationContext.getServletContext());
 
-	return mapping.findForward("notebook");
+	return "pages/learning/notebook";
 
     }
 
-    public ActionForward submitReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException {
+    @RequestMapping("submitReflection")
+    public String submitReflection(@ModelAttribute LearningForm learningForm, HttpServletRequest request)
+	    throws IOException {
 
 	// save the reflection entry and call the notebook.
-
-	LearningForm lrnForm = (LearningForm) form;
-
-	ZoomUser user = getCurrentUser(lrnForm.getToolSessionID());
+	ZoomUser user = getCurrentUser(learningForm.getToolSessionID());
 	Long toolSessionID = user.getZoomSession().getSessionId();
 	Integer userID = user.getUserId().intValue();
 
@@ -160,25 +156,21 @@
 	if (entry == null) {
 	    // create new entry
 	    Long entryUID = zoomService.createNotebookEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
-		    ZoomConstants.TOOL_SIGNATURE, userID, lrnForm.getEntryText());
+		    ZoomConstants.TOOL_SIGNATURE, userID, learningForm.getEntryText());
 	    user.setNotebookEntryUID(entryUID);
 	    zoomService.saveOrUpdateZoomUser(user);
 	} else {
 	    // update existing entry
-	    entry.setEntry(lrnForm.getEntryText());
+	    entry.setEntry(learningForm.getEntryText());
 	    entry.setLastModified(new Date());
 	    zoomService.updateNotebookEntry(entry);
 	}
 
-	return finishActivity(mapping, form, request, response);
+	return finishActivity(learningForm, request);
     }
 
-    @Override
-    public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
-
-	LearningForm learningForm = (LearningForm) form;
-
+    @RequestMapping("/start")
+    public String start(@ModelAttribute LearningForm learningForm, HttpServletRequest request) throws Exception {
 	// 'toolSessionID' and 'mode' parameters are expected to be present.
 	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, false);
 
@@ -209,7 +201,8 @@
 	    zoomService.saveOrUpdateZoom(zoom);
 	}
 
-	WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet().getServletContext());
+	WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request,
+		applicationContext.getServletContext());
 
 	ZoomUser user;
 	if (mode.equals(ToolAccessMode.TEACHER)) {
@@ -231,9 +224,9 @@
 
 	if (mode.isAuthor() || !zoom.isStartInMonitor()) {
 	    // start a meeting just like a monitor would
-	    ActionErrors errors = ZoomUtil.startMeeting(zoomService, zoom, request);
-	    if (!errors.isEmpty()) {
-		this.addErrors(request, errors);
+	    MultiValueMap<String, String> errorMap = ZoomUtil.startMeeting(zoomService, messageService, zoom, request);
+	    if (!errorMap.isEmpty()) {
+		request.setAttribute("errorMap", errorMap);
 	    }
 	}
 	if (!mode.isAuthor()) {
@@ -246,6 +239,6 @@
 	    request.setAttribute(ZoomConstants.ATTR_MEETING_URL, meetingURL);
 	}
 
-	return mapping.findForward("zoom");
+	return "pages/learning/learning";
     }
 }
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/MonitoringController.java
===================================================================
diff -u -r6a6275134085f309616b1514c4315beaa9988690 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 6a6275134085f309616b1514c4315beaa9988690)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -24,47 +24,43 @@
 package org.lamsfoundation.lams.tool.zoom.web.controller;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
-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.actions.DispatchAction;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.zoom.dto.ContentDTO;
-import org.lamsfoundation.lams.tool.zoom.dto.NotebookEntryDTO;//import org.lamsfoundation.lams.tool.zoom.dto.UserDTO;
+import org.lamsfoundation.lams.tool.zoom.dto.NotebookEntryDTO;
 import org.lamsfoundation.lams.tool.zoom.dto.ZoomUserDTO;
 import org.lamsfoundation.lams.tool.zoom.model.Zoom;
 import org.lamsfoundation.lams.tool.zoom.model.ZoomUser;
 import org.lamsfoundation.lams.tool.zoom.service.IZoomService;
-import org.lamsfoundation.lams.tool.zoom.service.ZoomServiceProxy;
 import org.lamsfoundation.lams.tool.zoom.util.ZoomConstants;
 import org.lamsfoundation.lams.tool.zoom.util.ZoomUtil;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.RequestMapping;
 
-public class MonitoringController extends DispatchAction {
+@Controller
+@RequestMapping("/monitoring")
+public class MonitoringController {
 
     private static final Logger logger = Logger.getLogger(MonitoringController.class);
 
+    @Autowired
+    @Qualifier("zoomService")
     private IZoomService zoomService;
 
-    @Override
-    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    @Autowired
+    @Qualifier("zoomMessageService")
+    private MessageService messageService;
 
-	// set up zoomService
-	zoomService = ZoomServiceProxy.getZoomService(this.getServlet().getServletContext());
+    @RequestMapping("/start")
+    public String start(HttpServletRequest request) {
 
-	return super.execute(mapping, form, request, response);
-    }
-
-    @Override
-    public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-
 	Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
@@ -84,11 +80,11 @@
 	request.setAttribute(ZoomConstants.ATTR_CONTENT_DTO, contentDTO);
 	request.setAttribute(ZoomConstants.ATTR_CONTENT_FOLDER_ID, contentFolderID);
 
-	return mapping.findForward("success");
+	return "pages/monitoring/monitoring";
     }
 
-    public ActionForward openNotebook(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
+    @RequestMapping("/openNotebook")
+    public String openNotebook(HttpServletRequest request) {
 	Long uid = new Long(WebUtil.readLongParam(request, ZoomConstants.PARAM_USER_UID));
 
 	ZoomUser user = zoomService.getUserByUID(uid);
@@ -99,11 +95,11 @@
 
 	request.setAttribute(ZoomConstants.ATTR_USER_DTO, userDTO);
 
-	return mapping.findForward("notebook");
+	return "pages/monitoring/notebook";
     }
 
-    public ActionForward startMeeting(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    @RequestMapping("/startMeeting")
+    public String startMeeting(HttpServletRequest request) throws Exception {
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID, false);
 	Zoom zoom = zoomService.getZoomByContentId(toolContentID);
 
@@ -112,11 +108,11 @@
 	contentDTO.setInstructions(zoom.getInstructions());
 	request.setAttribute(ZoomConstants.ATTR_CONTENT_DTO, contentDTO);
 
-	ActionErrors errors = ZoomUtil.startMeeting(zoomService, zoom, request);
-	if (!errors.isEmpty()) {
-	    this.addErrors(request, errors);
+	MultiValueMap<String, String> errorMap = ZoomUtil.startMeeting(zoomService, messageService, zoom, request);
+	if (!errorMap.isEmpty()) {
+	    request.setAttribute("errorMap", errorMap);
 	}
 
-	return mapping.findForward("learning");
+	return "pages/learning/learning";
     }
 }
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/AuthoringForm.java
===================================================================
diff -u -r6c62e5beb70cd0b72dcec44eaf80ba489a442fb4 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 6c62e5beb70cd0b72dcec44eaf80ba489a442fb4)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -23,21 +23,12 @@
 
 package org.lamsfoundation.lams.tool.zoom.web.forms;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.web.util.SessionMap;
 
 /**
  *
  */
-public class AuthoringForm extends ActionForm {
-    private static final long serialVersionUID = 3950453134542135495L;
-
+public class AuthoringForm {
     // Fields
 
     private String title;
@@ -60,14 +51,6 @@
 
     private SessionMap<String, Object> sessionMap;
 
-    @Override
-    public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) {
-	ActionErrors ac = new ActionErrors();
-	ac.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("this is an error"));
-
-	return ac;
-    }
-
     public String getSessionMapID() {
 	return sessionMapID;
     }
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/LearningForm.java
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/LearningForm.java	(.../LearningForm.java)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/LearningForm.java	(.../LearningForm.java)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -23,24 +23,12 @@
 
 package org.lamsfoundation.lams.tool.zoom.web.forms;
 
-import org.apache.struts.action.ActionForm;
+public class LearningForm {
 
-/**
- *
- * @author Ernie Ghiglione
- *
- *
- */
-public class LearningForm extends ActionForm {
-
-    private static final long serialVersionUID = -4728946254882237144L;
-
     private String title;
 
     private String instructions;
 
-    private String dispatch;
-
     private Long toolSessionID;
 
     private String mode;
@@ -55,14 +43,6 @@
 	this.mode = mode;
     }
 
-    public String getDispatch() {
-	return dispatch;
-    }
-
-    public void setDispatch(String dispatch) {
-	this.dispatch = dispatch;
-    }
-
     public Long getToolSessionID() {
 	return toolSessionID;
     }
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/MonitoringForm.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/zoomApplicationContext.xml
===================================================================
diff -u -r1705f1092adfc371069c59f40381acab66ed8c34 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/zoomApplicationContext.xml	(.../zoomApplicationContext.xml)	(revision 1705f1092adfc371069c59f40381acab66ed8c34)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/zoomApplicationContext.xml	(.../zoomApplicationContext.xml)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -5,11 +5,14 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
-	<!-- ========================= GENERAL DEFINITIONS ========================= -->
-
-	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-
-	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
+	<bean id="zoomMessageService" class="org.lamsfoundation.lams.util.MessageService" >
+		<property name="messageSource">
+			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+				<property name="basename"><value>org.lamsfoundation.lams.tool.zoom.ApplicationResources</value></property>
+			</bean>
+		</property>										
+	</bean>
+	
 	<bean id="zoomService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name="preInterceptors">
Index: lams_tool_zoom/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u
--- lams_tool_zoom/web/WEB-INF/spring-servlet.xml	(revision 0)
+++ lams_tool_zoom/web/WEB-INF/spring-servlet.xml	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -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.zoom.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
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/WEB-INF/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_zoom/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -32,7 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -123,11 +123,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" name="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:;" name="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_zoom/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -8,7 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_zoom/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -8,7 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -284,42 +284,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">
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
+							cssClass="form-control form-control-inline">
+						<form: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>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form: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">
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
+							cssClass="form-control form-control-inline">
+						<form: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>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				</div>
 			</c:if>
 	
Index: lams_tool_zoom/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -1,5 +1,5 @@
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -42,23 +42,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:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowAnonymousVariableName}" 
+	<form:checkbox path="${allowAnonymousVariableName}" 
 		styleId="${allowAnonymousVariableName}">
-	</html:checkbox>
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rb67bc25f161fa3bf350e4c89696c24620674c8ef -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
+++ lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -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>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_zoom/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -4,6 +4,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
@@ -88,8 +89,8 @@
 					</c:if>
 				</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="${empty toolSessionId and not empty formID}">
+				<c:set var="toolForm" value="${requestScope[formID]}" />
 				<c:if test="${not empty toolForm}"> 
 				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
 				</c:if>
@@ -137,12 +138,12 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -244,9 +245,8 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : LEARNING_URL + 'learner.do',
+						url : LEARNING_URL + 'learner/getLessonDetails.do',
 						data : {
-							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
 							'toolSessionID' : toolSessionId,
 						},
Index: lams_tool_zoom/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -8,7 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_zoom/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -8,7 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_zoom/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -34,7 +34,6 @@
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <c:set var="class" value=""/>
 <c:if test="${id == 1}">
Index: lams_tool_zoom/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -30,7 +30,6 @@
 
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <div class="panel-body panel-monitor-body">
 	 <jsp:doBody />
Index: lams_tool_zoom/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -32,12 +32,11 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 <%-- Required attributes --%>
 <%@ attribute name="sessionMapID" required="true" rtexprvalue="true" %>
-<%@ attribute name="wrapInFormTag" required="true" rtexprvalue="true" %>
 
 <%-- Optional attributes --%>
 <%@ attribute name="action" required="false" rtexprvalue="true" %>
@@ -53,10 +52,10 @@
 
 <%-- Default value for message key --%>
 <c:if test="${empty action}">
-	<c:set var="action" value="authoring/textsearch.do" scope="request"/>
+	<c:set var="action" value="textsearch.do" scope="request"/>
 </c:if>
 <c:if test="${empty cancelAction}">
-	<c:set var="cancelAction" value="authoring/textsearchCancel.do" scope="request"/>
+	<c:set var="cancelAction" value="textsearchCancel.do" scope="request"/>
 </c:if>
 <c:if test="${empty formID}">
 	<c:set var="formID" value="textSearchForm" scope="request"/>
@@ -85,52 +84,40 @@
 
 <!-- begin text search form content -->
 	
-<c:if test="${wrapInFormTag}">
-	<form action="${action}" id="${formID}" name="${formID}">
-</c:if>
-		<html:hidden property="sessionMapID" />
-		<h4><fmt:message key="${headingLabelKey}" /></h4>
-		<table>
-			<tr>
-				<td>
-					<fmt:message key="${allWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="allWords" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${phraseLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="phrase" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${anyWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="anyWords" /> 
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${excludedWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="excludedWords" /> 
-				</td>
-			</tr>
-		</table>
-<c:if test="${wrapInFormTag}">
-	<lams:ImgButtonWrapper>
-		<a href="#" onclick="${formID}.submit();" class="button-add-item"><fmt:message key="${saveButtonLabelKey}" />
-		</a>
-		<a href="#" onclick="location.href='${cancelAction}'" class="button space-left"><fmt:message key="${cancelButtonLabelKey}" />
-		</a>
-	</lams:ImgButtonWrapper>
-	</form>
-</c:if>
+	<form:hidden path="sessionMapID" />
+	<h4><fmt:message key="${headingLabelKey}" /></h4>
+	<table>
+		<tr>
+			<td>
+				<fmt:message key="${allWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="allWords" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${phraseLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="phrase" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${anyWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="anyWords" /> 
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${excludedWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="excludedWords" /> 
+			</td>
+		</tr>
+	</table>
 <!-- end text search form content -->
\ No newline at end of file
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/WEB-INF/tiles-defs.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rb67bc25f161fa3bf350e4c89696c24620674c8ef -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
+++ lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -211,192 +211,6 @@
       </attribute>
 
    </tag>
-
-  	<tag>
-		<name>STRUTS-textarea</name>
-		<tag-class>org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag</tag-class>
-		<body-content>empty</body-content>
-		<attribute>
-			<name>accesskey</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>alt</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>altKey</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>bundle</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>cols</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>disabled</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>errorKey</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>errorStyle</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>errorStyleClass</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>errorStyleId</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>index</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>indexed</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>name</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onblur</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onchange</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onclick</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>ondblclick</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onfocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onkeydown</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onkeypress</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onkeyup</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmousedown</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmousemove</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmouseout</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmouseover</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmouseup</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>property</name>
-			<required>true</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>readonly</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>rows</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>style</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>styleClass</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>styleId</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>tabindex</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>title</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>titleKey</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>value</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-	</tag>
 	
 	<tag>
       <description>Small portrait of a user</description>
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/WEB-INF/tlds/struts/struts-bean-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/WEB-INF/tlds/struts/struts-bean.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/WEB-INF/tlds/struts/struts-html-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/WEB-INF/tlds/struts/struts-html.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/WEB-INF/tlds/struts/struts-logic-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/WEB-INF/tlds/struts/struts-logic.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/WEB-INF/tlds/struts/struts-nested.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/WEB-INF/tlds/struts/struts-tiles-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/WEB-INF/tlds/struts/struts-tiles.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/WEB-INF/validation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/WEB-INF/validator-rules.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_zoom/web/WEB-INF/web.xml
===================================================================
diff -u -r266434d5ec15cc4026c93a740c3110c046b1d88a -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/WEB-INF/web.xml	(.../web.xml)	(revision 266434d5ec15cc4026c93a740c3110c046b1d88a)
+++ lams_tool_zoom/web/WEB-INF/web.xml	(.../web.xml)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -74,24 +74,10 @@
 	</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.DispatcherServlet
+		</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 
@@ -126,7 +112,7 @@
 
 
 	<servlet-mapping>
-		<servlet-name>action</servlet-name>
+		<servlet-name>spring</servlet-name>
 		<url-pattern>*.do</url-pattern>
 	</servlet-mapping>
 
@@ -156,27 +142,7 @@
 	</error-page>
 
 	<jsp-config>
-
 		<!-- ======================================================== -->
-		<!-- Struts Tag Library Descriptors -->
-		<!-- ======================================================== -->
-		<taglib>
-			<taglib-uri>tags-bean</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
-		</taglib>
-		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
 		<taglib>
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/common/empty.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/common/message.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/common/simpleHeader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/common/tabbedHeader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_zoom/web/common/taglibs.jsp
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -1,11 +1,8 @@
 <%@ page language="java" pageEncoding="UTF-8"
 	contentType="text/html;charset=utf-8"%>
 
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
-<%@ taglib uri="tags-tiles" prefix="tiles"%>
-<%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="tags-lams" prefix="lams"%>
\ No newline at end of file
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
\ No newline at end of file
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/layouts/simpleLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/layouts/tabbedLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_zoom/web/pages/admin/view.jsp
===================================================================
diff -u -r5da86331a25afcff7dfa0dd4647187c5beaa757b -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/pages/admin/view.jsp	(.../view.jsp)	(revision 5da86331a25afcff7dfa0dd4647187c5beaa757b)
+++ lams_tool_zoom/web/pages/admin/view.jsp	(.../view.jsp)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -1,133 +1,153 @@
+<!DOCTYPE html>
+
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="title"><fmt:message key="admin.title" /></c:set>
-<lams:Page type="admin" title="${title}">
-
-<style type="text/css" scoped="scoped">
-	.api {
-		margin-top: 10px;
-	}
-			
-	.api .control {
-		padding-top: 7px;
-		cursor: pointer;
-	}
+<lams:html>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
 	
-	.api:last-child .control {
-		visibility: hidden;
-	}
+<lams:head>  
+	<title>
+		<fmt:message key="activity.title" />
+	</title>
 	
-	.api:nth-last-child(2) .down, .api:first-child .up {
-		visibility: hidden !important;
-	}
-</style>
+	<lams:css/>
+	<style type="text/css" scoped="scoped">
+		.api {
+			margin-top: 10px;
+		}
+				
+		.api .control {
+			padding-top: 7px;
+			cursor: pointer;
+		}
+		
+		.api:last-child .control {
+			visibility: hidden;
+		}
+		
+		.api:nth-last-child(2) .down, .api:first-child .up {
+			visibility: hidden !important;
+		}
+	</style>
 	
-<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
-<script type="text/javascript">
-	function removeApi(elem) {
-		$(elem).closest('.api').remove();
-	}
-
-	function validateApi(elem){
-		var valid = true,
-			api = $(elem).closest('.api');
-		if (api.is(':last-child')) {
-			// set this api as a real one
-			api.clone().appendTo(api.parent()).find('input').val(null);
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript">
+		function removeApi(elem) {
+			$(elem).closest('.api').remove();
 		}
-		$('input', api).each(function(){
-			valid &= $(this).val().trim() != '';
-		});
-		if (valid) {
-			// api has content now, so it is valid
-			api.removeClass('has-error');
-		} else if (!api.is(':last-child')) {
-			// mark empty api as invalid
-			api.addClass('has-error');
+	
+		function validateApi(elem){
+			var valid = true,
+				api = $(elem).closest('.api');
+			if (api.is(':last-child')) {
+				// set this api as a real one
+				api.clone().appendTo(api.parent()).find('input').val(null);
+			}
+			$('input', api).each(function(){
+				valid &= $(this).val().trim() != '';
+			});
+			if (valid) {
+				// api has content now, so it is valid
+				api.removeClass('has-error');
+			} else if (!api.is(':last-child')) {
+				// mark empty api as invalid
+				api.addClass('has-error');
+			}
 		}
-	}
-
-	function submitApis() {
-		var apis = [],	
-			error = false;
-		$('.api').each(function(){
-			var api = $(this);
-			if (api.hasClass('has-error')) {
-				error = true;
+	
+		function submitApis() {
+			var apis = [],	
+				error = false;
+			$('.api').each(function(){
+				var api = $(this);
+				if (api.hasClass('has-error')) {
+					error = true;
+					return false;
+				} else if (api.is(':last-child')) {
+					// skip last row as it is the api placeholder
+					return true;
+				}
+				apis.push({
+					'email' : $('.email', api).val().trim(),
+					'key'   : $('.key', api).val().trim(),
+					'secret': $('.secret', api).val().trim()
+				});
+			});
+			
+			if (error) {
 				return false;
-			} else if (api.is(':last-child')) {
-				// skip last row as it is the api placeholder
-				return true;
 			}
-			apis.push({
-				'email' : $('.email', api).val().trim(),
-				'key'   : $('.key', api).val().trim(),
-				'secret': $('.secret', api).val().trim()
+	
+			$('#apisJSON').val(JSON.stringify(apis));
+			return true;
+		}
+		
+		$(document).ready(function () {
+			var apis = ${apis},
+				api = $('.api');
+			$.each(apis, function(){
+				var apiEntry = api.clone().insertBefore(api);
+				apiEntry.find('.email').val(this.email);
+				apiEntry.find('.key').val(this.key);
+				apiEntry.find('.secret').val(this.secret);
 			});
 		});
-		
-		if (error) {
-			return false;
-		}
+	</script>
+</lams:head>
 
-		$('#apisJSON').val(JSON.stringify(apis));
-		return true;
-	}
-	
-	$(document).ready(function () {
-		var apis = ${apis},
-			api = $('.api');
-		$.each(apis, function(){
-			var apiEntry = api.clone().insertBefore(api);
-			apiEntry.find('.email').val(this.email);
-			apiEntry.find('.key').val(this.key);
-			apiEntry.find('.secret').val(this.secret);
-		});
-	});
-</script>
-	
 <body class="stripes">
-
-<div class="container-fluid">
-	<div class="panel panel-default panel-admin-page">
-		<div class="panel-body panel-admin-body">
-			<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-primary"><fmt:message key="sysadmin.maintain" /></a></p>
-			<c:if test="${saveOK}">
-				 <lams:Alert type="info" close="false">
-				 	<fmt:message key='label.api.saved'/>
-				 </lams:Alert>
-			</c:if>
-			<logic:messagesPresent>
-				<lams:Alert type="danger" id="form-error" close="false">
-					<html:messages id="error">
-						<c:out value="${error}" escapeXml="false" />
-						<br />
-					</html:messages>
-				</lams:Alert>
-			</logic:messagesPresent>
-			
-			<div>
-				<div class="row api">
-					<div class="col-xs-3">
-						<input type="text" class="form-control email" placeholder="<fmt:message key='label.api.email'/>" onkeyup="javascript:validateApi(this)"/>
+	<c:set var="title"><fmt:message key="admin.title" /></c:set>
+	<lams:Page type="admin" title="${title}">
+		<div class="container-fluid">
+			<div class="panel panel-default panel-admin-page">
+				<div class="panel-body panel-admin-body">
+					<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-primary"><fmt:message key="sysadmin.maintain" /></a></p>
+					<c:if test="${saveOK}">
+						 <lams:Alert type="info" close="false">
+						 	<fmt:message key='label.api.saved'/>
+						 </lams:Alert>
+					</c:if>
+					<%-- 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"> 
+					         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+					             <c:out value="${error}" /><br /> 
+					         </c:forEach> 
+					     </lams:Alert> 
+					</c:if>
+					
+					<div>
+						<div class="row api">
+							<div class="col-xs-3">
+								<input type="text" class="form-control email" placeholder="<fmt:message key='label.api.email'/>" onkeyup="javascript:validateApi(this)"/>
+							</div>
+							<div class="col-xs-3">
+								<input type="text" class="form-control key" placeholder="<fmt:message key='label.api.key'/>" onkeyup="javascript:validateApi(this)"/>
+							</div>
+							<div class="col-xs-5">
+								<input type="text" class="form-control secret" placeholder="<fmt:message key='label.api.secret'/>" onkeyup="javascript:validateApi(this)"/>
+							</div>
+				 			<div class="col-xs-1 control" title="<fmt:message key='label.api.remove' />" onclick="javascript:removeApi(this)">
+								<i class="fa fa-times"></i>
+				 			</div>
+						</div>
 					</div>
-					<div class="col-xs-3">
-						<input type="text" class="form-control key" placeholder="<fmt:message key='label.api.key'/>" onkeyup="javascript:validateApi(this)"/>
-					</div>
-					<div class="col-xs-5">
-						<input type="text" class="form-control secret" placeholder="<fmt:message key='label.api.secret'/>" onkeyup="javascript:validateApi(this)"/>
-					</div>
-		 			<div class="col-xs-1 control" title="<fmt:message key='label.api.remove' />" onclick="javascript:removeApi(this)">
-						<i class="fa fa-times"></i>
-		 			</div>
+					<form onsubmit="javascript:submitApis()" action="save.do" method="post">
+						<input type="hidden" id="apisJSON" name="apisJSON" />
+						<input type="submit" class="btn btn-primary pull-right voffset20" value='<fmt:message key="label.save" />' />
+					</form>
 				</div>
 			</div>
-			<form onsubmit="javascript:submitApis()" action="<lams:WebAppURL />admin.do" method="post">
-				<input type="hidden" name="dispatch" value="save" />
-				<input type="hidden" id="apisJSON" name="apisJSON" />
-				<input type="submit" class="btn btn-primary pull-right voffset20" value='<fmt:message key="label.save" />' />
-			</form>
 		</div>
-	</div>
-</div>
-</lams:Page>
\ No newline at end of file
+		</lams:Page>
+	</body>
+</lams:html>
\ No newline at end of file
Index: lams_tool_zoom/web/pages/authoring/advanced.jsp
===================================================================
diff -u -rb67bc25f161fa3bf350e4c89696c24620674c8ef -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
+++ lams_tool_zoom/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -1,7 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-<c:set var="durationSet" value="${not empty formBean.duration && formBean.duration > 0}" />
+<c:set var="durationSet" value="${not empty authoringForm.duration && authoringForm.duration > 0}" />
 
 <!-- ========== Advanced Tab ========== -->
 
@@ -11,7 +10,7 @@
 
 	<div class="checkbox voffset10">
 		<label for="startInMonitor">
-			<html:checkbox property="startInMonitor" value="1" styleClass="noBorder" styleId="startInMonitor"></html:checkbox> 
+			<form:checkbox path="startInMonitor" cssClass="noBorder" id="startInMonitor" />
 			<fmt:message key="advanced.startInMonitor" />
 		</label>
 	</div>
@@ -33,7 +32,7 @@
 				   max="99999" min="1" style="width: 100px; display:inline-block; margin-right: 10px; margin-left: 20px"
 					<c:choose>
 						<c:when test="${durationSet}">
-							value="${formBean.duration}"
+							value="${authoringForm.duration}"
 						</c:when>
 						<c:otherwise>
 							disabled="disabled"
@@ -45,13 +44,13 @@
 	</div>
 
 	<div class="checkbox voffset10">
-		<label for="reflectOnActivity"> <html:checkbox property="reflectOnActivity" value="1" styleClass="noBorder"
-				styleId="reflectOnActivity"></html:checkbox> <fmt:message key="advanced.reflectOnActivity" />
+		<label for="reflectOnActivity"> <form:checkbox path="reflectOnActivity" cssClass="noBorder"	id="reflectOnActivity"/>
+			<fmt:message key="advanced.reflectOnActivity" />
 		</label>
 	</div>
 	
 	<div class="form-group">
-		<html:textarea property="reflectInstructions" styleId="reflectInstructions" styleClass="form-control" rows="3"/>
+		<form:textarea path="reflectInstructions" id="reflectInstructions" cssClass="form-control" rows="3"/>
 	</div>
 
 </lams:SimplePanel>
Index: lams_tool_zoom/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -1,47 +1,70 @@
-<%@ include file="/common/taglibs.jsp"%>
+<!DOCTYPE html>
 
+<%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.zoom.util.ZoomConstants"%>
 
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<lams:html>
 
-<html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data">
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
 
-	<c:set var="title">
-		<fmt:message key="activity.title" />
-	</c:set>
+<lams:head>
+	<title><fmt:message key="activity.title" /></title>
+	
+	<lams:css/>
+	
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
+	<script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
+</lams:head>
 
-	<!--  TITLE KEY PAGE GOES HERE -->
-	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= ZoomConstants.TOOL_SIGNATURE %>" helpModule="authoring">
-		<lams:Tab id="1" key="button.basic" />
-		<lams:Tab id="2" key="button.advanced" />
-	</lams:Tabs>
-	<!--closes header-->
-
-	<html:hidden property="currentTab" styleId="currentTab" />
-	<html:hidden property="dispatch" value="updateContent" />
-	<html:hidden property="sessionMapID" />
-
-	<lams:TabBodyArea>
-		<logic:messagesPresent>
-			<lams:Alert id="errorMessages" type="danger" close="false">
-				<html:messages id="error">
-					<c:out value="${error}" escapeXml="false" />
-					<br />
-				</html:messages>
-			</lams:Alert>
-		</logic:messagesPresent>
-
-		<%-- Page tabs --%>
-		<lams:TabBodys>
-			<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-		</lams:TabBodys>
-
-		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lazoom10"
-			cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save" toolContentID="${sessionMap.toolContentID}"
-			accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode == 'teacher'}" customiseSessionID="${sessionMap.sessionID}"
-			contentFolderID="${sessionMap.contentFolderID}" />
-
-	</lams:TabBodyArea>
-	<div id="footer"></div>
-</html:form>
+<body class="stripes" onload="init();">
+	<lams:Page title="pageTitle.authoring" type="navbar">
+		<form:form action="updateContent.do" modelAttribute="authoringForm" method="post" enctype="multipart/form-data">
+			<c:set var="title">
+				<fmt:message key="activity.title" />
+			</c:set>
+		
+			<!--  TITLE KEY PAGE GOES HERE -->
+			<lams:Tabs control="true" title="${title}" helpToolSignature="<%= ZoomConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+				<lams:Tab id="1" key="button.basic" />
+				<lams:Tab id="2" key="button.advanced" />
+			</lams:Tabs>
+			<!--closes header-->
+		
+			<form:hidden path="currentTab" id="currentTab" />
+			<form:hidden path="sessionMapID" />
+		
+			<lams:TabBodyArea>
+		 		<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>
+		
+				<%-- Page tabs --%>
+				<lams:TabBodys>
+					<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
+					<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
+				</lams:TabBodys>
+		
+				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lazoom10"
+					cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save" toolContentID="${sessionMap.toolContentID}"
+					accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode == 'teacher'}" customiseSessionID="${sessionMap.sessionID}"
+					contentFolderID="${sessionMap.contentFolderID}" />
+		
+			</lams:TabBodyArea>
+			<div id="footer"></div>
+		</form:form>
+	</lams:Page>
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_tool_zoom/web/pages/authoring/basic.jsp
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -1,16 +1,16 @@
 <%@ 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="sessionMapID" value="${authoringForm.sessionMapID}" />
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
+
 <!-- ========== Basic Tab ========== -->
 <div class="form-group">
 	<label for="title"><fmt:message key="label.authoring.basic.title" /></label>
-	<html:text property="title" style="width: 99%;"></html:text>
+	<form:input path="title" style="width: 99%;" />
 </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>
+		<label for="instructions"><fmt:message key="label.authoring.basic.instructions"/></label>
+		<lams:CKEditor id="instructions" value="${authoringForm.instructions}" contentFolderID="${sessionMap.contentFolderID}"></lams:CKEditor>
 </div>
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/pages/authoring/headItems.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/pages/learning/defineLater.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/pages/learning/headItems.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_zoom/web/pages/learning/learning.jsp
===================================================================
diff -u -r78b2c47972525e5dc3615852c907b1722c4c7ea2 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 78b2c47972525e5dc3615852c907b1722c4c7ea2)
+++ lams_tool_zoom/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -1,18 +1,41 @@
+<!DOCTYPE html>
+
 <%@ include file="/common/taglibs.jsp"%>
 
+<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/>
+	
+	<%-- TODO is this the best place to import these scripts ?	--%>
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+</lams:head>
+<body class="stripes">
 <lams:Page type="learner" title="${contentDTO.title}">
 	<div class="panel">
 		<c:out value="${contentDTO.instructions}" escapeXml="false" />
 	</div>
 
-	<logic:messagesPresent>
-		<lams:Alert type="danger" id="form-error" 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>
 	
 	<c:if test="${not skipContent}">
 		<c:choose>
@@ -27,9 +50,7 @@
 				<p>
 					<fmt:message key="label.learning.conferenceNotAvailable" />
 				</p>
-				<html:link styleClass="btn btn-sm btn-default" href="#" onclick="window.location.reload()">
-					<fmt:message key="label.refresh" />
-				</html:link>
+				<a href="#" onclick="window.location.reload()" class="btn btn-default"><fmt:message key="label.refresh" /></a>
 			</c:when>
 			<c:otherwise>
 				<iframe id="zoomJoinFrame" style="width: 100%; height: 680px; border: none; display: none" src="${meetingURL}"></iframe>
@@ -56,3 +77,5 @@
 	</c:if>
 
 </lams:Page>
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_tool_zoom/web/pages/learning/notebook.jsp
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -1,41 +1,61 @@
+<!DOCTYPE html>
+
 <%@ include file="/common/taglibs.jsp"%>
 
-<script type="text/javascript">
-	function disableFinishButton() {
-		document.getElementById("finishButton").disabled = true;
-	}
-</script>
+<lams:html>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
 
-<lams:Page type="learner" title="${contentDTO.title}">
-
-	<html:form action="/learning" method="post" onsubmit="disableFinishButton();">
-
-		<div class="panel">
-			<lams:out value="${contentDTO.reflectInstructions}" escapeHtml="true" />
-		</div>
-
-		<html:textarea styleId="focused" rows="5" property="entryText" styleClass="form-control"></html:textarea>
-
-		<html:hidden property="dispatch" value="submitReflection" />
-		<html:hidden property="toolSessionID" />
-		<html:submit styleClass="btn btn-primary pull-right voffset10 na" styleId="finishButton">
-			<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>
-		</html:submit>
-
-	</html:form>
+<lams:head>  
+	<title>
+		<fmt:message key="activity.title" />
+	</title>
 	
+	<lams:css/>
+	
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript">
-		window.onload = function() {
-			document.getElementById("focused").focus();
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
 		}
-	</script>
+	</script>	
+</lams:head>
+<body class="stripes">
+	<lams:Page type="learner" title="${contentDTO.title}">
 
-</lams:Page>
-
+		<form:form action="submitReflection.do" method="post" onsubmit="disableFinishButton();" modelAttribute="learningForm">
+	
+			<div class="panel">
+				<lams:out value="${contentDTO.reflectInstructions}" escapeHtml="true" />
+			</div>
+	
+			<form:textarea id="focused" rows="5" path="entryText" cssClass="form-control" />
+	
+			<form:hidden path="toolSessionID" />
+			<button type="submit" class="btn btn-primary pull-right voffset10 na" id="finishButton">
+				<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>
+			</button>
+		</form:form>
+		
+		<script type="text/javascript">
+			window.onload = function() {
+				document.getElementById("focused").focus();
+			}
+		</script>
+	
+	</lams:Page>
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_tool_zoom/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -13,14 +13,13 @@
 	<fmt:message key="label.notebookEntry" />
 </c:set>
 
-<html:form action="/learning" method="post">
-	<html:hidden property="toolSessionID" value="${toolSessionID}" />
-	<html:hidden property="dispatch" value="openNotebook" />
+<form:form action="openNotebook.do" method="post" modelAttribute="learningForm">
+	<form:hidden path="toolSessionID" />
 
 	<c:if test="${userDTO.finishedActivity and contentDTO.reflectOnActivity}">
 
 		<div class="panel panel-default">
-			<div class="panel-heading panel-title">${notebookEntry}</div>
+			<div class="panel-heading panel-title">${learningForm.notebookEntry}</div>
 			<div class="panel-body">
 				<div class="panel">
 					<c:out value="${contentDTO.reflectInstructions}" escapeXml="true" />
@@ -38,30 +37,24 @@
 					</c:otherwise>
 				</c:choose>
 				</p>
-
-				<html:submit styleClass="btn btn-sm btn-default">
+				<button type="submit" class="btn btn-sm btn-default">
 					<fmt:message key="button.edit" />
-				</html:submit>
-
+				</button>
 			</div>
 		</div>
 	</c:if>
-</html:form>
+</form:form>
 
-<html:form action="/learning" method="post" onsubmit="disableFinishButton();">
-	<html:hidden property="toolSessionID" value="${toolSessionID}" />
+<form:form action="${!userDTO.finishedActivity and contentDTO.reflectOnActivity ? 'openNotebook.do' : 'finishActivity.do'}"
+		   method="post" onsubmit="disableFinishButton();" modelAttribute="learningForm">
+	<form:hidden path="toolSessionID" />
 	<div class="pull-right voffset10">
 		<c:choose>
 			<c:when test="${!userDTO.finishedActivity and contentDTO.reflectOnActivity}">
-				<html:hidden property="dispatch" value="openNotebook" />
-
-				<html:submit styleClass="btn btn-primary">
-					<fmt:message key="button.continue" />
-				</html:submit>
+				<button type="submit" class="btn btn-primary"><fmt:message key="button.continue" /></button>
 			</c:when>
 			<c:otherwise>
-				<html:hidden property="dispatch" value="finishActivity" />
-				<html:submit styleClass="btn btn-primary na" styleId="finishButton">
+				<button type="submit" class="btn btn-primary na" id="finishButton">
 					<c:choose>
 						<c:when test="${activityPosition.last}">
 							<fmt:message key="button.submit" />
@@ -70,8 +63,8 @@
 							<fmt:message key="button.finish" />
 						</c:otherwise>
 					</c:choose>
-				</html:submit>
+				</button>
 			</c:otherwise>
 		</c:choose>
 	</div>
-</html:form>
+</form:form>
\ No newline at end of file
Index: lams_tool_zoom/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -27,7 +27,7 @@
 	</tr>
 </table>
 
-<c:url value="/authoring.do" var="authoringUrl">
+<c:url value="/authoring/start.do" var="authoringUrl">
 	<c:param name="toolContentID" value="${dto.toolContentId}" />
 	<c:param name="mode" value="teacher" />
 	<c:param name="contentFolderID" value="${contentFolderID}" />
Fisheye: Tag cd28f26327e5afe5f9797847d801eba0abab9144 refers to a dead (removed) revision in file `lams_tool_zoom/web/pages/monitoring/headItems.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_zoom/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -1,26 +1,52 @@
+<!DOCTYPE html>
+
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.zoom.util.ZoomConstants"%>
 
-<script type="text/javascript">
-	var initialTabId = "${contentDTO.currentTab}";
-</script>
-
-<c:set var="title">
-	<fmt:message key="activity.title" />
+<lams:html>
+<c:set var="tool">
+	<lams:WebAppURL />
 </c:set>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
 
-<lams:Tabs control="true" title="${title}" helpToolSignature="<%= ZoomConstants.TOOL_SIGNATURE %>" helpModule="monitoring">
-	<lams:Tab id="1" key="button.summary" />
-	<lams:Tab id="2" key="button.editActivity" />
-	<lams:Tab id="3" key="button.statistics" />
-</lams:Tabs>
+<lams:head>
+	<title><fmt:message key="activity.title" /></title>
+	
+	<lams:css/>
+	
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
+	<script type="text/javascript" src="${tool}includes/javascript/monitoring.js"></script>
+	<script type="text/javascript">
+		var initialTabId = "${contentDTO.currentTab}";
+	</script>
+</lams:head>
+<body class="stripes" onload="init();">
 
-<lams:TabBodyArea>
-	<lams:TabBodys>
-		<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-		<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
-		<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
-	</lams:TabBodys>
-</lams:TabBodyArea>
-
-<div id="footer"></div>
+	<lams:Page title="pageTitle.monitoring" type="navbar">
+		<c:set var="title">
+			<fmt:message key="activity.title" />
+		</c:set>
+		
+		<lams:Tabs control="true" title="${title}" helpToolSignature="<%= ZoomConstants.TOOL_SIGNATURE %>" helpModule="monitoring">
+			<lams:Tab id="1" key="button.summary" />
+			<lams:Tab id="2" key="button.editActivity" />
+			<lams:Tab id="3" key="button.statistics" />
+		</lams:Tabs>
+		
+		<lams:TabBodyArea>
+			<lams:TabBodys>
+				<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
+				<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
+				<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
+			</lams:TabBodys>
+		</lams:TabBodyArea>
+		
+		<div id="footer"></div>
+	</lams:Page>
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_tool_zoom/web/pages/monitoring/notebook.jsp
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -1,44 +1,66 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="title">
-	<fmt:message key="heading.notebookEntry" />
+<lams:html>
+<c:set var="lams">
+	<lams:LAMSURL />
 </c:set>
-<lams:Page title="${title}" type="monitor">
-	<h4>
-		<c:out value="${userDTO.firstName} ${userDTO.lastName}" escapeXml="true"/>
-	</h4>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
 
-	<table class="table table-striped table-condensed">
-		<tr>
-			<td>
-				<fmt:message key="label.created" />
-			</td>
-			<td>
-				<lams:Date value="${userDTO.notebookEntryDTO.createDate }"></lams:Date>
-
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<fmt:message key="label.lastModified" />
-			</td>
-			<td>
-				<lams:Date value="${userDTO.notebookEntryDTO.lastModified }"></lams:Date>
-			</td>
-		</tr>
-
-		<tr>
-			<td>
-				<fmt:message key="label.notebookEntry" />
-			</td>
-			<td>
-				<lams:out value="${userDTO.notebookEntryDTO.entry}" escapeHtml="true"/>
-			</td>
-		</tr>
-	</table>
-
-	 <a href="javascript:history.back();" class="btn btn-sm btn-primary">
-	 	<fmt:message key="button.close"/>
-	 </a>
-
-</lams:Page>
+<lams:head>  
+	<title>
+		<fmt:message key="activity.title" />
+	</title>
+	
+	<lams:css/>
+	
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+</lams:head>
+<body class="stripes">
+	<c:set var="title">
+		<fmt:message key="heading.notebookEntry" />
+	</c:set>
+	<lams:Page title="${title}" type="monitor">
+		<h4>
+			<c:out value="${userDTO.firstName} ${userDTO.lastName}" escapeXml="true"/>
+		</h4>
+	
+		<table class="table table-striped table-condensed">
+			<tr>
+				<td>
+					<fmt:message key="label.created" />
+				</td>
+				<td>
+					<lams:Date value="${userDTO.notebookEntryDTO.createDate }"></lams:Date>
+	
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="label.lastModified" />
+				</td>
+				<td>
+					<lams:Date value="${userDTO.notebookEntryDTO.lastModified }"></lams:Date>
+				</td>
+			</tr>
+	
+			<tr>
+				<td>
+					<fmt:message key="label.notebookEntry" />
+				</td>
+				<td>
+					<lams:out value="${userDTO.notebookEntryDTO.entry}" escapeHtml="true"/>
+				</td>
+			</tr>
+		</table>
+	
+		 <a href="javascript:history.back();" class="btn btn-sm btn-primary">
+		 	<fmt:message key="button.close"/>
+		 </a>
+	
+	</lams:Page>
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_tool_zoom/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rfba5bdf4505b4dbe6d95809740ac8f3c14b07ef1 -rcd28f26327e5afe5f9797847d801eba0abab9144
--- lams_tool_zoom/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision fba5bdf4505b4dbe6d95809740ac8f3c14b07ef1)
+++ lams_tool_zoom/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
@@ -19,11 +19,11 @@
 </div>
 
 
-<html:form action="monitoring"  target="zoomMonitor${dto.toolContentId}" onsubmit="window.open('', 'zoomMonitor${dto.toolContentId}', 'resizable=yes,scrollbars=yes')"> 
-	<html:hidden property="dispatch" value="startMeeting" />
-	<html:hidden property="toolContentID" value="${dto.toolContentId}" />
-	<html:submit styleClass="btn btn-primary"><fmt:message key="label.monitoring.startConference" /></html:submit>
-</html:form>
+<form action="/monitoring/startMeeting.do" target="zoomMonitor${dto.toolContentId}"
+	  onsubmit="window.open('', 'zoomMonitor${dto.toolContentId}', 'resizable=yes,scrollbars=yes')"> 
+	<input type="hidden" name="toolContentID" value="${dto.toolContentId}" />
+	<button type="submit" class="btn btn-primary"><fmt:message key="label.monitoring.startConference" /></button>
+</form>
 
 <div class="voffset5">&nbsp;</div>
 <c:if test="${dto.reflectOnActivity}">
@@ -50,8 +50,7 @@
 							</c:when>
 	
 							<c:otherwise>
-								<a
-									href="./monitoring.do?dispatch=openNotebook&amp;userUID=${user.uid}">
+								<a href="./monitoring/openNotebook.do?userUID=${user.uid}">
 									<fmt:message key="label.view" /> </a>
 							</c:otherwise>
 						</c:choose>