Index: lams_admin/conf/xdoclet/servlets.xml
===================================================================
diff -u -rcf0f2fa25a0c6ff2116f6a3310292e72beea2c64 -rfdb3e5c043522549d839142cfb3ef4e919913bbd
--- lams_admin/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision cf0f2fa25a0c6ff2116f6a3310292e72beea2c64)
+++ lams_admin/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
@@ -1,10 +1,4 @@
 <servlet>
-	<servlet-name>context</servlet-name>
-	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
-<servlet>
     <servlet-name>action</servlet-name>
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
     <init-param>
@@ -23,5 +17,5 @@
       <param-name>validate</param-name>
       <param-value>true</param-value>
     </init-param>
-    <load-on-startup>2</load-on-startup>
+    <load-on-startup>1</load-on-startup>
 </servlet>
Index: lams_central/conf/xdoclet/servlets.xml
===================================================================
diff -u -rb3da97f5c8cfdd02a2c2cb566dcee601100f3c07 -rfdb3e5c043522549d839142cfb3ef4e919913bbd
--- lams_central/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision b3da97f5c8cfdd02a2c2cb566dcee601100f3c07)
+++ lams_central/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
@@ -1,10 +1,4 @@
 <servlet>
-	<servlet-name>context</servlet-name>
-	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
-<servlet>
     <servlet-name>action</servlet-name>
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
     <init-param>
Index: lams_learning/conf/xdoclet/servlets.xml
===================================================================
diff -u -rfc085e0eda6c46d659c5b98f9ee9e29f495af042 -rfdb3e5c043522549d839142cfb3ef4e919913bbd
--- lams_learning/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
+++ lams_learning/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
@@ -1,9 +1,4 @@
 <servlet>
-	<servlet-name>context</servlet-name>
-	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-<servlet>
     <servlet-name>action</servlet-name>
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
     <init-param>
@@ -22,7 +17,7 @@
       <param-name>validate</param-name>
       <param-value>true</param-value>
     </init-param>
-    <load-on-startup>2</load-on-startup>
+    <load-on-startup>1</load-on-startup>
 </servlet>
 
 <servlet>
Index: lams_tool_chat/conf/xdoclet/servlets.xml
===================================================================
diff -u -rbf784a8c0762cda26d7d4c5af7c51004ec6bcc2b -rfdb3e5c043522549d839142cfb3ef4e919913bbd
--- lams_tool_chat/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision bf784a8c0762cda26d7d4c5af7c51004ec6bcc2b)
+++ lams_tool_chat/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
@@ -1,10 +1,4 @@
 <servlet>
-	<servlet-name>context</servlet-name>
-	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
-<servlet>
 	<servlet-name>action</servlet-name>
 	<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
 	<init-param>
Index: lams_tool_example/conf/xdoclet/servlets.xml
===================================================================
diff -u -rbb7c63e87a565c0227aed9eadb9047da764cfde8 -rfdb3e5c043522549d839142cfb3ef4e919913bbd
--- lams_tool_example/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision bb7c63e87a565c0227aed9eadb9047da764cfde8)
+++ lams_tool_example/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
@@ -1,10 +1,4 @@
 <servlet>
-	<servlet-name>context</servlet-name>
-	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
-<servlet>
     <servlet-name>action</servlet-name>
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
     <init-param>
Index: lams_tool_forum/conf/xdoclet/listeners.xml
===================================================================
diff -u
--- lams_tool_forum/conf/xdoclet/listeners.xml	(revision 0)
+++ lams_tool_forum/conf/xdoclet/listeners.xml	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
@@ -0,0 +1,5 @@
+<listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+</listener>	
Index: lams_tool_forum/conf/xdoclet/servlets.xml
===================================================================
diff -u -rde672e5125377cd876df4bf2e9e624ffcfac30a4 -rfdb3e5c043522549d839142cfb3ef4e919913bbd
--- lams_tool_forum/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision de672e5125377cd876df4bf2e9e624ffcfac30a4)
+++ lams_tool_forum/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
@@ -1,10 +1,4 @@
 <servlet>
-	<servlet-name>context</servlet-name>
-	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
-<servlet>
 		<servlet-name>exportPortfolio</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.tool.forum.web.actions.ExportServlet</servlet-class>
 </servlet>
@@ -28,7 +22,7 @@
       <param-name>validate</param-name>
       <param-value>true</param-value>
     </init-param>
-    <load-on-startup>2</load-on-startup>
+    <load-on-startup>1</load-on-startup>
 </servlet>
 
 <servlet>
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
diff -u -r3d2afa94019913eda4e30f231afcbe8f631ef5a2 -rfdb3e5c043522549d839142cfb3ef4e919913bbd
--- lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 3d2afa94019913eda4e30f231afcbe8f631ef5a2)
+++ lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
@@ -71,12 +71,6 @@
 	</listener>
 
 	<servlet>
-		<servlet-name>context</servlet-name>
-		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	
-	<servlet>
 	    <servlet-name>action</servlet-name>
 	    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
 	    <init-param>
@@ -95,7 +89,7 @@
 	      <param-name>validate</param-name>
 	      <param-value>true</param-value>
 	    </init-param>
-	    <load-on-startup>2</load-on-startup>
+	    <load-on-startup>1</load-on-startup>
     </servlet>
 
 	<servlet>
Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
diff -u -raf3906ba75d798954fca027bea336bb842d8b976 -rfdb3e5c043522549d839142cfb3ef4e919913bbd
--- lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision af3906ba75d798954fca027bea336bb842d8b976)
+++ lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
@@ -70,12 +70,6 @@
 	 		org.lamsfoundation.lams.web.SessionListener
 	 	</listener-class>
 	</listener>
