Index: lams_tool_assessment/web/WEB-INF/web.xml
===================================================================
diff -u -r4699ed19bbb2258d801593d57434f0992c9eb5dd -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision 4699ed19bbb2258d801593d57434f0992c9eb5dd)
+++ lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -9,17 +9,18 @@
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
 	<param-value>org.lamsfoundation.lams.tool.assessment.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/contentrepository/applicationContext.xml
-		classpath:/org/lamsfoundation/lams/toolApplicationContext.xml	
-		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	
-		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml	
-  		classpath:/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
-	</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>
 
 <listener>
 	<listener-class>
@@ -40,7 +41,7 @@
     </filter-class>
     <init-param>
       <param-name>sessionFactoryBeanName</param-name>
-      <param-value>assessmentSessionFactory</param-value>
+      <param-value>coreSessionFactory</param-value>
     </init-param>
    </filter>
    <!-- System session filter -->