Index: lams_central/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- lams_central/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_central/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -3,6 +3,25 @@
   	<param-value>org.lamsfoundation.lams.central.ApplicationResources</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 parts 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>
Index: lams_central/web/WEB-INF/applicationContext.xml
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- lams_central/web/WEB-INF/applicationContext.xml	(.../applicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_central/web/WEB-INF/applicationContext.xml	(.../applicationContext.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
+<!-- 
+	Even though this bean list is empty, this file MUST not be deleted,
+	otherwise there will be errors when creating shared application context.
+	The same goes for all web applications that do not declare any private application context XML files.
+	In each of them there must be a file named "applicationContext.xml" with an empty bean definition list.
+ -->
 </beans>
Index: lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml	(.../beanRefContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml	(.../beanRefContext.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -1,7 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
-   <bean id="context.central"
+	<!-- This file contains bean definitions that are application contexts. Currently there is single refBeanContext.xml file,
+		 but there can be several of them in classpath. If so, they will be collected by locatorFactorySelector
+		 and put together, creating one definition of beans.
+		 Each bean takes a list of XML files as a constructor argument. These XML files are "real" application context files -
+		 - they contain definitions of service, DAO etc. beans. Each bean in refBeanContext.xml is an application context
+		 containing in result all beans from the listed XML files.
+		 Each bean from this file is a singleton, meaning that these large application contexts are created only once,
+		 at start up.
+		 Beans from this file can be used as parent contexts for web applications like LAMS tools.
+		 Each web application declaring the same parent context uses the same, shared beans. These shared beans are services used
+		 by all web applications. Sharing application contexts allows avoiding replication of common services.
+		 
+		 In LAMS there is currently only one shared application context: "context.central". It contains all service and tool
+		 beans definitions - virtually everything there is, except for some local beans like tools' DB update service
+		 or admin beans.
+		 All tools and core services use this bean as parent context.
+		 Previously each tool created its own set of core services, which resulted in excess memory consumption.
+		 Now all beans are only in one copy and shared among different parts of LAMS system.
+		 
+		 Beans in this file support inheritance, but in Spring 1.2.8 there is a bug(?) which prevents from accessing beans
+		 in programatic way from inheriting application context beans - only beans from the top of bean hierarchy were accessible.
+		 This forces usage of only one shared context bean.
+		 
+		 This entry:
+		 <value>classpath*:org/lamsfoundation/lams/tool/**/*pplicationContext.xml</value>
+		 collects all application context files from all deployed lams tools.
+		 
+		 If new application context file is used in development and its beans need to be added to shared context,
+		 just add it to the end (or wherever it is suitable) of the list.
+	 -->
+	<bean id="context.central"
          class="org.springframework.context.support.ClassPathXmlApplicationContext">
      <constructor-arg>
        <list>
@@ -18,6 +48,6 @@
 			<value>/org/lamsfoundation/lams/integrationContext.xml</value>
 			<value>/org/lamsfoundation/lams/usermanagement/ldapContext.xml</value>
        </list>
-     </constructor-arg>
-   </bean>
+	 </constructor-arg>
+	</bean>
 </beans>
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -12,7 +12,9 @@
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
 
- 	<!-- Hibernate SessionFactory -->
+ 	<!-- Hibernate SessionFactory. Since LAMS 2.3 it is used in all tools and other parts of LAMS,
+ 		 rather than several local Session Factiories.
+ 	-->
 	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="dataSource"><ref bean="dataSource"/></property>
 		<property name="mappingLocations">
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
===================================================================
diff -u -r70a60f2862830ca6bd07e2b1252af3d79e4939af -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql	(.../patch0015_updateFrom22.sql)	(revision 70a60f2862830ca6bd07e2b1252af3d79e4939af)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql	(.../patch0015_updateFrom22.sql)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -71,6 +71,9 @@
 	, PRIMARY KEY (activity_evaluation_id)
 )TYPE=InnoDB;
 
+-- LDEV-2174 -------------
+ALTER TABLE lams_tool DROP COLUMN classpath_addition, context_file;
+
 ----------------------Put all sql statements above here-------------------------
 
 -- If there were no errors, commit and restore autocommit to on
Index: tool_adapters/dotlrn/lams_tool_dlforum/conf/xdoclet/filters.xml
===================================================================
diff -u -r8d072a352b5fc25f73957ce4c9230b644f2af15d -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/dotlrn/lams_tool_dlforum/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 8d072a352b5fc25f73957ce4c9230b644f2af15d)
+++ tool_adapters/dotlrn/lams_tool_dlforum/conf/xdoclet/filters.xml	(.../filters.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>dotLRNForumSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: tool_adapters/dotlrn/lams_tool_dlforum/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r8d072a352b5fc25f73957ce4c9230b644f2af15d -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/dotlrn/lams_tool_dlforum/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 8d072a352b5fc25f73957ce4c9230b644f2af15d)
+++ tool_adapters/dotlrn/lams_tool_dlforum/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -7,14 +7,13 @@
 
 <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/integrationContext.xml
-            	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/dlfrum/dotLRNForumApplicationContext.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>
Index: tool_adapters/dotlrn/lams_tool_dlforum/db/sql/tool_insert.sql
===================================================================
diff -u -r8d072a352b5fc25f73957ce4c9230b644f2af15d -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/dotlrn/lams_tool_dlforum/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 8d072a352b5fc25f73957ce4c9230b644f2af15d)
+++ tool_adapters/dotlrn/lams_tool_dlforum/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -26,8 +26,6 @@
 help_url,
 admin_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 ext_lms_id,
@@ -59,8 +57,6 @@
 'http://wiki.lamsfoundation.org/display/lamsdocs/dlfrum10',
 'tool/dlfrum10/dlfrum10admin.do',
 'org.lamsfoundation.lams.tool.dlfrum.ApplicationResources',
-'lams-tool-dlfrum10.jar',
-'/org/lamsfoundation/lams/tool/dlfrum/dotLRNForumApplicationContext.xml',
 NOW(),
 NOW(),
 'dotLRN',
Index: tool_adapters/dotlrn/lams_tool_dlforum/src/java/org/lamsfoundation/lams/tool/dlfrum/dotLRNForumApplicationContext.xml
===================================================================
diff -u -r8d072a352b5fc25f73957ce4c9230b644f2af15d -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/dotlrn/lams_tool_dlforum/src/java/org/lamsfoundation/lams/tool/dlfrum/dotLRNForumApplicationContext.xml	(.../dotLRNForumApplicationContext.xml)	(revision 8d072a352b5fc25f73957ce4c9230b644f2af15d)
+++ tool_adapters/dotlrn/lams_tool_dlforum/src/java/org/lamsfoundation/lams/tool/dlfrum/dotLRNForumApplicationContext.xml	(.../dotLRNForumApplicationContext.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -10,19 +10,6 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<!-- Hibernate SessionFactory -->
-	  <bean id="dotLRNForumSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/tool/dlfrum/model/DotLRNForum.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/dlfrum/model/DotLRNForumSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/dlfrum/model/DotLRNForumUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/dlfrum/model/DotLRNForumConfigItem.hbm.xml</value> 
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="dotLRNForumService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -67,19 +54,19 @@
 	
 	<!--  DAO classes -->
 	<bean id="dotLRNForumDAO" class="org.lamsfoundation.lams.tool.dlfrum.dao.hibernate.DotLRNForumDAO">
-		<property name="sessionFactory"><ref local="dotLRNForumSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 	
 	<bean id="dotLRNForumConfigItemDAO" class="org.lamsfoundation.lams.tool.dlfrum.dao.hibernate.DotLRNForumConfigItemDAO">
-		<property name="sessionFactory"><ref local="dotLRNForumSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean> 
 
 	<bean id="dotLRNForumSessionDAO" class="org.lamsfoundation.lams.tool.dlfrum.dao.hibernate.DotLRNForumSessionDAO">
-		<property name="sessionFactory"><ref local="dotLRNForumSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="dotLRNForumUserDAO" class="org.lamsfoundation.lams.tool.dlfrum.dao.hibernate.DotLRNForumUserDAO">
-		<property name="sessionFactory"><ref local="dotLRNForumSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="dotLRNForumToolContentHandler" class="org.lamsfoundation.lams.tool.dlfrum.util.DotLRNForumToolContentHandler">
Index: tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/applicationContext.xml
===================================================================
diff -u
--- tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/applicationContext.xml	(revision 0)
+++ tool_adapters/dotlrn/lams_tool_dlforum/web/WEB-INF/applicationContext.xml	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+</beans>
Index: tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/filters.xml
===================================================================
diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85)
+++ tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/filters.xml	(.../filters.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>mdlAssignmentSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85)
+++ tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -7,14 +7,15 @@
 
 <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/integrationContext.xml
-            	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/mdasgm/mdlAssignmentApplicationContext.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>
 
+
Index: tool_adapters/moodle/lams_tool_mdlassignment/db/sql/tool_insert.sql
===================================================================
diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlassignment/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85)
+++ tool_adapters/moodle/lams_tool_mdlassignment/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -26,8 +26,6 @@
 help_url,
 admin_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 ext_lms_id,
