Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java
===================================================================
diff -u -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 -rc50f8841ee2ef0ada48c7678eefb14b8f597ff2c
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java	(.../PedagogicalPlannerActivitySpringForm.java)	(revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java	(.../PedagogicalPlannerActivitySpringForm.java)	(revision c50f8841ee2ef0ada48c7678eefb14b8f597ff2c)
@@ -22,7 +22,7 @@
 
 package org.lamsfoundation.lams.web.planner;
 
-import org.apache.struts.action.ActionMessages;
+import org.springframework.util.LinkedMultiValueMap;
 
 /**
  * The base for any Pedagogical Planner Action Forms that other activities. All Java forms need to inherit from this
@@ -85,9 +85,9 @@
      *
      * @return
      */
-    public ActionMessages validate() {
+    public LinkedMultiValueMap<String, String> validate() {
 	setValid(true);
-	return new ActionMessages();
+	return new LinkedMultiValueMap<>();
     }
 
     public Integer getActivityOrderNumber() {
Index: lams_tool_leader/web/WEB-INF/web.xml
===================================================================
diff -u -rc05d26819a155980f333e1a4aea16afe974119e3 -rc50f8841ee2ef0ada48c7678eefb14b8f597ff2c
--- lams_tool_leader/web/WEB-INF/web.xml	(.../web.xml)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
+++ lams_tool_leader/web/WEB-INF/web.xml	(.../web.xml)	(revision c50f8841ee2ef0ada48c7678eefb14b8f597ff2c)
@@ -66,7 +66,7 @@
 
 	<servlet>
 		<servlet-name>spring</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlett</servlet-class>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 
Index: lams_tool_notebook/.classpath
===================================================================
diff -u -r9218936edd87260de73e773054cb605a336133b1 -rc50f8841ee2ef0ada48c7678eefb14b8f597ff2c
--- lams_tool_notebook/.classpath	(.../.classpath)	(revision 9218936edd87260de73e773054cb605a336133b1)
+++ lams_tool_notebook/.classpath	(.../.classpath)	(revision c50f8841ee2ef0ada48c7678eefb14b8f597ff2c)
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-5.0.10.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/"/>
@@ -27,5 +26,6 @@
 	</classpathentry>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/jackson-core-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/jackson-databind-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/noStruts"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java
===================================================================
diff -u -rb55462c1bed962dba08744bf8ceac6594c3462f2 -rc50f8841ee2ef0ada48c7678eefb14b8f597ff2c
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision b55462c1bed962dba08744bf8ceac6594c3462f2)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision c50f8841ee2ef0ada48c7678eefb14b8f597ff2c)
@@ -33,7 +33,6 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.struts.action.ActionForward;
 import org.lamsfoundation.lams.tool.notebook.dto.NotebookSessionsDTO;
 import org.lamsfoundation.lams.tool.notebook.model.Notebook;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookUser;
@@ -104,7 +103,7 @@
     }
 
     @RequestMapping("/getUsers")
-    public ActionForward getUsers(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    public String getUsers(HttpServletRequest request, HttpServletResponse response) throws IOException {
 
 	Long toolSessionId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
 
Fisheye: Tag c50f8841ee2ef0ada48c7678eefb14b8f597ff2c refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c50f8841ee2ef0ada48c7678eefb14b8f597ff2c refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tiles-defs.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c50f8841ee2ef0ada48c7678eefb14b8f597ff2c refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tlds/struts/struts-bean-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c50f8841ee2ef0ada48c7678eefb14b8f597ff2c refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tlds/struts/struts-bean.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c50f8841ee2ef0ada48c7678eefb14b8f597ff2c refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tlds/struts/struts-html-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c50f8841ee2ef0ada48c7678eefb14b8f597ff2c refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tlds/struts/struts-html.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c50f8841ee2ef0ada48c7678eefb14b8f597ff2c refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tlds/struts/struts-logic-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c50f8841ee2ef0ada48c7678eefb14b8f597ff2c refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tlds/struts/struts-logic.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c50f8841ee2ef0ada48c7678eefb14b8f597ff2c refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tlds/struts/struts-nested.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c50f8841ee2ef0ada48c7678eefb14b8f597ff2c refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tlds/struts/struts-tiles-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c50f8841ee2ef0ada48c7678eefb14b8f597ff2c refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tlds/struts/struts-tiles.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/WEB-INF/web.xml
===================================================================
diff -u -r749b841adf6115016059d15ddfa58aee5b11e26d -rc50f8841ee2ef0ada48c7678eefb14b8f597ff2c
--- lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision 749b841adf6115016059d15ddfa58aee5b11e26d)
+++ lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision c50f8841ee2ef0ada48c7678eefb14b8f597ff2c)
@@ -134,41 +134,6 @@
 	<jsp-config>
 
 		<!-- ======================================================== -->
-		<!-- Struts Tag Library Descriptors -->
-		<!-- ======================================================== -->
-		<taglib>
-			<taglib-uri>tags-bean</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-bean-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
-		</taglib>
-		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
 		<taglib>
Fisheye: Tag c50f8841ee2ef0ada48c7678eefb14b8f597ff2c refers to a dead (removed) revision in file `lams_tool_notebook/web/layouts/layout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c50f8841ee2ef0ada48c7678eefb14b8f597ff2c refers to a dead (removed) revision in file `lams_tool_notebook/web/pages/authoring/headItems.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c50f8841ee2ef0ada48c7678eefb14b8f597ff2c refers to a dead (removed) revision in file `lams_tool_notebook/web/pages/learning/headItems.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c50f8841ee2ef0ada48c7678eefb14b8f597ff2c refers to a dead (removed) revision in file `lams_tool_notebook/web/pages/monitoring/headItems.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?