Index: lams_admin/conf/xdoclet/servlets.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/servlets.xml,v
diff -u -r1.1 -r1.2
--- lams_admin/conf/xdoclet/servlets.xml	8 Sep 2005 02:45:20 -0000	1.1
+++ lams_admin/conf/xdoclet/servlets.xml	30 Jun 2006 07:04:04 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/servlets.xml,v
diff -u -r1.7 -r1.8
--- lams_central/conf/xdoclet/servlets.xml	20 Jun 2006 07:23:48 -0000	1.7
+++ lams_central/conf/xdoclet/servlets.xml	30 Jun 2006 07:04:03 -0000	1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/servlets.xml,v
diff -u -r1.8 -r1.9
--- lams_learning/conf/xdoclet/servlets.xml	7 Apr 2006 00:35:19 -0000	1.8
+++ lams_learning/conf/xdoclet/servlets.xml	30 Jun 2006 07:04:05 -0000	1.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/conf/xdoclet/servlets.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_chat/conf/xdoclet/servlets.xml	14 Jun 2006 23:39:54 -0000	1.4
+++ lams_tool_chat/conf/xdoclet/servlets.xml	30 Jun 2006 07:04:05 -0000	1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_example/conf/xdoclet/servlets.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_example/conf/xdoclet/servlets.xml	21 Mar 2006 04:34:56 -0000	1.1
+++ lams_tool_example/conf/xdoclet/servlets.xml	30 Jun 2006 07:04:04 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/listeners.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/conf/xdoclet/listeners.xml	30 Jun 2006 07:07:30 -0000	1.1
@@ -0,0 +1,5 @@
+<listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+</listener>	
Index: lams_tool_forum/conf/xdoclet/servlets.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/servlets.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_forum/conf/xdoclet/servlets.xml	8 Dec 2005 03:04:46 -0000	1.7
+++ lams_tool_forum/conf/xdoclet/servlets.xml	30 Jun 2006 07:04:06 -0000	1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/web.xml,v
diff -u -r1.19 -r1.20
--- lams_tool_lamc/web/WEB-INF/web.xml	14 Jun 2006 14:26:46 -0000	1.19
+++ lams_tool_lamc/web/WEB-INF/web.xml	30 Jun 2006 07:05:48 -0000	1.20
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/web.xml,v
diff -u -r1.22 -r1.23
--- lams_tool_laqa/web/WEB-INF/web.xml	2 Jun 2006 07:55:32 -0000	1.22
+++ lams_tool_laqa/web/WEB-INF/web.xml	30 Jun 2006 07:05:48 -0000	1.23
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/web.xml,v
diff -u -r1.8 -r1.9
--- lams_tool_larsrc/web/WEB-INF/web.xml	3 May 2006 02:15:02 -0000	1.8
+++ lams_tool_larsrc/web/WEB-INF/web.xml	30 Jun 2006 07:05:49 -0000	1.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/conf/xdoclet/listeners.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_nb/conf/xdoclet/listeners.xml	30 Jun 2006 07:07:31 -0000	1.1
@@ -0,0 +1,5 @@
+<listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+</listener>	
Index: lams_tool_nb/conf/xdoclet/servlets.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/conf/xdoclet/servlets.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_nb/conf/xdoclet/servlets.xml	21 Nov 2005 22:27:18 -0000	1.6
+++ lams_tool_nb/conf/xdoclet/servlets.xml	30 Jun 2006 07:04:06 -0000	1.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/listeners.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/conf/xdoclet/listeners.xml	30 Jun 2006 07:07:30 -0000	1.1
@@ -0,0 +1,5 @@
+<listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+</listener>	
Index: lams_tool_sbmt/conf/xdoclet/servlets.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/servlets.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_sbmt/conf/xdoclet/servlets.xml	7 Dec 2005 05:52:32 -0000	1.5
+++ lams_tool_sbmt/conf/xdoclet/servlets.xml	30 Jun 2006 07:04:06 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/web.xml,v
diff -u -r1.8 -r1.9
--- lams_tool_vote/web/WEB-INF/web.xml	13 Jun 2006 17:33:16 -0000	1.8
+++ lams_tool_vote/web/WEB-INF/web.xml	30 Jun 2006 07:05:48 -0000	1.9
@@ -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>