Index: lams_tool_daco/.classpath
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8ee7fa8485b72185b59612fa0cd097adf044d8de
--- lams_tool_daco/.classpath	(.../.classpath)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_daco/.classpath	(.../.classpath)	(revision 8ee7fa8485b72185b59612fa0cd097adf044d8de)
@@ -2,10 +2,9 @@
 <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="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-5.0.10.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
-			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/" />
+			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
@@ -17,7 +16,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_contentrepository"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
-	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.2.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.9.2.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
@@ -28,4 +26,6 @@
 	<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="var" path="WILDFLY_HOME/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/jcl-over-slf4j-1.7.7.jbossorg-1.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/noStruts"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/AuthoringController.java
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r8ee7fa8485b72185b59612fa0cd097adf044d8de
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 8ee7fa8485b72185b59612fa0cd097adf044d8de)
@@ -369,6 +369,7 @@
 
 	ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request);
 	authoringForm.setMode(mode.toString());
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 
 	return "pages/authoring/authoring";
     }
Fisheye: Tag 8ee7fa8485b72185b59612fa0cd097adf044d8de refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8ee7fa8485b72185b59612fa0cd097adf044d8de refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tlds/struts/struts-bean-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8ee7fa8485b72185b59612fa0cd097adf044d8de refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tlds/struts/struts-bean.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8ee7fa8485b72185b59612fa0cd097adf044d8de refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tlds/struts/struts-html-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8ee7fa8485b72185b59612fa0cd097adf044d8de refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tlds/struts/struts-html.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8ee7fa8485b72185b59612fa0cd097adf044d8de refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tlds/struts/struts-logic-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8ee7fa8485b72185b59612fa0cd097adf044d8de refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tlds/struts/struts-logic.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8ee7fa8485b72185b59612fa0cd097adf044d8de refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tlds/struts/struts-nested.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8ee7fa8485b72185b59612fa0cd097adf044d8de refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tlds/struts/struts-tiles-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8ee7fa8485b72185b59612fa0cd097adf044d8de refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tlds/struts/struts-tiles.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8ee7fa8485b72185b59612fa0cd097adf044d8de refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/validation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_daco/web/WEB-INF/web.xml
===================================================================
diff -u -r085d47fc4191f2cb614a5a7c8fe3ff6c5abcef0f -r8ee7fa8485b72185b59612fa0cd097adf044d8de
--- lams_tool_daco/web/WEB-INF/web.xml	(.../web.xml)	(revision 085d47fc4191f2cb614a5a7c8fe3ff6c5abcef0f)
+++ lams_tool_daco/web/WEB-INF/web.xml	(.../web.xml)	(revision 8ee7fa8485b72185b59612fa0cd097adf044d8de)
@@ -126,42 +126,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>
Index: lams_tool_daco/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r8ee7fa8485b72185b59612fa0cd097adf044d8de
--- lams_tool_daco/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 8ee7fa8485b72185b59612fa0cd097adf044d8de)
@@ -45,6 +45,7 @@
 			<form:hidden path="sessionMapID" />
 			<form:hidden path="contentFolderID" />
 			<form:hidden path="currentTab" id="currentTab" />
+			<form:hidden path="mode" value="${mode}"/>
 	
 	 		<lams:TabBodys>
 				<!-- tab content 1 (Basic) -->
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java
===================================================================
diff -u -r50e67f677a0db400bbd8eeba754c0e31971d05fb -r8ee7fa8485b72185b59612fa0cd097adf044d8de
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 50e67f677a0db400bbd8eeba754c0e31971d05fb)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 8ee7fa8485b72185b59612fa0cd097adf044d8de)
@@ -559,6 +559,7 @@
 	ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request);
 	startForm.setMode(mode.toString());
 	request.setAttribute("authoringForm", startForm);
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 
 	return "pages/authoring/authoring";
     }
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8ee7fa8485b72185b59612fa0cd097adf044d8de
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 8ee7fa8485b72185b59612fa0cd097adf044d8de)
@@ -70,6 +70,7 @@
 		<form:hidden path="resource.contentId" />
 		<form:hidden path="mode" />
 		<form:hidden path="sessionMapID" />
+		<form:hidden property="mode" value="${mode}"/>
 		<form:hidden path="contentFolderID" />
 		<form:hidden path="currentTab" styleId="currentTab" />
 	
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
===================================================================
diff -u -r085d47fc4191f2cb614a5a7c8fe3ff6c5abcef0f -r8ee7fa8485b72185b59612fa0cd097adf044d8de
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 085d47fc4191f2cb614a5a7c8fe3ff6c5abcef0f)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 8ee7fa8485b72185b59612fa0cd097adf044d8de)
@@ -230,6 +230,7 @@
 
 	ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request);
 	authoringForm.setMode(mode.toString());
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 
 	return "pages/authoring/authoring";
     }
Index: lams_tool_scratchie/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f -r8ee7fa8485b72185b59612fa0cd097adf044d8de
--- lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
+++ lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 8ee7fa8485b72185b59612fa0cd097adf044d8de)
@@ -44,6 +44,7 @@
 		<form:hidden path="scratchie.contentId" />
 		<form:hidden path="sessionMapID" />
 		<form:hidden path="contentFolderID" />
+		<form:hidden property="mode" value="${mode}"/>
 		<form:hidden path="currentTab" id="currentTab" />
 		<input type="hidden" name="itemList" id="itemList" />