Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
diff -u -r4166df6f6aeb3bf252c4365751108e34b5481f67 -r9afc72ff4f6555b8a6133cb29d597303d12ca5a0
--- lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision 4166df6f6aeb3bf252c4365751108e34b5481f67)
+++ lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision 9afc72ff4f6555b8a6133cb29d597303d12ca5a0)
@@ -8,7 +8,6 @@
 	<param-name>contextConfigLocation</param-name>
 	<param-value>
 		classpath:/org/lamsfoundation/lams/applicationContext.xml
-		classpath:/org/lamsfoundation/lams/commonContext.xml
 		classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	
@@ -62,19 +61,13 @@
      <url-pattern>/*</url-pattern>
   </filter-mapping>
 
-    <!--
-    To use non XDoclet listeners, create a listeners.xml file that
-    contains the additional listeners and place it in your
-    project's merge dir.
-    -->
+  <listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</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>
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
     <init-param>
@@ -93,7 +86,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>