@@ -59,8 +57,6 @@
 'http://wiki.lamsfoundation.org/display/lamsdocs/mdasgm10',
 'tool/mdasgm10/mdasgm10admin.do',
 'org.lamsfoundation.lams.tool.mdasgm.ApplicationResources',
-'lams-tool-mdasgm10.jar',
-'/org/lamsfoundation/lams/tool/mdasgm/mdlAssignmentApplicationContext.xml',
 NOW(),
 NOW(),
 'moodle',
Index: tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/mdlAssignmentApplicationContext.xml
===================================================================
diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/mdlAssignmentApplicationContext.xml	(.../mdlAssignmentApplicationContext.xml)	(revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85)
+++ tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/mdlAssignmentApplicationContext.xml	(.../mdlAssignmentApplicationContext.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -10,19 +10,6 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<!-- Hibernate SessionFactory -->
-	  <bean id="mdlAssignmentSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/tool/mdasgm/model/MdlAssignment.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdasgm/model/MdlAssignmentSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdasgm/model/MdlAssignmentUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdasgm/model/MdlAssignmentConfigItem.hbm.xml</value> 
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="mdlAssignmentService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -67,19 +54,19 @@
 	
 	<!--  DAO classes -->
 	<bean id="mdlAssignmentDAO" class="org.lamsfoundation.lams.tool.mdasgm.dao.hibernate.MdlAssignmentDAO">
-		<property name="sessionFactory"><ref local="mdlAssignmentSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 	
 	<bean id="mdlAssignmentConfigItemDAO" class="org.lamsfoundation.lams.tool.mdasgm.dao.hibernate.MdlAssignmentConfigItemDAO">
-		<property name="sessionFactory"><ref local="mdlAssignmentSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean> 
 
 	<bean id="mdlAssignmentSessionDAO" class="org.lamsfoundation.lams.tool.mdasgm.dao.hibernate.MdlAssignmentSessionDAO">
-		<property name="sessionFactory"><ref local="mdlAssignmentSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="mdlAssignmentUserDAO" class="org.lamsfoundation.lams.tool.mdasgm.dao.hibernate.MdlAssignmentUserDAO">
-		<property name="sessionFactory"><ref local="mdlAssignmentSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="mdlAssignmentToolContentHandler" class="org.lamsfoundation.lams.tool.mdasgm.util.MdlAssignmentToolContentHandler">
Index: tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/applicationContext.xml
===================================================================
diff -u
--- tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/applicationContext.xml	(revision 0)
+++ tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/applicationContext.xml	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+</beans>
Index: tool_adapters/moodle/lams_tool_mdlchat/conf/xdoclet/filters.xml
===================================================================
diff -u -r5fa2b7156e4da1c53222aa8a5eea1594b72665a5 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlchat/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 5fa2b7156e4da1c53222aa8a5eea1594b72665a5)
+++ tool_adapters/moodle/lams_tool_mdlchat/conf/xdoclet/filters.xml	(.../filters.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>mdlChatSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: tool_adapters/moodle/lams_tool_mdlchat/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r5fa2b7156e4da1c53222aa8a5eea1594b72665a5 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlchat/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 5fa2b7156e4da1c53222aa8a5eea1594b72665a5)
+++ tool_adapters/moodle/lams_tool_mdlchat/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -7,14 +7,15 @@
 
 <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/integrationContext.xml
