Index: lams_tool_wiki/web/WEB-INF/web.xml
===================================================================
diff -u -r0732f5d12802da95cf69e474b30630653924abc5 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_wiki/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
+++ lams_tool_wiki/web/WEB-INF/web.xml	(.../web.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -10,16 +10,16 @@
 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-				classpath:/org/lamsfoundation/lams/applicationContext.xml
-	            classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-            	classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml			
-				classpath:/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.xml	
-	</param-value>
+	<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.tool</param-value>
+</context-param>
 
     <filter>
     <filter-name>SystemSessionFilter</filter-name>
@@ -34,7 +34,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>wikiSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
 	<filter>