Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -ra8e4961c9f59aedf7bbc548462f658ecc539d0ca -r662af4c9490c6c67127cda6c29d7d806a9e9eaca
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision a8e4961c9f59aedf7bbc548462f658ecc539d0ca)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 662af4c9490c6c67127cda6c29d7d806a9e9eaca)
@@ -8,23 +8,16 @@
 
 <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>
 
     <filter>
     <filter-name>SystemSessionFilter</filter-name>