-            	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/mdchat/mdlChatApplicationContext.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>
 
+
Index: tool_adapters/moodle/lams_tool_mdlchat/db/sql/tool_insert.sql
===================================================================
diff -u -r5fa2b7156e4da1c53222aa8a5eea1594b72665a5 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlchat/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 5fa2b7156e4da1c53222aa8a5eea1594b72665a5)
+++ tool_adapters/moodle/lams_tool_mdlchat/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -26,8 +26,6 @@
 help_url,
 admin_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 ext_lms_id,
@@ -59,8 +57,6 @@
 'http://wiki.lamsfoundation.org/display/lamsdocs/mdchat10',
 'tool/mdchat10/mdchat10admin.do',
 'org.lamsfoundation.lams.tool.mdchat.ApplicationResources',
-'lams-tool-mdchat10.jar',
-'/org/lamsfoundation/lams/tool/mdchat/mdlChatApplicationContext.xml',
 NOW(),
 NOW(),
 'moodle',
Index: tool_adapters/moodle/lams_tool_mdlchat/src/java/org/lamsfoundation/lams/tool/mdchat/mdlChatApplicationContext.xml
===================================================================
diff -u -r5fa2b7156e4da1c53222aa8a5eea1594b72665a5 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlchat/src/java/org/lamsfoundation/lams/tool/mdchat/mdlChatApplicationContext.xml	(.../mdlChatApplicationContext.xml)	(revision 5fa2b7156e4da1c53222aa8a5eea1594b72665a5)
+++ tool_adapters/moodle/lams_tool_mdlchat/src/java/org/lamsfoundation/lams/tool/mdchat/mdlChatApplicationContext.xml	(.../mdlChatApplicationContext.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -10,19 +10,6 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<!-- Hibernate SessionFactory -->
-	  <bean id="mdlChatSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/tool/mdchat/model/MdlChat.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdchat/model/MdlChatSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdchat/model/MdlChatUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdchat/model/MdlChatConfigItem.hbm.xml</value> 
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="mdlChatService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -67,19 +54,19 @@
 	
 	<!--  DAO classes -->
 	<bean id="mdlChatDAO" class="org.lamsfoundation.lams.tool.mdchat.dao.hibernate.MdlChatDAO">
-		<property name="sessionFactory"><ref local="mdlChatSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 	
 	<bean id="mdlChatConfigItemDAO" class="org.lamsfoundation.lams.tool.mdchat.dao.hibernate.MdlChatConfigItemDAO">
-		<property name="sessionFactory"><ref local="mdlChatSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean> 
 
 	<bean id="mdlChatSessionDAO" class="org.lamsfoundation.lams.tool.mdchat.dao.hibernate.MdlChatSessionDAO">
-		<property name="sessionFactory"><ref local="mdlChatSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="mdlChatUserDAO" class="org.lamsfoundation.lams.tool.mdchat.dao.hibernate.MdlChatUserDAO">
-		<property name="sessionFactory"><ref local="mdlChatSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="mdlChatToolContentHandler" class="org.lamsfoundation.lams.tool.mdchat.util.MdlChatToolContentHandler">
Index: tool_adapters/moodle/lams_tool_mdlchat/web/WEB-INF/applicationContext.xml
===================================================================
diff -u
--- tool_adapters/moodle/lams_tool_mdlchat/web/WEB-INF/applicationContext.xml	(revision 0)
+++ tool_adapters/moodle/lams_tool_mdlchat/web/WEB-INF/applicationContext.xml	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+</beans>
Index: tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/filters.xml
===================================================================
diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f)
+++ tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/filters.xml	(.../filters.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>mdlChoiceSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f)
+++ tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -7,14 +7,15 @@
 
 <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/integrationContext.xml