-
-	<servlet>
-		<servlet-name>context</servlet-name>
-		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
 	
 	<servlet>
 	    <servlet-name>action</servlet-name>
@@ -96,7 +90,7 @@
 	      <param-name>validate</param-name>
 	      <param-value>true</param-value>
 	    </init-param>
-	    <load-on-startup>2</load-on-startup>
+	    <load-on-startup>1</load-on-startup>
     </servlet>
 
 	<servlet>
Index: lams_tool_larsrc/web/WEB-INF/web.xml
===================================================================
diff -u -r4cf31b82e939a11c1f054a96ff07a650300b289f -rfdb3e5c043522549d839142cfb3ef4e919913bbd
--- lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision 4cf31b82e939a11c1f054a96ff07a650300b289f)
+++ lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
@@ -74,12 +74,6 @@
     project's merge dir.
     -->
 
- <servlet>
-	<servlet-name>context</servlet-name>
-	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <servlet>
 		<servlet-name>exportPortfolio</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.tool.rsrc.web.servlet.ExportServlet</servlet-class>
@@ -98,7 +92,7 @@
     </init-param>
     <init-param>
       <param-name>detail</param-name>
-      <param-value>2</param-value>
+      <param-value>1</param-value>
     </init-param>
     <init-param>
       <param-name>validate</param-name>
Index: lams_tool_nb/conf/xdoclet/listeners.xml
===================================================================
diff -u
--- lams_tool_nb/conf/xdoclet/listeners.xml	(revision 0)
+++ lams_tool_nb/conf/xdoclet/listeners.xml	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
@@ -0,0 +1,5 @@
+<listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+</listener>	
Index: lams_tool_nb/conf/xdoclet/servlets.xml
===================================================================
diff -u -r96cf45593171547d09ab2eefa67f191503418e6a -rfdb3e5c043522549d839142cfb3ef4e919913bbd
--- lams_tool_nb/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 96cf45593171547d09ab2eefa67f191503418e6a)
+++ lams_tool_nb/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
@@ -1,23 +1,4 @@
-    <!--
-	  - Loads the root application context of this web app at startup,
-	  - by default from "/WEB-INF/applicationContext.xml".
-		- Note that it is preferable to use ContextLoaderListener in a servlet container
-		- that follows the Servlet 2.4 initialization order (most Servlet 2.3 containers do).
-		-
-	  - Use WebApplicationContextUtils.getWebApplicationContext(servletContext)
-	  - to access it anywhere in the web application, outside of the framework.
-	  -
-	  - The root context is the parent of all servlet-specific contexts.
-	  - This means that its beans are automatically available in these child contexts,
-	  - both for getBean(name) calls and (external) bean references.
-	-->
 	<servlet>
-		<servlet-name>context</servlet-name>
-		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
 	    <servlet-name>action</servlet-name>
 	    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
 	    <init-param>
@@ -36,7 +17,7 @@
 	      <param-name>validate</param-name>
 	      <param-value>true</param-value>
 	    </init-param>
-	    <load-on-startup>2</load-on-startup>
+	    <load-on-startup>1</load-on-startup>
     </servlet>
  
 <!--  The download servlet, reused from the content repository jar -->
Index: lams_tool_sbmt/conf/xdoclet/listeners.xml
===================================================================
diff -u
--- lams_tool_sbmt/conf/xdoclet/listeners.xml	(revision 0)
+++ lams_tool_sbmt/conf/xdoclet/listeners.xml	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
@@ -0,0 +1,5 @@
+<listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+</listener>	
Index: lams_tool_sbmt/conf/xdoclet/servlets.xml
===================================================================
diff -u -r962c5c1d7944295ea119ff346b96f2bcd8f49d9d -rfdb3e5c043522549d839142cfb3ef4e919913bbd
--- lams_tool_sbmt/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 962c5c1d7944295ea119ff346b96f2bcd8f49d9d)
+++ lams_tool_sbmt/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
@@ -1,10 +1,4 @@
 <servlet>
-	<servlet-name>context</servlet-name>
-	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
-<servlet>
     <servlet-name>action</servlet-name>
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
     <init-param>
@@ -23,7 +17,7 @@
       <param-name>validate</param-name>
       <param-value>true</param-value>
     </init-param>
-    <load-on-startup>2</load-on-startup>
+    <load-on-startup>1</load-on-startup>
 </servlet>
 
 <servlet>
Index: lams_tool_vote/web/WEB-INF/web.xml
===================================================================
diff -u -r73ed8a0a0d5fa96ffce05fb414831b759b9c000c -rfdb3e5c043522549d839142cfb3ef4e919913bbd
--- lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 73ed8a0a0d5fa96ffce05fb414831b759b9c000c)
+++ lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
@@ -91,12 +91,6 @@
 	</listener>
 
 	<servlet>
-		<servlet-name>context</servlet-name>
-		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	
-	<servlet>
 	    <servlet-name>action</servlet-name>
 	    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
 	    <init-param>
@@ -115,7 +109,7 @@
 	      <param-name>validate</param-name>
 	      <param-value>true</param-value>
 	    </init-param>
-	    <load-on-startup>2</load-on-startup>
+	    <load-on-startup>1</load-on-startup>
     </servlet>
 
 	<servlet>