Index: lams_learning/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r6e6012e68d036f1f92b51051c1d84754ec677efc -rab7ecf3891aec5852576ebf42c663b7414b1041f
--- lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 6e6012e68d036f1f92b51051c1d84754ec677efc)
+++ lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision ab7ecf3891aec5852576ebf42c663b7414b1041f)
@@ -26,10 +26,15 @@
 <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>