-            	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/mdchce/mdlChoiceApplicationContext.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>
 
+
Index: tool_adapters/moodle/lams_tool_mdlchoice/db/sql/tool_insert.sql
===================================================================
diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlchoice/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f)
+++ tool_adapters/moodle/lams_tool_mdlchoice/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -26,8 +26,6 @@
 help_url,
 admin_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 ext_lms_id,
@@ -59,8 +57,6 @@
 'http://wiki.lamsfoundation.org/display/lamsdocs/mdchce10',
 'tool/mdchce10/mdchce10admin.do',
 'org.lamsfoundation.lams.tool.mdchce.ApplicationResources',
-'lams-tool-mdchce10.jar',
-'/org/lamsfoundation/lams/tool/mdchce/mdlChoiceApplicationContext.xml',
 NOW(),
 NOW(),
 'moodle',
Index: tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/mdlChoiceApplicationContext.xml
===================================================================
diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/mdlChoiceApplicationContext.xml	(.../mdlChoiceApplicationContext.xml)	(revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f)
+++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/mdlChoiceApplicationContext.xml	(.../mdlChoiceApplicationContext.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -10,19 +10,6 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<!-- Hibernate SessionFactory -->
-	  <bean id="mdlChoiceSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/tool/mdchce/model/MdlChoice.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdchce/model/MdlChoiceSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdchce/model/MdlChoiceUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdchce/model/MdlChoiceConfigItem.hbm.xml</value> 
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="mdlChoiceService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -67,19 +54,19 @@
 	
 	<!--  DAO classes -->
 	<bean id="mdlChoiceDAO" class="org.lamsfoundation.lams.tool.mdchce.dao.hibernate.MdlChoiceDAO">
-		<property name="sessionFactory"><ref local="mdlChoiceSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 	
 	<bean id="mdlChoiceConfigItemDAO" class="org.lamsfoundation.lams.tool.mdchce.dao.hibernate.MdlChoiceConfigItemDAO">
-		<property name="sessionFactory"><ref local="mdlChoiceSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean> 
 
 	<bean id="mdlChoiceSessionDAO" class="org.lamsfoundation.lams.tool.mdchce.dao.hibernate.MdlChoiceSessionDAO">
-		<property name="sessionFactory"><ref local="mdlChoiceSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="mdlChoiceUserDAO" class="org.lamsfoundation.lams.tool.mdchce.dao.hibernate.MdlChoiceUserDAO">
-		<property name="sessionFactory"><ref local="mdlChoiceSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="mdlChoiceToolContentHandler" class="org.lamsfoundation.lams.tool.mdchce.util.MdlChoiceToolContentHandler">
Index: tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/applicationContext.xml
===================================================================
diff -u
--- tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/applicationContext.xml	(revision 0)
+++ tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/applicationContext.xml	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+</beans>
Index: tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/filters.xml
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/filters.xml	(.../filters.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>mdlForumSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -7,14 +7,15 @@
 
 <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/integrationContext.xml
-            	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/mdfrum/mdlForumApplicationContext.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>
 
+
Index: tool_adapters/moodle/lams_tool_mdlforum/db/sql/tool_insert.sql
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlforum/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -26,8 +26,6 @@
 help_url,
 admin_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 ext_lms_id,
@@ -59,8 +57,6 @@
 'http://wiki.lamsfoundation.org/display/lamsdocs/mdfrum10',
 'tool/mdfrum10/mdfrum10admin.do',
 'org.lamsfoundation.lams.tool.mdfrum.ApplicationResources',
-'lams-tool-mdfrum10.jar',
-'/org/lamsfoundation/lams/tool/mdfrum/mdlForumApplicationContext.xml',
 NOW(),
 NOW(),
 'moodle',
Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/mdlForumApplicationContext.xml
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/mdlForumApplicationContext.xml	(.../mdlForumApplicationContext.xml)	(revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/mdlForumApplicationContext.xml	(.../mdlForumApplicationContext.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -10,19 +10,6 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<!-- Hibernate SessionFactory -->
-	  <bean id="mdlForumSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/tool/mdfrum/model/MdlForum.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdfrum/model/MdlForumSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdfrum/model/MdlForumUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdfrum/model/MdlForumConfigItem.hbm.xml</value> 
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="mdlForumService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -67,19 +54,19 @@
 	
 	<!--  DAO classes -->
 	<bean id="mdlForumDAO" class="org.lamsfoundation.lams.tool.mdfrum.dao.hibernate.MdlForumDAO">
-		<property name="sessionFactory"><ref local="mdlForumSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 	
 	<bean id="mdlForumConfigItemDAO" class="org.lamsfoundation.lams.tool.mdfrum.dao.hibernate.MdlForumConfigItemDAO">
-		<property name="sessionFactory"><ref local="mdlForumSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean> 
 
 	<bean id="mdlForumSessionDAO" class="org.lamsfoundation.lams.tool.mdfrum.dao.hibernate.MdlForumSessionDAO">
-		<property name="sessionFactory"><ref local="mdlForumSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="mdlForumUserDAO" class="org.lamsfoundation.lams.tool.mdfrum.dao.hibernate.MdlForumUserDAO">
-		<property name="sessionFactory"><ref local="mdlForumSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="mdlForumToolContentHandler" class="org.lamsfoundation.lams.tool.mdfrum.util.MdlForumToolContentHandler">
Index: tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/applicationContext.xml
===================================================================
diff -u
--- tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/applicationContext.xml	(revision 0)
+++ tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/applicationContext.xml	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+</beans>
Index: tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/filters.xml
===================================================================
diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/filters.xml	(.../filters.xml)	(revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b)
+++ tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/filters.xml	(.../filters.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>mdlGlossarySessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/web-settings.xml
===================================================================
diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b)
+++ tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -7,14 +7,15 @@
 
 <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/integrationContext.xml
-            	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/mdglos/mdlGlossaryApplicationContext.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>
 
+
Index: tool_adapters/moodle/lams_tool_mdlglossary/db/sql/tool_insert.sql
===================================================================
diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlglossary/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b)
+++ tool_adapters/moodle/lams_tool_mdlglossary/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -26,8 +26,6 @@
 help_url,
 admin_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 ext_lms_id,
@@ -59,8 +57,6 @@
 'http://wiki.lamsfoundation.org/display/lamsdocs/mdglos10',
 'tool/mdglos10/mdglos10admin.do',
 'org.lamsfoundation.lams.tool.mdglos.ApplicationResources',
-'lams-tool-mdglos10.jar',
-'/org/lamsfoundation/lams/tool/mdglos/mdlGlossaryApplicationContext.xml',
 NOW(),
 NOW(),
 'moodle',
Index: tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/mdlGlossaryApplicationContext.xml
===================================================================
diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/mdlGlossaryApplicationContext.xml	(.../mdlGlossaryApplicationContext.xml)	(revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b)
+++ tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/mdlGlossaryApplicationContext.xml	(.../mdlGlossaryApplicationContext.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -10,19 +10,6 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<!-- Hibernate SessionFactory -->
-	  <bean id="mdlGlossarySessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/tool/mdglos/model/MdlGlossary.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdglos/model/MdlGlossarySession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdglos/model/MdlGlossaryUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdglos/model/MdlGlossaryConfigItem.hbm.xml</value> 
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="mdlGlossaryService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -67,19 +54,19 @@
 	
 	<!--  DAO classes -->
 	<bean id="mdlGlossaryDAO" class="org.lamsfoundation.lams.tool.mdglos.dao.hibernate.MdlGlossaryDAO">
-		<property name="sessionFactory"><ref local="mdlGlossarySessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 	
 	<bean id="mdlGlossaryConfigItemDAO" class="org.lamsfoundation.lams.tool.mdglos.dao.hibernate.MdlGlossaryConfigItemDAO">
-		<property name="sessionFactory"><ref local="mdlGlossarySessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean> 
 
 	<bean id="mdlGlossarySessionDAO" class="org.lamsfoundation.lams.tool.mdglos.dao.hibernate.MdlGlossarySessionDAO">
-		<property name="sessionFactory"><ref local="mdlGlossarySessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="mdlGlossaryUserDAO" class="org.lamsfoundation.lams.tool.mdglos.dao.hibernate.MdlGlossaryUserDAO">
-		<property name="sessionFactory"><ref local="mdlGlossarySessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="mdlGlossaryToolContentHandler" class="org.lamsfoundation.lams.tool.mdglos.util.MdlGlossaryToolContentHandler">
Index: tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/applicationContext.xml
===================================================================
diff -u
--- tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/applicationContext.xml	(revision 0)
+++ tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/applicationContext.xml	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+</beans>
Index: tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/filters.xml
===================================================================
diff -u -r1900d45594cf161971a48d0e596b36fbcf06a0eb -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 1900d45594cf161971a48d0e596b36fbcf06a0eb)
+++ tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/filters.xml	(.../filters.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>mdlLessonSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r1900d45594cf161971a48d0e596b36fbcf06a0eb -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 1900d45594cf161971a48d0e596b36fbcf06a0eb)
+++ tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -7,14 +7,15 @@
 
 <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/integrationContext.xml
-            	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/mdlesn/mdlLessonApplicationContext.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>
 
+
Index: tool_adapters/moodle/lams_tool_mdllesson/db/sql/tool_insert.sql
===================================================================
diff -u -r1900d45594cf161971a48d0e596b36fbcf06a0eb -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdllesson/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 1900d45594cf161971a48d0e596b36fbcf06a0eb)
+++ tool_adapters/moodle/lams_tool_mdllesson/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -26,8 +26,6 @@
 help_url,
 admin_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 ext_lms_id,
@@ -59,8 +57,6 @@
 'http://wiki.lamsfoundation.org/display/lamsdocs/mdlesn10',
 'tool/mdlesn10/mdlesn10admin.do',
 'org.lamsfoundation.lams.tool.mdlesn.ApplicationResources',
-'lams-tool-mdlesn10.jar',
-'/org/lamsfoundation/lams/tool/mdlesn/mdlLessonApplicationContext.xml',
 NOW(),
 NOW(),
 'moodle',
Index: tool_adapters/moodle/lams_tool_mdllesson/src/java/org/lamsfoundation/lams/tool/mdlesn/mdlLessonApplicationContext.xml
===================================================================
diff -u -r1900d45594cf161971a48d0e596b36fbcf06a0eb -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdllesson/src/java/org/lamsfoundation/lams/tool/mdlesn/mdlLessonApplicationContext.xml	(.../mdlLessonApplicationContext.xml)	(revision 1900d45594cf161971a48d0e596b36fbcf06a0eb)
+++ tool_adapters/moodle/lams_tool_mdllesson/src/java/org/lamsfoundation/lams/tool/mdlesn/mdlLessonApplicationContext.xml	(.../mdlLessonApplicationContext.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -10,19 +10,6 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<!-- Hibernate SessionFactory -->
-	  <bean id="mdlLessonSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/tool/mdlesn/model/MdlLesson.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdlesn/model/MdlLessonSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdlesn/model/MdlLessonUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdlesn/model/MdlLessonConfigItem.hbm.xml</value> 
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="mdlLessonService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -67,19 +54,19 @@
 	
 	<!--  DAO classes -->
 	<bean id="mdlLessonDAO" class="org.lamsfoundation.lams.tool.mdlesn.dao.hibernate.MdlLessonDAO">
-		<property name="sessionFactory"><ref local="mdlLessonSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 	
 	<bean id="mdlLessonConfigItemDAO" class="org.lamsfoundation.lams.tool.mdlesn.dao.hibernate.MdlLessonConfigItemDAO">
-		<property name="sessionFactory"><ref local="mdlLessonSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean> 
 
 	<bean id="mdlLessonSessionDAO" class="org.lamsfoundation.lams.tool.mdlesn.dao.hibernate.MdlLessonSessionDAO">
-		<property name="sessionFactory"><ref local="mdlLessonSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="mdlLessonUserDAO" class="org.lamsfoundation.lams.tool.mdlesn.dao.hibernate.MdlLessonUserDAO">
-		<property name="sessionFactory"><ref local="mdlLessonSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="mdlLessonToolContentHandler" class="org.lamsfoundation.lams.tool.mdlesn.util.MdlLessonToolContentHandler">
Index: tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/applicationContext.xml
===================================================================
diff -u
--- tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/applicationContext.xml	(revision 0)
+++ tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/applicationContext.xml	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+</beans>
Index: tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/filters.xml
===================================================================
diff -u -r5cf21f5b3b89583e8a2b72bf15130e7430407182 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 5cf21f5b3b89583e8a2b72bf15130e7430407182)
+++ tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/filters.xml	(.../filters.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>mdlQuizSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r5cf21f5b3b89583e8a2b72bf15130e7430407182 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 5cf21f5b3b89583e8a2b72bf15130e7430407182)
+++ tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -7,14 +7,15 @@
 
 <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/integrationContext.xml
-            	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/mdquiz/mdlQuizApplicationContext.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>
 
+
Index: tool_adapters/moodle/lams_tool_mdlquiz/db/sql/tool_insert.sql
===================================================================
diff -u -r5cf21f5b3b89583e8a2b72bf15130e7430407182 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlquiz/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 5cf21f5b3b89583e8a2b72bf15130e7430407182)
+++ tool_adapters/moodle/lams_tool_mdlquiz/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -26,8 +26,6 @@
 help_url,
 admin_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 ext_lms_id,
@@ -59,8 +57,6 @@
 'http://wiki.lamsfoundation.org/display/lamsdocs/mdquiz10',
 'tool/mdquiz10/mdquiz10admin.do',
 'org.lamsfoundation.lams.tool.mdquiz.ApplicationResources',
-'lams-tool-mdquiz10.jar',
-'/org/lamsfoundation/lams/tool/mdquiz/mdlQuizApplicationContext.xml',
 NOW(),
 NOW(),
 'moodle',
Index: tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/mdlQuizApplicationContext.xml
===================================================================
diff -u -r5cf21f5b3b89583e8a2b72bf15130e7430407182 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/mdlQuizApplicationContext.xml	(.../mdlQuizApplicationContext.xml)	(revision 5cf21f5b3b89583e8a2b72bf15130e7430407182)
+++ tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/mdlQuizApplicationContext.xml	(.../mdlQuizApplicationContext.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -10,19 +10,6 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<!-- Hibernate SessionFactory -->
-	  <bean id="mdlQuizSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/tool/mdquiz/model/MdlQuiz.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdquiz/model/MdlQuizSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdquiz/model/MdlQuizUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdquiz/model/MdlQuizConfigItem.hbm.xml</value> 
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="mdlQuizService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -67,19 +54,19 @@
 	
 	<!--  DAO classes -->
 	<bean id="mdlQuizDAO" class="org.lamsfoundation.lams.tool.mdquiz.dao.hibernate.MdlQuizDAO">
-		<property name="sessionFactory"><ref local="mdlQuizSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 	
 	<bean id="mdlQuizConfigItemDAO" class="org.lamsfoundation.lams.tool.mdquiz.dao.hibernate.MdlQuizConfigItemDAO">
-		<property name="sessionFactory"><ref local="mdlQuizSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean> 
 
 	<bean id="mdlQuizSessionDAO" class="org.lamsfoundation.lams.tool.mdquiz.dao.hibernate.MdlQuizSessionDAO">
-		<property name="sessionFactory"><ref local="mdlQuizSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="mdlQuizUserDAO" class="org.lamsfoundation.lams.tool.mdquiz.dao.hibernate.MdlQuizUserDAO">
-		<property name="sessionFactory"><ref local="mdlQuizSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="mdlQuizToolContentHandler" class="org.lamsfoundation.lams.tool.mdquiz.util.MdlQuizToolContentHandler">
Index: tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/applicationContext.xml
===================================================================
diff -u
--- tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/applicationContext.xml	(revision 0)
+++ tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/applicationContext.xml	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+</beans>
Index: tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/filters.xml
===================================================================
diff -u -r968652e19244d6d982a0c82df6c6d464d2edbec4 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 968652e19244d6d982a0c82df6c6d464d2edbec4)
+++ tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/filters.xml	(.../filters.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>mdlScormSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r968652e19244d6d982a0c82df6c6d464d2edbec4 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 968652e19244d6d982a0c82df6c6d464d2edbec4)
+++ tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -7,14 +7,15 @@
 
 <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/integrationContext.xml
-            	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/mdscrm/mdlScormApplicationContext.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>
 
+
Index: tool_adapters/moodle/lams_tool_mdlscorm/db/sql/tool_insert.sql
===================================================================
diff -u -r968652e19244d6d982a0c82df6c6d464d2edbec4 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlscorm/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 968652e19244d6d982a0c82df6c6d464d2edbec4)
+++ tool_adapters/moodle/lams_tool_mdlscorm/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -26,8 +26,6 @@
 help_url,
 admin_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 ext_lms_id,
