Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -rcc986867ccf2cb62e83508696af85b0f3f65a0ff -rab7ecf3891aec5852576ebf42c663b7414b1041f
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision cc986867ccf2cb62e83508696af85b0f3f65a0ff)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision ab7ecf3891aec5852576ebf42c663b7414b1041f)
@@ -31,13 +31,18 @@
 <context-param>
 	<param-name>contextConfigLocation</param-name>
 	<param-value>
-		/WEB-INF/spring/dataAccessContext.xml  /WEB-INF/spring/applicationContext.xml /WEB-INF/spring/learningApplicationContext.xml
-		/WEB-INF/spring/lessonApplicationContext.xml /WEB-INF/spring/toolApplicationContext.xml	
-		/WEB-INF/spring/learningDesignApplicationContext.xml		
-		classpath:/org/lamsfoundation/lams/tool/survey/dataAccessContext.xml
-  		classpath:/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	  
+		classpath:/org/lamsfoundation/lams/applicationContext.xml
+		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
+		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
+		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
+		classpath*:applicationContext.xml
 	</param-value>
 </context-param>
+<listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+</listener>	
 
   <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)