Index: tool_adapters/dotlrn/lams_tool_dlforum/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb6544cfe682554653a9590c0bf74ed52186d71ff -r0cd95acff44d88a7e8b885902dd5b12f7f1d836b
--- tool_adapters/dotlrn/lams_tool_dlforum/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
+++ tool_adapters/dotlrn/lams_tool_dlforum/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 0cd95acff44d88a7e8b885902dd5b12f7f1d836b)
@@ -5,13 +5,17 @@
   	<param-value>org.lamsfoundation.lams.tool.dlfrum.ApplicationResources</param-value>
 </context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</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>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
Index: tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb6544cfe682554653a9590c0bf74ed52186d71ff -r0cd95acff44d88a7e8b885902dd5b12f7f1d836b
--- tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
+++ tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 0cd95acff44d88a7e8b885902dd5b12f7f1d836b)
@@ -5,13 +5,17 @@
   	<param-value>org.lamsfoundation.lams.tool.mdasgm.ApplicationResources</param-value>
 </context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</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>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
Index: tool_adapters/moodle/lams_tool_mdlchat/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb6544cfe682554653a9590c0bf74ed52186d71ff -r0cd95acff44d88a7e8b885902dd5b12f7f1d836b
--- tool_adapters/moodle/lams_tool_mdlchat/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
+++ tool_adapters/moodle/lams_tool_mdlchat/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 0cd95acff44d88a7e8b885902dd5b12f7f1d836b)
@@ -5,13 +5,17 @@
   	<param-value>org.lamsfoundation.lams.tool.mdchat.ApplicationResources</param-value>
 </context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</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>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
Index: tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb6544cfe682554653a9590c0bf74ed52186d71ff -r0cd95acff44d88a7e8b885902dd5b12f7f1d836b
--- tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
+++ tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 0cd95acff44d88a7e8b885902dd5b12f7f1d836b)
@@ -5,13 +5,17 @@
   	<param-value>org.lamsfoundation.lams.tool.mdchce.ApplicationResources</param-value>
 </context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</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>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
Index: tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb6544cfe682554653a9590c0bf74ed52186d71ff -r0cd95acff44d88a7e8b885902dd5b12f7f1d836b
--- tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
+++ tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 0cd95acff44d88a7e8b885902dd5b12f7f1d836b)
@@ -5,13 +5,17 @@
   	<param-value>org.lamsfoundation.lams.tool.mdfrum.ApplicationResources</param-value>
 </context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</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>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
Index: tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb6544cfe682554653a9590c0bf74ed52186d71ff -r0cd95acff44d88a7e8b885902dd5b12f7f1d836b
--- tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
+++ tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 0cd95acff44d88a7e8b885902dd5b12f7f1d836b)
@@ -5,13 +5,17 @@
   	<param-value>org.lamsfoundation.lams.tool.mdglos.ApplicationResources</param-value>
 </context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</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>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
Index: tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb6544cfe682554653a9590c0bf74ed52186d71ff -r0cd95acff44d88a7e8b885902dd5b12f7f1d836b
--- tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
+++ tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 0cd95acff44d88a7e8b885902dd5b12f7f1d836b)
@@ -5,13 +5,17 @@
   	<param-value>org.lamsfoundation.lams.tool.mdlesn.ApplicationResources</param-value>
 </context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</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>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
Index: tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb6544cfe682554653a9590c0bf74ed52186d71ff -r0cd95acff44d88a7e8b885902dd5b12f7f1d836b
--- tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
+++ tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 0cd95acff44d88a7e8b885902dd5b12f7f1d836b)
@@ -5,13 +5,17 @@
   	<param-value>org.lamsfoundation.lams.tool.mdquiz.ApplicationResources</param-value>
 </context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</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>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
Index: tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb6544cfe682554653a9590c0bf74ed52186d71ff -r0cd95acff44d88a7e8b885902dd5b12f7f1d836b
--- tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
+++ tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 0cd95acff44d88a7e8b885902dd5b12f7f1d836b)
@@ -5,13 +5,17 @@
   	<param-value>org.lamsfoundation.lams.tool.mdscrm.ApplicationResources</param-value>
 </context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</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>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
Index: tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb6544cfe682554653a9590c0bf74ed52186d71ff -r0cd95acff44d88a7e8b885902dd5b12f7f1d836b
--- tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
+++ tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 0cd95acff44d88a7e8b885902dd5b12f7f1d836b)
@@ -5,13 +5,17 @@
   	<param-value>org.lamsfoundation.lams.tool.mdwiki.ApplicationResources</param-value>
 </context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</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>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>