@@ -59,8 +57,6 @@
 'http://wiki.lamsfoundation.org/display/lamsdocs/mdscrm10',
 'tool/mdscrm10/mdscrm10admin.do',
 'org.lamsfoundation.lams.tool.mdscrm.ApplicationResources',
-'lams-tool-mdscrm10.jar',
-'/org/lamsfoundation/lams/tool/mdscrm/mdlScormApplicationContext.xml',
 NOW(),
 NOW(),
 'moodle',
Index: tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/mdlScormApplicationContext.xml
===================================================================
diff -u -r968652e19244d6d982a0c82df6c6d464d2edbec4 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/mdlScormApplicationContext.xml	(.../mdlScormApplicationContext.xml)	(revision 968652e19244d6d982a0c82df6c6d464d2edbec4)
+++ tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/mdlScormApplicationContext.xml	(.../mdlScormApplicationContext.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -10,19 +10,6 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<!-- Hibernate SessionFactory -->
-	  <bean id="mdlScormSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/tool/mdscrm/model/MdlScorm.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdscrm/model/MdlScormSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdscrm/model/MdlScormUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdscrm/model/MdlScormConfigItem.hbm.xml</value> 
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="mdlScormService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -67,19 +54,19 @@
 	
 	<!--  DAO classes -->
 	<bean id="mdlScormDAO" class="org.lamsfoundation.lams.tool.mdscrm.dao.hibernate.MdlScormDAO">
-		<property name="sessionFactory"><ref local="mdlScormSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 	
 	<bean id="mdlScormConfigItemDAO" class="org.lamsfoundation.lams.tool.mdscrm.dao.hibernate.MdlScormConfigItemDAO">
-		<property name="sessionFactory"><ref local="mdlScormSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean> 
 
 	<bean id="mdlScormSessionDAO" class="org.lamsfoundation.lams.tool.mdscrm.dao.hibernate.MdlScormSessionDAO">
-		<property name="sessionFactory"><ref local="mdlScormSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="mdlScormUserDAO" class="org.lamsfoundation.lams.tool.mdscrm.dao.hibernate.MdlScormUserDAO">
-		<property name="sessionFactory"><ref local="mdlScormSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="mdlScormToolContentHandler" class="org.lamsfoundation.lams.tool.mdscrm.util.MdlScormToolContentHandler">
Index: tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/applicationContext.xml
===================================================================
diff -u
--- tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/applicationContext.xml	(revision 0)
+++ tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/applicationContext.xml	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+</beans>
Index: tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/filters.xml
===================================================================
diff -u -r086d0769471647a32761d96d5fb630b4787880d1 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 086d0769471647a32761d96d5fb630b4787880d1)
+++ tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/filters.xml	(.../filters.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>mdlWikiSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r086d0769471647a32761d96d5fb630b4787880d1 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 086d0769471647a32761d96d5fb630b4787880d1)
+++ tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -7,14 +7,15 @@
 
 <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/integrationContext.xml
