Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -r0732f5d12802da95cf69e474b30630653924abc5 -r85d81241e2ed717af5d7a966970e010667a07d37
--- lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
+++ lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 85d81241e2ed717af5d7a966970e010667a07d37)
@@ -10,16 +10,18 @@
   	<param-value>org.lamsfoundation.lams.admin.ApplicationResources</param-value>
 </context-param>
 
-<context-param>
+<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/integrationContext.xml
-		classpath:/org/lamsfoundation/lams/admin/adminApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/usermanagement/ldapContext.xml
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/admin/adminApplicationContext.xml</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>
 
 <context-param>
     <param-name>migration.systemname</param-name>