Index: lams_central/conf/xdoclet/web-settings.xml
===================================================================
diff -u -ra8e4961c9f59aedf7bbc548462f658ecc539d0ca -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_central/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision a8e4961c9f59aedf7bbc548462f658ecc539d0ca)
+++ lams_central/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -5,21 +5,13 @@
 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-				classpath:/org/lamsfoundation/lams/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/web/webApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/integrationContext.xml
-				classpath:/org/lamsfoundation/lams/usermanagement/ldapContext.xml
-				classpath:/org/lamsfoundation/lams/gradebook/gradeBookApplicationContext.xml
-				<!--  Needed to communicate with the tools -->
-				classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				
-				<!--  Add tool contexts after this -->
-	</param-value>
+	<param-value></param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>