-            	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/mdwiki/mdlWikiApplicationContext.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>
 
+
Index: tool_adapters/moodle/lams_tool_mdlwiki/db/sql/tool_insert.sql
===================================================================
diff -u -r086d0769471647a32761d96d5fb630b4787880d1 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlwiki/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 086d0769471647a32761d96d5fb630b4787880d1)
+++ tool_adapters/moodle/lams_tool_mdlwiki/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -26,8 +26,6 @@
 help_url,
 admin_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 ext_lms_id,
@@ -59,8 +57,6 @@
 'http://wiki.lamsfoundation.org/display/lamsdocs/mdwiki10',
 'tool/mdwiki10/mdwiki10admin.do',
 'org.lamsfoundation.lams.tool.mdwiki.ApplicationResources',
-'lams-tool-mdwiki10.jar',
-'/org/lamsfoundation/lams/tool/mdwiki/mdlWikiApplicationContext.xml',
 NOW(),
 NOW(),
 'moodle',
Index: tool_adapters/moodle/lams_tool_mdlwiki/src/java/org/lamsfoundation/lams/tool/mdwiki/mdlWikiApplicationContext.xml
===================================================================
diff -u -r086d0769471647a32761d96d5fb630b4787880d1 -rb6544cfe682554653a9590c0bf74ed52186d71ff
--- tool_adapters/moodle/lams_tool_mdlwiki/src/java/org/lamsfoundation/lams/tool/mdwiki/mdlWikiApplicationContext.xml	(.../mdlWikiApplicationContext.xml)	(revision 086d0769471647a32761d96d5fb630b4787880d1)
+++ tool_adapters/moodle/lams_tool_mdlwiki/src/java/org/lamsfoundation/lams/tool/mdwiki/mdlWikiApplicationContext.xml	(.../mdlWikiApplicationContext.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -10,19 +10,6 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<!-- Hibernate SessionFactory -->
-	  <bean id="mdlWikiSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/tool/mdwiki/model/MdlWiki.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdwiki/model/MdlWikiSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdwiki/model/MdlWikiUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/mdwiki/model/MdlWikiConfigItem.hbm.xml</value> 
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="mdlWikiService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -67,19 +54,19 @@
 	
 	<!--  DAO classes -->
 	<bean id="mdlWikiDAO" class="org.lamsfoundation.lams.tool.mdwiki.dao.hibernate.MdlWikiDAO">
-		<property name="sessionFactory"><ref local="mdlWikiSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 	
 	<bean id="mdlWikiConfigItemDAO" class="org.lamsfoundation.lams.tool.mdwiki.dao.hibernate.MdlWikiConfigItemDAO">
-		<property name="sessionFactory"><ref local="mdlWikiSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean> 
 
 	<bean id="mdlWikiSessionDAO" class="org.lamsfoundation.lams.tool.mdwiki.dao.hibernate.MdlWikiSessionDAO">
-		<property name="sessionFactory"><ref local="mdlWikiSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="mdlWikiUserDAO" class="org.lamsfoundation.lams.tool.mdwiki.dao.hibernate.MdlWikiUserDAO">
-		<property name="sessionFactory"><ref local="mdlWikiSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="mdlWikiToolContentHandler" class="org.lamsfoundation.lams.tool.mdwiki.util.MdlWikiToolContentHandler">
Index: tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/applicationContext.xml
===================================================================
diff -u
--- tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/applicationContext.xml	(revision 0)
+++ tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/applicationContext.xml	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+</beans>