Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -15,14 +15,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<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>
Index: lams_central/web/WEB-INF/applicationContext.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_central/web/WEB-INF/applicationContext.xml	(.../applicationContext.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/WEB-INF/applicationContext.xml	(.../applicationContext.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -4,7 +4,6 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
-<beans>
 <!-- 
 	Even though this bean list is empty, this file MUST not be deleted,
 	otherwise there will be errors when creating shared application context.
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -10,38 +10,7 @@
 		</param-value>
 	</context-param>
 
-	<!-- In LAMS 2.3 there was a change in this section in all tools and core 
-		parts (central, learning, monitoring etc.) All LAMS web application now use 
-		shared application context. See refBeanContext.xml file in lams_common for 
-		its description. This refBeanContext.xml contains definition of the shared 
-		context. It is located by this entry: <context-param> <param-name>locatorFactorySelector</param-name> 
-		<param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value> 
-		</context-param> telling to look for refBeanContext.xml files in selected 
-		part of the classpath. Currently LAMS has only one refBeanContext.xml with 
-		one shared context definition. Lams_central uses only beans from the shared 
-		context "context.central". That is why there is no value in contextConfigLocation. 
-		Even so, this parameter needs to be declared with empty value for locatorFactorySelector 
-		to work properly. Also, if no local application context file is declare, 
-		there MUST be a file named "applicationContext.xml" in web/WEB-INF containing 
-		empty bean list, otherwise there will be errors during start up. If there 
-		are local (private for web application; see tools and admin for example) 
-		bean definitions, path to application context XML file can still be added 
-		to contextConfigLocation. -->
-
 	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<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>
-	<context-param>
         <param-name>Owasp.CsrfGuard.Config</param-name>
         <param-value>WEB-INF/Owasp.CsrfGuard.properties</param-value>
     </context-param>
Index: lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml	(.../beanRefContext.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml	(.../beanRefContext.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -3,42 +3,43 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
-	<!-- This file contains definitions for BeanFactoryLocator. It is used to create a single parent application context
-		 for all LAMS modules to use. It scans classpath looking for the listed XML files with bean definitions.
-		 Each LAMS module references this parent context locatorFactorySelector and parentContextKey parameters.
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd">
+	<!-- This file contains bean definitions for LAMS global application context.
+		 It is used to create a single parent application context for all LAMS modules.
+		 It scans classpath looking for the listed XML files with bean definitions.
+		 Each LAMS module references this parent via LamsContextLoaderListener.
 		 
 		 In addition to XML files listed here LAMS uses autopatchContext.xml and spring-servlet.xml files.
 	
 		 In Spring 5 BeanFactoryLocator was considered obsolete and was removed.
-		 It was manually reintroduced to LAMS code.
+		 LamsContextLoaderListener mimics its function.
 	 -->
 	 
 	<bean id="context.central"
          class="org.springframework.context.support.ClassPathXmlApplicationContext">
-     <constructor-arg>
-       <list>
-       		<value>/org/lamsfoundation/lams/applicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/toolApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/comments/commentsContext.xml</value>
-			<value>/org/lamsfoundation/lams/contentrepository/applicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/learning/learningApplicationContext.xml</value>
-			
-			<value>classpath*:org/lamsfoundation/lams/tool/**/*pplicationContext.xml</value>
-			<value>classpath*:org/eucm/lams/tool/**/*pplicationContext.xml</value>
-			
-			<value>/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/web/webApplicationContext.xml</value>
-			<value>/org/lamsfoundation/lams/integrationContext.xml</value>
-			<value>/org/lamsfoundation/lams/usermanagement/ldapContext.xml</value>
-			<value>/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml</value>
-			
-			<!-- Extra entry for LAMS subprojects that are not in the standard build -->
-			<value>classpath*:org/lamsfoundation/lams/**/optionalModuleApplicationContext.xml</value>
-			
-       </list>
-	 </constructor-arg>
+	     <constructor-arg>
+	       <list>
+	       		<value>/org/lamsfoundation/lams/applicationContext.xml</value>
+				<value>/org/lamsfoundation/lams/toolApplicationContext.xml</value>
+				<value>/org/lamsfoundation/lams/comments/commentsContext.xml</value>
+				<value>/org/lamsfoundation/lams/contentrepository/applicationContext.xml</value>
+				<value>/org/lamsfoundation/lams/learning/learningApplicationContext.xml</value>
+				
+				<value>classpath*:org/lamsfoundation/lams/tool/**/*pplicationContext.xml</value>
+				<value>classpath*:org/eucm/lams/tool/**/*pplicationContext.xml</value>
+				
+				<value>/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml</value>
+				<value>/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml</value>
+				<value>/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml</value>
+				<value>/org/lamsfoundation/lams/web/webApplicationContext.xml</value>
+				<value>/org/lamsfoundation/lams/integrationContext.xml</value>
+				<value>/org/lamsfoundation/lams/usermanagement/ldapContext.xml</value>
+				<value>/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml</value>
+				
+				<!-- Extra entry for LAMS subprojects that are not in the standard build -->
+				<value>classpath*:org/lamsfoundation/lams/**/optionalModuleApplicationContext.xml</value>
+				
+	       </list>
+		 </constructor-arg>
 	</bean>
 </beans>
\ No newline at end of file
Fisheye: Tag 9986a8084b318ccc9c025ec56407dc09a705dd60 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/BeanFactoryLocator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9986a8084b318ccc9c025ec56407dc09a705dd60 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/BeanFactoryReference.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9986a8084b318ccc9c025ec56407dc09a705dd60 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/BootstrapException.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9986a8084b318ccc9c025ec56407dc09a705dd60 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/ContextSingletonBeanFactoryLocator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9986a8084b318ccc9c025ec56407dc09a705dd60 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/SingletonBeanFactoryLocator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/web/filter/LamsContextLoaderListener.java
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_common/src/java/org/lamsfoundation/lams/web/filter/LamsContextLoaderListener.java	(.../LamsContextLoaderListener.java)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_common/src/java/org/lamsfoundation/lams/web/filter/LamsContextLoaderListener.java	(.../LamsContextLoaderListener.java)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -2,13 +2,8 @@
 
 import javax.servlet.ServletContext;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.lamsfoundation.lams.context.BeanFactoryLocator;
-import org.lamsfoundation.lams.context.BeanFactoryReference;
-import org.lamsfoundation.lams.context.ContextSingletonBeanFactoryLocator;
 import org.springframework.context.ApplicationContext;
-import org.springframework.web.context.ContextLoader;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.web.context.ContextLoaderListener;
 
 /**
@@ -17,29 +12,21 @@
  * @author Marcin Cieslak
  */
 public class LamsContextLoaderListener extends ContextLoaderListener {
-    public static final String LOCATOR_FACTORY_SELECTOR_PARAM = "locatorFactorySelector";
-    public static final String LOCATOR_FACTORY_KEY_PARAM = "parentContextKey";
-    private BeanFactoryReference parentContextRef;
+    private static ApplicationContext parentContext;
 
+    private static final String PARENT_CONTEXT_XML_LOCATION = "classpath:/org/lamsfoundation/lams/beanRefContext.xml";
+    private static final String PARENT_CONTEXT_NAME = "context.central";
+
     @Override
     protected ApplicationContext loadParentContext(ServletContext servletContext) {
-	ApplicationContext parentContext = null;
-	String locatorFactorySelector = servletContext.getInitParameter(LOCATOR_FACTORY_SELECTOR_PARAM);
-	String parentContextKey = servletContext.getInitParameter(LOCATOR_FACTORY_KEY_PARAM);
+	return LamsContextLoaderListener.loadParentContext();
+    }
 
-	if (parentContextKey != null) {
-	    // locatorFactorySelector may be null, indicating the default "classpath*:beanRefContext.xml"
-	    BeanFactoryLocator locator = ContextSingletonBeanFactoryLocator.getInstance(locatorFactorySelector);
-	    Log logger = LogFactory.getLog(ContextLoader.class);
-	    if (logger.isDebugEnabled()) {
-		logger.debug("Getting parent context definition: using parent context key of '" + parentContextKey
-			+ "' with BeanFactoryLocator");
-	    }
-	    this.parentContextRef = locator.useBeanFactory(parentContextKey);
-	    parentContext = (ApplicationContext) this.parentContextRef.getFactory();
+    private static synchronized ApplicationContext loadParentContext() {
+	if (parentContext == null) {
+	    parentContext = new ClassPathXmlApplicationContext(PARENT_CONTEXT_XML_LOCATION);
+	    parentContext = (ApplicationContext) parentContext.getBean(PARENT_CONTEXT_NAME);
 	}
-
 	return parentContext;
     }
-
 }
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_gradebook/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_gradebook/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -16,14 +16,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.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>
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -13,19 +13,6 @@
 		<param-value>monitoringMessageSource</param-value>
 	</context-param>
 
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<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>
-
 	<listener>
 		<listener-class>
 			org.lamsfoundation.lams.web.filter.LamsContextLoaderListener
Index: lams_monitoring/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -13,19 +13,6 @@
 		<param-value>monitoringMessageSource</param-value>
 	</context-param>
 
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<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>
 		<filter-class>
Index: lams_tool_assessment/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -16,14 +16,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.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>
 
 	<listener>
 		<listener-class>
Index: lams_tool_bbb/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_bbb/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_bbb/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -8,15 +8,6 @@
 		Web Conference
 	</description>
 
-	<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>
-
 	<listener>
 		<listener-class>
 			org.lamsfoundation.lams.web.filter.LamsContextLoaderListener
Index: lams_tool_chat/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -12,14 +12,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/chat/dbupdates/autopatchContext.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>
 
 	<filter>
 		<filter-name>SystemSessionFilter</filter-name>
Index: lams_tool_daco/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_daco/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_daco/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -16,14 +16,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/daco/dbupdates/autopatchContext.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>
 
 	<listener>
 		<listener-class>
Index: lams_tool_dimdim/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_dimdim/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_dimdim/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -8,15 +8,6 @@
 		Dimdim tool
 	</description>
 
-	<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>
-
 	<listener>
 		<listener-class>
 			org.lamsfoundation.lams.web.filter.LamsContextLoaderListener
Index: lams_tool_doku/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_doku/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_doku/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -16,14 +16,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/dokumaran/dbupdates/autopatchContext.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>
 
 	<listener>
 		<listener-class>
Index: lams_tool_eadventure/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_eadventure/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_eadventure/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -8,15 +8,6 @@
 		Eadventure tool
 	</description>
 
-	<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>
-
 	<listener>
 		<listener-class>
 			org.lamsfoundation.lams.web.filter.LamsContextLoaderListener
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -15,14 +15,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/forum/dbupdates/autopatchContext.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>
     
 	<filter>
 		<filter-name>hibernateFilter</filter-name>
Index: lams_tool_gmap/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_gmap/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_gmap/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -8,15 +8,6 @@
 		Gmap tool
 	</description>
 
-	<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>
-
 	<listener>
 		<listener-class>
 			org.lamsfoundation.lams.web.filter.LamsContextLoaderListener
Index: lams_tool_images/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_images/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_images/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -16,14 +16,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/imageGallery/dbupdates/autopatchContext.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>
 
 	<listener>
 		<listener-class>
Index: lams_tool_imscc/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_imscc/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_imscc/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -16,14 +16,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/autopatchContext.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>
 
 	<listener>
 		<listener-class>
Index: lams_tool_kaltura/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_kaltura/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_kaltura/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -9,15 +9,6 @@
 		Kaltura tool
 	</description>
 	
-	<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>
 		<filter-class>
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -12,14 +12,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.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>
 
 	<filter>
 		<filter-name>SystemSessionFilter</filter-name>
Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -13,14 +13,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/qa/dbupdates/autopatchContext.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>
 
 	<filter>
 		<filter-name>SystemSessionFilter</filter-name>
Index: lams_tool_larsrc/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -16,24 +16,12 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/rsrc/dbupdates/autopatchContext.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>
 
 	<listener>
 		<listener-class>
 			org.lamsfoundation.lams.web.filter.LamsContextLoaderListener
 		</listener-class>
     </listener>
-    <filter>
-        <filter-name>CSRFGuard</filter-name>
-        <filter-class>org.owasp.csrfguard.CsrfGuardFilter</filter-class>
-    </filter>
 
 	<filter>
 		<filter-name>hibernateFilter</filter-name>
@@ -99,7 +87,7 @@
 		<servlet-class>
 			org.springframework.web.servlet.DispatcherServlet
 		</servlet-class>
-				<load-on-startup>1</load-on-startup>
+		<load-on-startup>1</load-on-startup>
 	</servlet>
 
 	<servlet>
Index: lams_tool_leader/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_leader/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_leader/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -13,14 +13,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/leaderselection/dbupdates/autopatchContext.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>
 
 	<filter>
 		<filter-name>SystemSessionFilter</filter-name>
Index: lams_tool_mindmap/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_mindmap/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_mindmap/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -16,16 +16,6 @@
 		</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>
 		<filter-class>
Index: lams_tool_nb/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -14,16 +14,6 @@
 		<param-value>classpath:/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.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>
-
 	<listener>
 		<listener-class>
 			org.lamsfoundation.lams.web.filter.LamsContextLoaderListener
Index: lams_tool_notebook/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -14,14 +14,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/notebook/dbupdates/autopatchContext.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>
 
 	<filter>
 		<filter-name>SystemSessionFilter</filter-name>
Index: lams_tool_pixlr/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_pixlr/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_pixlr/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -12,14 +12,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/pixlr/dbupdates/autopatchContext.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>
 
 	<filter>
 		<filter-name>SystemSessionFilter</filter-name>
Index: lams_tool_preview/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_preview/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_preview/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -15,14 +15,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/peerreview/dbupdates/autopatchContext.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>
 
 	<filter>
 		<filter-name>hibernateFilter</filter-name>
Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -11,14 +11,6 @@
 		<param-value>classpath:/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.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>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
 		<param-value>org.lamsfoundation.lams.tool.sbmt.ApplicationResources</param-value>
 	</context-param>
Index: lams_tool_scratchie/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_scratchie/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_scratchie/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -16,14 +16,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.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>
 
 	<listener>
 		<listener-class>
Index: lams_tool_scribe/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_scribe/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_scribe/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -12,14 +12,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/scribe/dbupdates/autopatchContext.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>
 
 	<filter>
 		<filter-name>SystemSessionFilter</filter-name>
Index: lams_tool_spreadsheet/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_spreadsheet/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_spreadsheet/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -16,14 +16,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/autopatchContext.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>
 
 	<listener>
 		<listener-class>
Index: lams_tool_survey/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_survey/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_survey/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -19,15 +19,6 @@
 		<param-value>classpath:/org/lamsfoundation/lams/tool/survey/dbupdates/autopatchContext.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>
 
 	<listener>
 		<listener-class>
Index: lams_tool_task/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_task/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_task/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -16,14 +16,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/taskList/dbupdates/autopatchContext.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>
 
 	<listener>
 		<listener-class>
Index: lams_tool_videorecorder/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_videorecorder/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_videorecorder/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -9,15 +9,6 @@
 		Video Recorder tool
 	</description>
 	
-	<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>
 		<filter-class>
Index: lams_tool_vote/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -22,14 +22,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.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>
 
 	<filter>
 		<filter-name>SystemSessionFilter</filter-name>
Index: lams_tool_whiteboard/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_whiteboard/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_whiteboard/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -16,14 +16,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/whiteboard/dbupdates/autopatchContext.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>
 
 	<listener>
 		<listener-class>
Index: lams_tool_wiki/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_wiki/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_wiki/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -12,14 +12,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.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>
 
 	<filter>
 		<filter-name>SystemSessionFilter</filter-name>
Index: lams_tool_wookie/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_wookie/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_wookie/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -9,15 +9,6 @@
 		Wookie tool
 	</description>
 	
-	<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>
 		<filter-class>
Index: lams_tool_zoom/web/WEB-INF/web.xml
===================================================================
diff -u -r22ae678dec4e0fb8e09b5624fc58e1e5f6890243 -r9986a8084b318ccc9c025ec56407dc09a705dd60
--- lams_tool_zoom/web/WEB-INF/web.xml	(.../web.xml)	(revision 22ae678dec4e0fb8e09b5624fc58e1e5f6890243)
+++ lams_tool_zoom/web/WEB-INF/web.xml	(.../web.xml)	(revision 9986a8084b318ccc9c025ec56407dc09a705dd60)
@@ -22,14 +22,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/zoom/dbupdates/autopatchContext.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>
 
 	<filter>
 		<filter-name>SystemSessionFilter</filter-name>