Index: lams_admin/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r0171f2c534f24831c997deec9bc9a614ed40cfc5 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_admin/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 0171f2c534f24831c997deec9bc9a614ed40cfc5)
+++ lams_admin/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -7,16 +7,18 @@
   	<param-value>org.lamsfoundation.lams.admin.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/toolApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/integrationContext.xml
-		classpath:/org/lamsfoundation/lams/admin/adminApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/usermanagement/ldapContext.xml
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/admin/adminApplicationContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
 <context-param>
     <param-name>migration.systemname</param-name>
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml
===================================================================
diff -u -rf8ae5239ffcb6ac62937458e9750b3780528dc9f -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml	(.../adminApplicationContext.xml)	(revision f8ae5239ffcb6ac62937458e9750b3780528dc9f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml	(.../adminApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -4,7 +4,7 @@
 	<bean id="adminMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 		<property name="basename"><value>org.lamsfoundation.lams.admin.ApplicationResources</value></property>
 	</bean>
-	<bean id="adminMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="adminMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource"><ref local="adminMessageSource"/></property>										
 	</bean>
 	
Index: lams_build/build.xml
===================================================================
diff -u -r49cb26ada930a59687956591672498c7f5613d34 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_build/build.xml	(.../build.xml)	(revision 49cb26ada930a59687956591672498c7f5613d34)
+++ lams_build/build.xml	(.../build.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -117,7 +117,6 @@
 					<include name="jakarta-commons/*.jar" />
 					<include name="jakarta-poi/*.jar" />
 					<include name="jakarta-taglibs/*.jar" />
-					<include name="jboss/*.jar" />
 					<include name="jdom/*.jar" />
 					<include name="jfreechart/*.jar" />
 					<include name="log4j/*.jar" />
@@ -498,6 +497,88 @@
 		<ant antfile="../${tool_wiki_dir}/build.xml" target="copy-tags" inheritAll="false"/>
 		
 	</target>
-
-
+	
+	<target name="slim-jboss" description="makes a backup and removes unnecessary services from JBoss 4.0.2;
+		do not run it twice, otherwise you will need to copy standardjboss.xml and ejb-deployer.xml
+		from the original JBoss distribution and then build the whole LAMS project">
+		<!-- Backup -->
+		<copy todir="${jboss.server.instance}/slim-backup/deploy">
+			<fileset dir="${jboss.ear.deploy}/">
+				<include name="ejb-deployer.xml"/>
+				<include name="client-deployer-service.xml"/>
+				<include name="schedule-manager-service.xml"/>
+				<include name="scheduler-service.xml"/>
+				<include name="bsh-deployer.xml"/>
+				<include name="jboss-aop.deployer/"/>
+				<include name="jboss-ws4ee.sar/"/>
+				<include name="jmx-console.war/"/>
+				<include name="http-invoker.sar/"/>
+			</fileset>
+		</copy>
+		
+		<copy todir="${jboss.server.instance}/slim-backup/conf">
+			<fileset dir="${jboss.server.instance}/conf">
+				<include name="jboss-service.xml"/>
+				<include name="standardjboss.xml"/>
+			</fileset>
+		</copy>
+		
+		<copy todir="${jboss.server.instance}/slim-backup/lib">
+			<fileset dir="${jboss.server.instance.lib}">
+				<include name="autonumber-plugin.jar"/>
+				<include name="bcel.jar"/>
+				<include name="jboss-jaxrpc.jar"/>
+				<include name="jboss-saaj.jar"/>
+				<include name="scheduler-plugin.jar"/>
+				<include name="scheduler-plugin-example.jar"/>
+				<include name="bsh-1.3.0.jar"/>
+				<include name="bsh-deployer.jar"/>
+			</fileset>
+		</copy>
+		
+		<!-- Configuring -->
+		<copy overwrite="yes" file="${conf.jboss}/ejb-deployer.slim.xml" tofile="${jboss.ear.deploy}/ejb-deployer.xml" />
+		<copy overwrite="yes" file="${conf.jboss}/jboss-service.slim.xml" tofile="${jboss.server.instance}/conf/jboss-service.xml" />
+		<copy overwrite="yes" file="${conf.jboss}/standardjboss.slim.xml" tofile="${jboss.server.instance}/conf/standardjboss.xml" />
+		
+		
+		<delete dir="${jboss.ear.deploy}jboss-aop.deployer" />
+		<delete dir="${jboss.ear.deploy}/jboss-ws4ee.sar" />
+		<delete dir="${jboss.ear.deploy}/jmx-console.war"/>
+		<delete dir="${jboss.ear.deploy}/http-invoker.sar"/>
+		
+		<delete file="${jboss.ear.deploy}/client-deployer-service.xml"/>
+		<delete file="${jboss.ear.deploy}/schedule-manager-service.xml"/>
+		<delete file="${jboss.ear.deploy}/scheduler-service.xml"/>
+		<delete file="${jboss.ear.deploy}/bsh-deployer.xml"/>
+		
+		<delete file="${jboss.server.instance.lib}/autonumber-plugin.jar"/>
+		<delete file="${jboss.server.instance.lib}/bcel.jar"/>
+		<delete file="${jboss.server.instance.lib}/jboss-jaxrpc.jar"/>
+		<delete file="${jboss.server.instance.lib}/jboss-saaj.jar"/>
+		<delete file="${jboss.server.instance.lib}/scheduler-plugin.jar"/>
+		<delete file="${jboss.server.instance.lib}/scheduler-plugin-example.jar"/>
+		<delete file="${jboss.server.instance.lib}/bsh-1.3.0.jar"/>
+		<delete file="${jboss.server.instance.lib}/bsh-deployer.jar"/>
+	</target>
+	
+	<target name="slim-jboss-revert" description="reverts changes made by slim-jboss task">
+		<copy overwrite="yes" todir="${jboss.ear.deploy}">
+			<fileset dir="${jboss.server.instance}/slim-backup/deploy/">
+				<include name="*/"/>
+			</fileset>
+		</copy>
+		
+		<copy overwrite="yes" todir="${jboss.server.instance}/conf">
+			<fileset dir="${jboss.server.instance}/slim-backup/conf">
+				<include name="*.xml"/>
+			</fileset>
+		</copy>
+		
+		<copy overwrite="yes" todir="${jboss.server.instance.lib}">
+			<fileset dir="${jboss.server.instance}/slim-backup/lib">
+				<include name="*"/>
+			</fileset>
+		</copy>
+	</target>
 </project>
Index: lams_build/conf/j2ee/lams.application.xml
===================================================================
diff -u -r49cb26ada930a59687956591672498c7f5613d34 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_build/conf/j2ee/lams.application.xml	(.../lams.application.xml)	(revision 49cb26ada930a59687956591672498c7f5613d34)
+++ lams_build/conf/j2ee/lams.application.xml	(.../lams.application.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -142,12 +142,6 @@
 		<java>jaxrpc.jar</java>
 	</module>
 	<module>
-		<java>jboss-cache.jar</java>
-	</module>
-	<module>
-		<java>jgroups.jar</java>
-	</module>
-	<module>
 		<java>jdom.jar</java>
 	</module>
 	<module>
Index: lams_build/conf/j2ee/rams.application.xml
===================================================================
diff -u -r49cb26ada930a59687956591672498c7f5613d34 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_build/conf/j2ee/rams.application.xml	(.../rams.application.xml)	(revision 49cb26ada930a59687956591672498c7f5613d34)
+++ lams_build/conf/j2ee/rams.application.xml	(.../rams.application.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -142,12 +142,6 @@
 		<java>jaxrpc.jar</java>
 	</module>
 	<module>
-		<java>jboss-cache.jar</java>
-	</module>
-	<module>
-		<java>jgroups.jar</java>
-	</module>
-	<module>
 		<java>jdom.jar</java>
 	</module>
 	<module>
Index: lams_build/conf/unix/jboss/ejb-deployer.slim.xml
===================================================================
diff -u
--- lams_build/conf/unix/jboss/ejb-deployer.slim.xml	(revision 0)
+++ lams_build/conf/unix/jboss/ejb-deployer.slim.xml	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- The JBoss service configuration file for the EJB deployer service.
+$Id$
+-->
+<server>
+
+  <!-- ==================================================================== -->
+  <!-- J2EE Timer Service                                                   -->
+  <!-- ==================================================================== -->
+
+  <!-- An EJB Timer Service that is Tx aware -->
+  <mbean code="org.jboss.ejb.txtimer.EJBTimerServiceImpl"
+    name="jboss.ejb:service=EJBTimerService">
+    <attribute name="RetryPolicy">jboss.ejb:service=EJBTimerService,retryPolicy=fixedDelay</attribute>
+    <attribute name="PersistencePolicy">jboss.ejb:service=EJBTimerService,persistencePolicy=database</attribute>
+    <attribute name="TimerIdGeneratorClassName">org.jboss.ejb.txtimer.BigIntegerTimerIdGenerator</attribute>
+    <attribute name="TimedObjectInvokerClassName">org.jboss.ejb.txtimer.TimedObjectInvokerImpl</attribute>
+  </mbean>
+
+  <!-- A retry policy that uses a fixed interval in milli seconds -->
+  <mbean code="org.jboss.ejb.txtimer.FixedDelayRetryPolicy" name="jboss.ejb:service=EJBTimerService,retryPolicy=fixedDelay">
+    <attribute name="Delay">100</attribute>
+  </mbean>
+
+  <!-- A persistence policy that does not persist the timer
+  <mbean code="org.jboss.ejb.txtimer.NoopPersistencePolicy" name="jboss.ejb:service=EJBTimerService,persistencePolicy=noop"/>
+  -->
+
+  <!-- A persistence policy that persistes timers to a database -->
+  <mbean code="org.jboss.ejb.txtimer.DatabasePersistencePolicy" name="jboss.ejb:service=EJBTimerService,persistencePolicy=database">
+    <!-- DataSource JNDI name -->
+    <depends optional-attribute-name="DataSource">jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+    <!-- The plugin that handles database persistence -->
+    <attribute name="DatabasePersistencePlugin">org.jboss.ejb.txtimer.GeneralPurposeDatabasePersistencePlugin</attribute>
+  </mbean>
+
+  <!-- ==================================================================== -->
+  <!-- EJB Deployer                                                         -->
+  <!-- ==================================================================== -->
+
+  <!-- EJB deployer, remove to disable EJB behavior-->
+  <mbean code="org.jboss.ejb.EJBDeployer" name="jboss.ejb:service=EJBDeployer">
+    <!-- A flag indicating if the deployer should validate the
+    ejb-jar.xml/jboss.xml descriptors and components
+    -->
+    <attribute name="VerifyDeployments">true</attribute>
+    <!-- A flag indicating if the xml parser should validate the descriptor
+    DTDs
+    -->
+    <attribute name="ValidateDTDs">false</attribute>
+    <!-- A flag indicating if the verifier should be verbose about its
+    operation
+    -->
+    <attribute name="VerifierVerbose">true</attribute>
+    <!-- Setting this to 'true' will cause all deployments
+     to fail when the Verifier detected a problem with the contained
+     Beans. If false, warnings/errors will be logged but the deployment
+     will not fail.
+    -->
+    <attribute name="StrictVerifier">true</attribute>
+
+    <!-- The EJBDeployer needs the JTA transaction manager service -->
+    <depends optional-attribute-name="TransactionManagerServiceName">jboss:service=TransactionManager</depends>
+    <!-- The dynamic class loading simple web server -->
+    <!--  <depends optional-attribute-name="WebServiceName">jboss:service=WebService</depends> -->
+  </mbean>
+
+</server>
Index: lams_build/conf/unix/jboss/jboss-service.slim.xml
===================================================================
diff -u
--- lams_build/conf/unix/jboss/jboss-service.slim.xml	(revision 0)
+++ lams_build/conf/unix/jboss/jboss-service.slim.xml	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -0,0 +1,395 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id$ -->
+
+<!-- ===================================================================== -->
+<!--  JBoss Server Configuration                                           -->
+<!-- ===================================================================== -->
+
+<server>
+
+   <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
+     can be restricted to specific jars by specifying them in the archives
+     attribute.
+    -->
+   <classpath codebase="lib" archives="*"/>
+
+
+   <!-- ==================================================================== -->
+   <!-- JSR-77 Single JBoss Server Management Domain                         -->
+   <!-- ==================================================================== -->
+   <mbean code="org.jboss.management.j2ee.LocalJBossServerDomain"
+      name="jboss.management.local:j2eeType=J2EEDomain,name=Manager">
+      <attribute name="MainDeployer">jboss.system:service=MainDeployer</attribute>
+      <attribute name="SARDeployer">jboss.system:service=ServiceDeployer</attribute>
+      <attribute name="EARDeployer">jboss.j2ee:service=EARDeployer</attribute>
+      <attribute name="EJBDeployer">jboss.ejb:service=EJBDeployer</attribute>
+      <attribute name="RARDeployer">jboss.jca:service=RARDeployer</attribute>
+      <attribute name="CMDeployer">jboss.jca:service=ConnectionFactoryDeployer</attribute>
+      <attribute name="WARDeployer">jboss.web:service=WebServer</attribute>
+      <attribute name="MailService">jboss:service=Mail</attribute>
+      <attribute name="JNDIService">jboss:service=Naming</attribute>
+      <attribute name="JTAService">jboss:service=TransactionManager</attribute>
+   </mbean>
+   
+   <!-- A Thread pool service -->
+   <mbean code="org.jboss.util.threadpool.BasicThreadPool"
+      name="jboss.system:service=ThreadPool">
+      <attribute name="Name">JBoss System Threads</attribute>
+      <attribute name="ThreadGroupName">System Threads</attribute>
+      <!-- How long a thread will live without any tasks in MS -->
+      <attribute name="KeepAliveTime">60000</attribute>
+      <!-- The max number of threads in the pool -->
+      <attribute name="MaximumPoolSize">10</attribute>
+      <!-- The max number of tasks before the queue is full -->
+      <attribute name="MaximumQueueSize">1000</attribute>
+      <!-- The behavior of the pool when a task is added and the queue is full.
+      abort - a RuntimeException is thrown
+      run - the calling thread executes the task
+      wait - the calling thread blocks until the queue has room
+      discard - the task is silently discarded without being run
+      discardOldest - check to see if a task is about to complete and enque
+         the new task if possible, else run the task in the calling thread
+      -->
+      <attribute name="BlockingMode">run</attribute>
+   </mbean>
+
+   <!-- Preload all custom editors for VMs that don't use the thread
+        context class loader when searching for PropertyEditors. Uncomment
+        if your JDK 1.3.0 VM fails to find JBoss PropertyEditors.
+   <mbean code="org.jboss.varia.property.PropertyEditorManagerService"
+     name="jboss:type=Service,name=BootstrapEditors">
+     <attribute name="BootstrapEditors">
+       java.math.BigDecimal=org.jboss.util.propertyeditor.BigDecimalEditor
+       java.lang.Boolean=org.jboss.util.propertyeditor.BooleanEditor
+       java.lang.Class=org.jboss.util.propertyeditor.ClassEditor
+       java.util.Date=org.jboss.util.propertyeditor.DateEditor
+       java.io.File=org.jboss.util.propertyeditor.FileEditor
+       java.net.InetAddress=org.jboss.util.propertyeditor.InetAddressEditor
+       java.lang.Integer=org.jboss.util.propertyeditor.IntegerEditor
+       javax.management.ObjectName=org.jboss.mx.util.propertyeditor.ObjectNameEditor
+       java.util.Properties=org.jboss.util.propertyeditor.PropertiesEditor
+       [Ljava.lang.String;=org.jboss.util.propertyeditor.StringArrayEditor
+       java.net.URL=org.jboss.util.propertyeditor.URLEditor
+     </attribute>
+   </mbean>
+   -->
+
+   <!-- ==================================================================== -->
+   <!-- Log4j Initialization                                                 -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.logging.Log4jService"
+      name="jboss.system:type=Log4jService,service=Logging"
+	  xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
+      <attribute name="ConfigurationURL">resource:log4j.xml</attribute>
+      <!-- Set the org.apache.log4j.helpers.LogLog.setQuiteMode. As of log4j1.2.8
+      this needs to be set to avoid a possible deadlock on exception at the
+      appender level. See bug#696819.
+      -->
+      <attribute name="Log4jQuietMode">true</attribute>
+      <!-- How frequently in seconds the ConfigurationURL is checked for changes -->
+      <attribute name="RefreshPeriod">60</attribute>
+   </mbean>
+
+
+   <!-- ==================================================================== -->
+   <!-- Service Binding                                                      -->
+   <!-- ==================================================================== -->
+
+   <!-- Automatically activated when generatting the clustering environment -->
+   <!-- @TESTSUITE_CLUSTER_CONFIG@ -->
+
+   <!--
+      | Binding service manager for port/host mapping. This is a sample
+      | config that demonstrates a JBoss instances with a server name 'ports-01'
+      | loading its bindings from an XML file using the ServicesStoreFactory
+      | implementation returned by the XMLServicesStoreFactory.
+      |
+      | ServerName: The unique name assigned to a JBoss server instance for
+      | lookup purposes. This allows a single ServicesStore to handle mulitiple
+      | JBoss servers.
+      |
+      | StoreURL: The URL string passed to org.jboss.services.binding.ServicesStore
+      | during initialization that specifies how to connect to the bindings store.
+      | StoreFactory: The org.jboss.services.binding.ServicesStoreFactory interface
+      | implementation to create to obtain the ServicesStore instance.
+
+   <mbean code="org.jboss.services.binding.ServiceBindingManager"
+     name="jboss.system:service=ServiceBindingManager">
+     <attribute name="ServerName">ports-01</attribute>
+     <attribute name="StoreURL">${jboss.home.url}/docs/examples/binding-manager/sample-bindings.xml</attribute>
+     <attribute name="StoreFactoryClassName">
+       org.jboss.services.binding.XMLServicesStoreFactory
+     </attribute>
+   </mbean>
+
+   -->
+
+   <!-- ==================================================================== -->
+   <!-- JNDI                                                                 -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.naming.NamingService"
+      name="jboss:service=Naming"
+      xmbean-dd="resource:xmdesc/NamingService-xmbean.xml">
+      <!-- The call by value mode. true if all lookups are unmarshalled using
+      the caller's TCL, false if in VM lookups return the value by reference.
+      -->
+      <attribute name="CallByValue">false</attribute>
+      <!-- The listening port for the bootstrap JNP service. Set this to -1
+        to run the NamingService without the JNP invoker listening port.
+      -->
+      <attribute name="Port">1099</attribute>
+      <!-- The bootstrap JNP server bind address. This also sets the default
+      RMI service bind address. Empty == all addresses
+       -->
+      <attribute name="BindAddress">${jboss.bind.address}</attribute>
+      <!-- The port of the RMI naming service, 0 == anonymous -->
+      <attribute name="RmiPort">1098</attribute>
+      <!-- The RMI service bind address. Empty == all addresses
+       -->
+      <attribute name="RmiBindAddress">${jboss.bind.address}</attribute>
+      <!-- The thread pool service used to control the bootstrap lookups -->
+      <depends optional-attribute-name="LookupPool"
+         proxy-type="attribute">jboss.system:service=ThreadPool</depends>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Security                                                             -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.security.plugins.SecurityConfig"
+      name="jboss.security:service=SecurityConfig">
+      <attribute name="LoginConfig">jboss.security:service=XMLLoginConfig</attribute>
+   </mbean>
+   <mbean code="org.jboss.security.auth.login.XMLLoginConfig"
+      name="jboss.security:service=XMLLoginConfig">
+      <attribute name="ConfigResource">login-config.xml</attribute>
+   </mbean>
+
+   <!-- JAAS security manager and realm mapping -->
+   <mbean code="org.jboss.security.plugins.JaasSecurityManagerService"
+      name="jboss.security:service=JaasSecurityManager">
+      <attribute name="SecurityManagerClassName">org.jboss.security.plugins.JaasSecurityManager</attribute>
+      <attribute name="DefaultUnauthenticatedPrincipal">anonymous</attribute>
+      <!-- DefaultCacheTimeout: Specifies the default timed cache policy timeout
+      in seconds.
+      If you want to disable caching of security credentials, set this to 0 to
+      force authentication to occur every time. This has no affect if the
+      AuthenticationCacheJndiName has been changed from the default value.
+      -->
+      <attribute name="DefaultCacheTimeout">0</attribute>
+      <!-- DefaultCacheResolution: Specifies the default timed cache policy
+      resolution in seconds. This controls the interval at which the cache
+      current timestamp is updated and should be less than the DefaultCacheTimeout
+      in order for the timeout to be meaningful. This has no affect if the
+      AuthenticationCacheJndiName has been changed from the default value.
+      -->
+      <attribute name="DefaultCacheResolution">60</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Transactions                                                         -->
+   <!-- ==================================================================== -->
+   <!-- The configurable Xid factory.  For use with Oracle, set pad to true -->
+   <mbean code="org.jboss.tm.XidFactory"
+      name="jboss:service=XidFactory">
+      <!--attribute name="Pad">true</attribute-->
+   </mbean>
+
+   <!--
+      | The fast in-memory transaction manager.
+    -->
+   <mbean code="org.jboss.tm.TransactionManagerService"
+      name="jboss:service=TransactionManager"
+      xmbean-dd="resource:xmdesc/TransactionManagerService-xmbean.xml">
+      <attribute name="TransactionTimeout">300</attribute>
+      <!-- set to false to disable transaction demarcation over IIOP -->
+      <attribute name="GlobalIdsEnabled">true</attribute>
+      <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
+   </mbean>
+   <!--
+      | UserTransaction support.
+    -->
+   <mbean code="org.jboss.tm.usertx.server.ClientUserTransactionService"
+      name="jboss:service=ClientUserTransaction"
+      xmbean-dd="resource:xmdesc/ClientUserTransaction-xmbean.xml">
+      <depends>
+         <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+            name="jboss:service=proxyFactory,target=ClientUserTransactionFactory">
+            <attribute name="InvokerName">jboss:service=invoker,type=jrmp</attribute>
+            <attribute name="TargetName">jboss:service=ClientUserTransaction</attribute>
+            <attribute name="JndiName">UserTransactionSessionFactory</attribute>
+            <attribute name="ExportedInterface">org.jboss.tm.usertx.interfaces.UserTransactionSessionFactory</attribute>
+            <attribute name="ClientInterceptors">
+               <interceptors>
+                  <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+                  <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+               </interceptors>
+            </attribute>
+            <depends>jboss:service=invoker,type=jrmp</depends>
+         </mbean>
+      </depends>
+      <depends optional-attribute-name="TxProxyName">
+         <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+            name="jboss:service=proxyFactory,target=ClientUserTransaction">
+            <attribute name="InvokerName">jboss:service=invoker,type=jrmp</attribute>
+            <attribute name="TargetName">jboss:service=ClientUserTransaction</attribute>
+            <attribute name="JndiName"></attribute>
+            <attribute name="ExportedInterface">org.jboss.tm.usertx.interfaces.UserTransactionSession</attribute>
+            <attribute name="ClientInterceptors">
+               <interceptors>
+                  <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+                  <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+               </interceptors>
+            </attribute>
+            <depends>jboss:service=invoker,type=jrmp</depends>
+         </mbean>
+      </depends>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Invokers to the JMX node                                             -->
+   <!-- ==================================================================== -->
+
+   <!-- RMI/JRMP invoker -->
+   <mbean code="org.jboss.invocation.jrmp.server.JRMPInvoker"
+      name="jboss:service=invoker,type=jrmp">
+      <attribute name="RMIObjectPort">4444</attribute>
+      <attribute name="ServerAddress">${jboss.bind.address}</attribute>
+      <!--
+      <attribute name="RMIClientSocketFactory">custom</attribute>
+      <attribute name="RMIServerSocketFactory">custom</attribute>
+      <attribute name="RMIServerSocketAddr">custom</attribute>
+      <attribute name="SecurityDomain">ssl-domain-name</attribute>
+      -->
+      <depends>jboss:service=TransactionManager</depends>
+   </mbean>
+
+   <mbean code="org.jboss.invocation.local.LocalInvoker"
+      name="jboss:service=invoker,type=local">
+
+      <depends>jboss:service=TransactionManager</depends>
+   </mbean>
+
+
+   <!-- ==================================================================== -->
+   <!-- Monitoring and Management                                            -->
+   <!-- ==================================================================== -->
+
+   <!-- Uncomment to enable JMX monitoring of the bean cache
+   <mbean code="org.jboss.monitor.BeanCacheMonitor"
+          name="jboss.monitor:name=BeanCacheMonitor"/>
+   -->
+
+   <!-- Uncomment to enable JMX monitoring of the entity bean locking
+   <mbean code="org.jboss.monitor.EntityLockMonitor"
+          name="jboss.monitor:name=EntityLockMonitor"/>
+   -->
+
+   <!-- ==================================================================== -->
+   <!-- An MBean that is a registry for JDBC type-mapping metadata           -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.ejb.plugins.cmp.jdbc.metadata.MetaDataLibrary"
+      name="jboss.jdbc:service=metadata"/>
+
+   <!-- ==================================================================== -->
+   <!-- Deployment Scanning                                                  -->
+   <!-- ==================================================================== -->
+
+   <!-- An mbean for hot deployment/undeployment of archives.
+   -->
+   <mbean code="org.jboss.deployment.scanner.URLDeploymentScanner"
+      name="jboss.deployment:type=DeploymentScanner,flavor=URL">
+
+      <!-- Uncomment (and comment/remove version below) to enable usage of the
+        DeploymentCache
+      <depends optional-attribute-name="Deployer">jboss.deployment:type=DeploymentCache</depends>
+      -->
+      <depends optional-attribute-name="Deployer">jboss.system:service=MainDeployer</depends>
+
+      <!-- The URLComparator can be used to specify a deployment ordering
+           for deployments found in a scanned directory.  The class specified
+           must be an implementation of java.util.Comparator, it must be able
+           to compare two URL objects, and it must have a no-arg constructor.
+           Two deployment comparators are shipped with JBoss:
+             - org.jboss.deployment.DeploymentSorter
+               Sorts by file extension, as follows:
+                 "sar", "service.xml", "rar", "jar", "war", "wsr", "ear", "zip",
+                 "*"
+             - org.jboss.deployment.scanner.PrefixDeploymentSorter
+               If the name portion of the url begins with 1 or more digits, those
+               digits are converted to an int (ignoring leading zeroes), and
+               files are deployed in that order.  Files that do not start with
+               any digits will be deployed first, and they will be sorted by
+               extension as above with DeploymentSorter.
+      -->
+      <attribute name="URLComparator">org.jboss.deployment.DeploymentSorter</attribute>
+      <!--
+      <attribute name="URLComparator">org.jboss.deployment.scanner.PrefixDeploymentSorter</attribute>
+      -->
+
+      <!-- The FilterInstance specifies a URLLister.URLFilter for scanned
+           directories. This DeploymentFilter is initialized with the given
+           prefixes, suffixes and matches that define which URLs should be
+           ignored.
+      -->
+      <attribute name="FilterInstance"
+         attributeClass="org.jboss.deployment.scanner.DeploymentFilter"
+         serialDataType="javaBean">
+         <!-- Files starting with theses strings are ignored -->
+         <property name="prefixes">#,%,\,,.,_$</property>
+         <!-- Files ending with theses strings are ignored -->
+         <property name="suffixes">#,$,%,~,\,v,.BAK,.bak,.old,.orig,.tmp,.rej,.sh</property>
+         <!-- Files matching with theses strings are ignored -->
+         <property name="matches">.make.state,.nse_depinfo,CVS,CVS.admin,RCS,RCSLOG,SCCS,TAGS,core,tags</property>
+      </attribute>
+
+      <!-- Frequency in milliseconds to rescan the URLs for changes -->
+      <attribute name="ScanPeriod">5000</attribute>
+      <!-- A flag to disable the scans -->
+      <attribute name="ScanEnabled">true</attribute>
+
+      <!-- URLs are comma separated and resolve relative to the server home URL
+         unless the given path is absolute. If the URL ends in "/" it is
+         considered a collection and scanned, otherwise it is simply deployed;
+         this follows RFC2518 convention and allows discrimination between
+         collections and directories that are simply unpacked archives.
+
+         URLs may be local (file:) or remote (http:). Scanning is supported
+         for remote URLs but unpacked deployment units are not.
+
+         Example URLs:
+            deploy/
+                 scans ${jboss.server.url}/deploy/, which is local or remote
+                 depending on the URL used to boot the server
+            ${jboss.server.home}/deploy/
+                 scans ${jboss.server.home)/deploy, which is always local
+            file:/var/opt/myapp.ear
+                 deploy myapp.ear from a local location
+            file:/var/opt/apps/
+                 scans the specified directory
+            http://www.test.com/netboot/myapp.ear
+                 deploys myapp.ear from a remote location
+            http://www.test.com/netboot/apps/
+                 scans the specified WebDAV location
+       -->
+      <attribute name="URLs">
+         deploy/
+      </attribute>
+
+      <!-- Indicates if the scanner should recursively scan directories that
+      contain no "." in their names. This can be used to group applications
+      and services that must be deployed and that have the same
+      logical function in the same directory i.e.
+        deploy/JMX/
+        deploy/JMS/
+        ...
+      -->
+
+      <attribute name="RecursiveSearch">True</attribute>
+
+   </mbean>
+
+</server>
Index: lams_build/conf/unix/jboss/standardjboss.slim.xml
===================================================================
diff -u
--- lams_build/conf/unix/jboss/standardjboss.slim.xml	(revision 0)
+++ lams_build/conf/unix/jboss/standardjboss.slim.xml	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -0,0 +1,1038 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss PUBLIC
+   "-//JBoss//DTD JBOSS 4.0//EN"
+   "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
+<!-- ===================================================================== -->
+<!--  Standard JBoss EJB Configurations                                    -->
+<!-- ===================================================================== -->
+<!-- $Id$ -->
+
+<jboss>
+  <enforce-ejb-restrictions>false</enforce-ejb-restrictions>
+
+  <invoker-proxy-bindings>
+
+    <invoker-proxy-binding>
+      <name>entity-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmp</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactory</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.EntityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+          <list-entity>
+            <interceptor>org.jboss.proxy.ejb.ListEntityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </list-entity>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>clustered-entity-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.EntityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+          <list-entity>
+            <interceptor>org.jboss.proxy.ejb.ListEntityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </list-entity>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>stateless-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmp</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactory</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.StatelessSessionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>clustered-stateless-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.StatelessSessionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>stateful-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmp</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactory</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.StatefulSessionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>clustered-stateful-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.StatefulSessionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>message-driven-bean</name>
+      <invoker-mbean>default</invoker-mbean>
+      <proxy-factory>org.jboss.ejb.plugins.jms.JMSContainerInvoker</proxy-factory>
+      <proxy-factory-config>
+        <JMSProviderAdapterJNDI>DefaultJMSProvider</JMSProviderAdapterJNDI>
+        <ServerSessionPoolFactoryJNDI>StdJMSPool</ServerSessionPoolFactoryJNDI>
+        <CreateJBossMQDestination>true</CreateJBossMQDestination>
+        <!-- WARN: Don't set this to zero until a bug in the pooled executor is fixed -->
+        <MinimumSize>1</MinimumSize>
+        <MaximumSize>15</MaximumSize>
+        <KeepAliveMillis>30000</KeepAliveMillis>
+        <MaxMessages>1</MaxMessages>
+        <MDBConfig>
+          <ReconnectIntervalSec>10</ReconnectIntervalSec>
+          <DLQConfig>
+            <DestinationQueue>queue/DLQ</DestinationQueue>
+            <MaxTimesRedelivered>10</MaxTimesRedelivered>
+            <TimeToLive>0</TimeToLive>
+          </DLQConfig>
+        </MDBConfig>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <!-- Uncomment to use JMS message inflow from jmsra.rar
+    <invoker-proxy-binding>
+      <name>message-driven-bean</name>
+      <invoker-mbean>default</invoker-mbean>
+      <proxy-factory>org.jboss.ejb.plugins.inflow.JBossJMSMessageEndpointFactory</proxy-factory>
+      <proxy-factory-config>
+        <activation-config>
+           <activation-config-property>
+              <activation-config-property-name>providerAdapterJNDI</activation-config-property-name>
+              <activation-config-property-value>DefaultJMSProvider</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>minSession</activation-config-property-name>
+              <activation-config-property-value>1</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>maxSession</activation-config-property-name>
+              <activation-config-property-value>15</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>keepAlive</activation-config-property-name>
+              <activation-config-property-value>60000</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>maxMessages</activation-config-property-name>
+              <activation-config-property-value>1</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>reconnectInterval</activation-config-property-name>
+              <activation-config-property-value>10</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>useDLQ</activation-config-property-name>
+              <activation-config-property-value>true</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQHandler</activation-config-property-name>
+              <activation-config-property-value>org.jboss.resource.adapter.jms.inflow.dlq.GenericDLQHandler</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQJNDIName</activation-config-property-name>
+              <activation-config-property-value>queue/DLQ</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQMaxResent</activation-config-property-name>
+              <activation-config-property-value>10</activation-config-property-value>
+           </activation-config-property>
+        </activation-config>
+        <endpoint-interceptors>
+          <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+          <interceptor>org.jboss.ejb.plugins.inflow.MessageEndpointInterceptor</interceptor>
+          <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+          <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+        </endpoint-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+    -->
+    
+    <invoker-proxy-binding>
+      <name>singleton-message-driven-bean</name>
+      <invoker-mbean>default</invoker-mbean>
+      <proxy-factory>org.jboss.ejb.plugins.jms.JMSContainerInvoker</proxy-factory>
+      <proxy-factory-config>
+        <JMSProviderAdapterJNDI>DefaultJMSProvider</JMSProviderAdapterJNDI>
+        <ServerSessionPoolFactoryJNDI>StdJMSPool</ServerSessionPoolFactoryJNDI>
+        <CreateJBossMQDestination>true</CreateJBossMQDestination>
+        <!-- WARN: Don't set this to zero until a bug in the pooled executor is fixed -->
+        <MinimumSize>1</MinimumSize>
+        <MaximumSize>1</MaximumSize>
+        <KeepAliveMillis>30000</KeepAliveMillis>
+        <MaxMessages>1</MaxMessages>
+        <MDBConfig>
+          <ReconnectIntervalSec>10</ReconnectIntervalSec>
+          <DLQConfig>
+            <DestinationQueue>queue/DLQ</DestinationQueue>
+            <MaxTimesRedelivered>10</MaxTimesRedelivered>
+            <TimeToLive>0</TimeToLive>
+          </DLQConfig>
+        </MDBConfig>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>message-inflow-driven-bean</name>
+      <invoker-mbean>default</invoker-mbean>
+      <proxy-factory>org.jboss.ejb.plugins.inflow.JBossMessageEndpointFactory</proxy-factory>
+      <proxy-factory-config>
+        <endpoint-interceptors>
+          <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+          <interceptor>org.jboss.ejb.plugins.inflow.MessageEndpointInterceptor</interceptor>
+          <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+          <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+        </endpoint-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>iiop</name>
+      <invoker-mbean>jboss:service=invoker,type=iiop</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.IORFactory</proxy-factory>
+      <proxy-factory-config>
+        <web-class-loader>org.jboss.iiop.WebCL</web-class-loader>
+        <poa>per-servant</poa>
+        <register-ejbs-in-jnp-context>true</register-ejbs-in-jnp-context>
+        <jnp-context>iiop</jnp-context>
+        <interface-repository-supported>false</interface-repository-supported>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>jms-message-inflow-driven-bean</name>
+      <invoker-mbean>default</invoker-mbean>
+      <proxy-factory>org.jboss.ejb.plugins.inflow.JBossJMSMessageEndpointFactory</proxy-factory>
+      <proxy-factory-config>
+        <activation-config>
+           <activation-config-property>
+              <activation-config-property-name>providerAdapterJNDI</activation-config-property-name>
+              <activation-config-property-value>DefaultJMSProvider</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>minSession</activation-config-property-name>
+              <activation-config-property-value>1</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>maxSession</activation-config-property-name>
+              <activation-config-property-value>15</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>keepAlive</activation-config-property-name>
+              <activation-config-property-value>60000</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>maxMessages</activation-config-property-name>
+              <activation-config-property-value>1</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>reconnectInterval</activation-config-property-name>
+              <activation-config-property-value>10</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>useDLQ</activation-config-property-name>
+              <activation-config-property-value>true</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQHandler</activation-config-property-name>
+              <activation-config-property-value>org.jboss.resource.adapter.jms.inflow.dlq.GenericDLQHandler</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQJNDIName</activation-config-property-name>
+              <activation-config-property-value>queue/DLQ</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQMaxResent</activation-config-property-name>
+              <activation-config-property-value>10</activation-config-property-value>
+           </activation-config-property>
+        </activation-config>
+        <endpoint-interceptors>
+          <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+          <interceptor>org.jboss.ejb.plugins.inflow.MessageEndpointInterceptor</interceptor>
+          <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+          <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+        </endpoint-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+  </invoker-proxy-bindings>
+
+  <container-configurations>
+
+    <container-configuration>
+      <container-name>Standard CMP 2.x EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <call-ejb-store-on-clean>true</call-ejb-store-on-clean>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.InvalidableEntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>B</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <!--
+         | This is like standard IPT but with global (cross-transactional) row cache behind,
+         | i.e. no locking in EJB layer + global persistence data cache
+      -->
+      <container-name>cmp2.x jdbc2 pm</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>true</insert-after-ejb-post-create>
+      <call-ejb-store-on-clean>true</call-ejb-store-on-clean>
+      <container-interceptors>
+         <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+         <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+         <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.cmp.jdbc2.RelationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.PerTxEntityInstanceCache</instance-cache> 
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc2.JDBCStoreManager2</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.NoLock</locking-policy> 
+      <container-cache-conf>
+         <cache-policy-conf>
+            <min-capacity>500</min-capacity>
+            <max-capacity>10000</max-capacity>
+         </cache-policy-conf>
+         <cache-policy-conf-other>
+            <partitions>10</partitions>
+            <!-- uncomment to use JDBC java.sql.Statement.executeBatch()
+            <batch-commit-strategy/>
+            -->
+         </cache-policy-conf-other>
+      </container-cache-conf>
+      <container-pool-conf>
+         <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>C</commit-option> <!-- don't change, irrelevant, use container-cache-conf -->
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Clustered CMP 2.x EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>clustered-entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>B</commit-option>
+      <cluster-config>
+         <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+      </cluster-config>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard CMP 2.x EntityBean with cache invalidation</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+        <interceptor>org.jboss.cache.invalidation.triggers.EntityBeanCacheBatchInvalidatorInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.InvalidableEntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>A</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Instance Per Transaction CMP 2.x EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.PerTxEntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.NoLock</locking-policy>
+      <container-cache-conf/>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>C</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard CMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>A</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Clustered CMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>clustered-entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>A</commit-option>
+      <cluster-config>
+         <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+      </cluster-config>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Instance Per Transaction CMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.PerTxEntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.NoLock</locking-policy>
+      <container-cache-conf/>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>C</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard Stateless SessionBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>stateless-rmi-invoker</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.webservice.server.ServiceEndpointInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.webservice.server.ServiceEndpointInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.StatelessSessionInstancePool</instance-pool>
+      <instance-cache></instance-cache>
+      <persistence-manager></persistence-manager>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Clustered Stateless SessionBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>clustered-stateless-rmi-invoker</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.webservice.server.ServiceEndpointInterceptor </interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.webservice.server.ServiceEndpointInterceptor </interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.StatelessSessionInstancePool</instance-pool>
+      <instance-cache></instance-cache>
+      <persistence-manager></persistence-manager>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <cluster-config>
+         <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+      </cluster-config>
+    </container-configuration>
+
+
+    <container-configuration>
+      <container-name>Standard Stateful SessionBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>stateful-rmi-invoker</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+      </container-interceptors>
+      <instance-cache>org.jboss.ejb.plugins.StatefulSessionInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.StatefulSessionFilePersistenceManager</persistence-manager>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUStatefulContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <remover-period>1800</remover-period>
+          <max-bean-life>1800</max-bean-life>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Clustered Stateful SessionBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>clustered-stateful-rmi-invoker</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.StatefulHASessionSynchronisationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-cache>org.jboss.ejb.plugins.StatefulHASessionInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.StatefulHASessionPersistenceManager</persistence-manager>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUStatefulContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <remover-period>1800</remover-period>
+          <max-bean-life>1800</max-bean-life>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <cluster-config>
+         <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+      </cluster-config>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard BMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.BMPPersistenceManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>A</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Clustered BMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>clustered-entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.BMPPersistenceManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>A</commit-option>
+      <cluster-config>
+         <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+      </cluster-config>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Instance Per Transaction BMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.PerTxEntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.BMPPersistenceManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.NoLock</locking-policy>
+      <container-cache-conf/>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>C</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard Message Driven Bean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>message-driven-bean</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.RunAsSecurityInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenTxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.MessageDrivenInstancePool</instance-pool>
+      <instance-cache></instance-cache>
+      <persistence-manager></persistence-manager>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Singleton Message Driven Bean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>singleton-message-driven-bean</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.RunAsSecurityInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenTxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.MessageDrivenInstancePool</instance-pool>
+      <instance-cache></instance-cache>
+      <persistence-manager></persistence-manager>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard Message Inflow Driven Bean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>message-inflow-driven-bean</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.RunAsSecurityInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenTxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.MessageDrivenInstancePool</instance-pool>
+      <instance-cache></instance-cache>
+      <persistence-manager></persistence-manager>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+    </container-configuration>
+
+  </container-configurations>
+
+</jboss>
Index: lams_build/conf/windows/jboss/ejb-deployer.slim.xml
===================================================================
diff -u
--- lams_build/conf/windows/jboss/ejb-deployer.slim.xml	(revision 0)
+++ lams_build/conf/windows/jboss/ejb-deployer.slim.xml	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- The JBoss service configuration file for the EJB deployer service.
+$Id$
+-->
+<server>
+
+  <!-- ==================================================================== -->
+  <!-- J2EE Timer Service                                                   -->
+  <!-- ==================================================================== -->
+
+  <!-- An EJB Timer Service that is Tx aware -->
+  <mbean code="org.jboss.ejb.txtimer.EJBTimerServiceImpl"
+    name="jboss.ejb:service=EJBTimerService">
+    <attribute name="RetryPolicy">jboss.ejb:service=EJBTimerService,retryPolicy=fixedDelay</attribute>
+    <attribute name="PersistencePolicy">jboss.ejb:service=EJBTimerService,persistencePolicy=database</attribute>
+    <attribute name="TimerIdGeneratorClassName">org.jboss.ejb.txtimer.BigIntegerTimerIdGenerator</attribute>
+    <attribute name="TimedObjectInvokerClassName">org.jboss.ejb.txtimer.TimedObjectInvokerImpl</attribute>
+  </mbean>
+
+  <!-- A retry policy that uses a fixed interval in milli seconds -->
+  <mbean code="org.jboss.ejb.txtimer.FixedDelayRetryPolicy" name="jboss.ejb:service=EJBTimerService,retryPolicy=fixedDelay">
+    <attribute name="Delay">100</attribute>
+  </mbean>
+
+  <!-- A persistence policy that does not persist the timer
+  <mbean code="org.jboss.ejb.txtimer.NoopPersistencePolicy" name="jboss.ejb:service=EJBTimerService,persistencePolicy=noop"/>
+  -->
+
+  <!-- A persistence policy that persistes timers to a database -->
+  <mbean code="org.jboss.ejb.txtimer.DatabasePersistencePolicy" name="jboss.ejb:service=EJBTimerService,persistencePolicy=database">
+    <!-- DataSource JNDI name -->
+    <depends optional-attribute-name="DataSource">jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+    <!-- The plugin that handles database persistence -->
+    <attribute name="DatabasePersistencePlugin">org.jboss.ejb.txtimer.GeneralPurposeDatabasePersistencePlugin</attribute>
+  </mbean>
+
+  <!-- ==================================================================== -->
+  <!-- EJB Deployer                                                         -->
+  <!-- ==================================================================== -->
+
+  <!-- EJB deployer, remove to disable EJB behavior-->
+  <mbean code="org.jboss.ejb.EJBDeployer" name="jboss.ejb:service=EJBDeployer">
+    <!-- A flag indicating if the deployer should validate the
+    ejb-jar.xml/jboss.xml descriptors and components
+    -->
+    <attribute name="VerifyDeployments">true</attribute>
+    <!-- A flag indicating if the xml parser should validate the descriptor
+    DTDs
+    -->
+    <attribute name="ValidateDTDs">false</attribute>
+    <!-- A flag indicating if the verifier should be verbose about its
+    operation
+    -->
+    <attribute name="VerifierVerbose">true</attribute>
+    <!-- Setting this to 'true' will cause all deployments
+     to fail when the Verifier detected a problem with the contained
+     Beans. If false, warnings/errors will be logged but the deployment
+     will not fail.
+    -->
+    <attribute name="StrictVerifier">true</attribute>
+
+    <!-- The EJBDeployer needs the JTA transaction manager service -->
+    <depends optional-attribute-name="TransactionManagerServiceName">jboss:service=TransactionManager</depends>
+    <!-- The dynamic class loading simple web server -->
+    <!--  <depends optional-attribute-name="WebServiceName">jboss:service=WebService</depends> -->
+  </mbean>
+
+</server>
Index: lams_build/conf/windows/jboss/jboss-service.slim.xml
===================================================================
diff -u
--- lams_build/conf/windows/jboss/jboss-service.slim.xml	(revision 0)
+++ lams_build/conf/windows/jboss/jboss-service.slim.xml	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -0,0 +1,395 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id$ -->
+
+<!-- ===================================================================== -->
+<!--  JBoss Server Configuration                                           -->
+<!-- ===================================================================== -->
+
+<server>
+
+   <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
+     can be restricted to specific jars by specifying them in the archives
+     attribute.
+    -->
+   <classpath codebase="lib" archives="*"/>
+
+
+   <!-- ==================================================================== -->
+   <!-- JSR-77 Single JBoss Server Management Domain                         -->
+   <!-- ==================================================================== -->
+   <mbean code="org.jboss.management.j2ee.LocalJBossServerDomain"
+      name="jboss.management.local:j2eeType=J2EEDomain,name=Manager">
+      <attribute name="MainDeployer">jboss.system:service=MainDeployer</attribute>
+      <attribute name="SARDeployer">jboss.system:service=ServiceDeployer</attribute>
+      <attribute name="EARDeployer">jboss.j2ee:service=EARDeployer</attribute>
+      <attribute name="EJBDeployer">jboss.ejb:service=EJBDeployer</attribute>
+      <attribute name="RARDeployer">jboss.jca:service=RARDeployer</attribute>
+      <attribute name="CMDeployer">jboss.jca:service=ConnectionFactoryDeployer</attribute>
+      <attribute name="WARDeployer">jboss.web:service=WebServer</attribute>
+      <attribute name="MailService">jboss:service=Mail</attribute>
+      <attribute name="JNDIService">jboss:service=Naming</attribute>
+      <attribute name="JTAService">jboss:service=TransactionManager</attribute>
+   </mbean>
+   
+   <!-- A Thread pool service -->
+   <mbean code="org.jboss.util.threadpool.BasicThreadPool"
+      name="jboss.system:service=ThreadPool">
+      <attribute name="Name">JBoss System Threads</attribute>
+      <attribute name="ThreadGroupName">System Threads</attribute>
+      <!-- How long a thread will live without any tasks in MS -->
+      <attribute name="KeepAliveTime">60000</attribute>
+      <!-- The max number of threads in the pool -->
+      <attribute name="MaximumPoolSize">10</attribute>
+      <!-- The max number of tasks before the queue is full -->
+      <attribute name="MaximumQueueSize">1000</attribute>
+      <!-- The behavior of the pool when a task is added and the queue is full.
+      abort - a RuntimeException is thrown
+      run - the calling thread executes the task
+      wait - the calling thread blocks until the queue has room
+      discard - the task is silently discarded without being run
+      discardOldest - check to see if a task is about to complete and enque
+         the new task if possible, else run the task in the calling thread
+      -->
+      <attribute name="BlockingMode">run</attribute>
+   </mbean>
+
+   <!-- Preload all custom editors for VMs that don't use the thread
+        context class loader when searching for PropertyEditors. Uncomment
+        if your JDK 1.3.0 VM fails to find JBoss PropertyEditors.
+   <mbean code="org.jboss.varia.property.PropertyEditorManagerService"
+     name="jboss:type=Service,name=BootstrapEditors">
+     <attribute name="BootstrapEditors">
+       java.math.BigDecimal=org.jboss.util.propertyeditor.BigDecimalEditor
+       java.lang.Boolean=org.jboss.util.propertyeditor.BooleanEditor
+       java.lang.Class=org.jboss.util.propertyeditor.ClassEditor
+       java.util.Date=org.jboss.util.propertyeditor.DateEditor
+       java.io.File=org.jboss.util.propertyeditor.FileEditor
+       java.net.InetAddress=org.jboss.util.propertyeditor.InetAddressEditor
+       java.lang.Integer=org.jboss.util.propertyeditor.IntegerEditor
+       javax.management.ObjectName=org.jboss.mx.util.propertyeditor.ObjectNameEditor
+       java.util.Properties=org.jboss.util.propertyeditor.PropertiesEditor
+       [Ljava.lang.String;=org.jboss.util.propertyeditor.StringArrayEditor
+       java.net.URL=org.jboss.util.propertyeditor.URLEditor
+     </attribute>
+   </mbean>
+   -->
+
+   <!-- ==================================================================== -->
+   <!-- Log4j Initialization                                                 -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.logging.Log4jService"
+      name="jboss.system:type=Log4jService,service=Logging"
+	  xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
+      <attribute name="ConfigurationURL">resource:log4j.xml</attribute>
+      <!-- Set the org.apache.log4j.helpers.LogLog.setQuiteMode. As of log4j1.2.8
+      this needs to be set to avoid a possible deadlock on exception at the
+      appender level. See bug#696819.
+      -->
+      <attribute name="Log4jQuietMode">true</attribute>
+      <!-- How frequently in seconds the ConfigurationURL is checked for changes -->
+      <attribute name="RefreshPeriod">60</attribute>
+   </mbean>
+
+
+   <!-- ==================================================================== -->
+   <!-- Service Binding                                                      -->
+   <!-- ==================================================================== -->
+
+   <!-- Automatically activated when generatting the clustering environment -->
+   <!-- @TESTSUITE_CLUSTER_CONFIG@ -->
+
+   <!--
+      | Binding service manager for port/host mapping. This is a sample
+      | config that demonstrates a JBoss instances with a server name 'ports-01'
+      | loading its bindings from an XML file using the ServicesStoreFactory
+      | implementation returned by the XMLServicesStoreFactory.
+      |
+      | ServerName: The unique name assigned to a JBoss server instance for
+      | lookup purposes. This allows a single ServicesStore to handle mulitiple
+      | JBoss servers.
+      |
+      | StoreURL: The URL string passed to org.jboss.services.binding.ServicesStore
+      | during initialization that specifies how to connect to the bindings store.
+      | StoreFactory: The org.jboss.services.binding.ServicesStoreFactory interface
+      | implementation to create to obtain the ServicesStore instance.
+
+   <mbean code="org.jboss.services.binding.ServiceBindingManager"
+     name="jboss.system:service=ServiceBindingManager">
+     <attribute name="ServerName">ports-01</attribute>
+     <attribute name="StoreURL">${jboss.home.url}/docs/examples/binding-manager/sample-bindings.xml</attribute>
+     <attribute name="StoreFactoryClassName">
+       org.jboss.services.binding.XMLServicesStoreFactory
+     </attribute>
+   </mbean>
+
+   -->
+
+   <!-- ==================================================================== -->
+   <!-- JNDI                                                                 -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.naming.NamingService"
+      name="jboss:service=Naming"
+      xmbean-dd="resource:xmdesc/NamingService-xmbean.xml">
+      <!-- The call by value mode. true if all lookups are unmarshalled using
+      the caller's TCL, false if in VM lookups return the value by reference.
+      -->
+      <attribute name="CallByValue">false</attribute>
+      <!-- The listening port for the bootstrap JNP service. Set this to -1
+        to run the NamingService without the JNP invoker listening port.
+      -->
+      <attribute name="Port">1099</attribute>
+      <!-- The bootstrap JNP server bind address. This also sets the default
+      RMI service bind address. Empty == all addresses
+       -->
+      <attribute name="BindAddress">${jboss.bind.address}</attribute>
+      <!-- The port of the RMI naming service, 0 == anonymous -->
+      <attribute name="RmiPort">1098</attribute>
+      <!-- The RMI service bind address. Empty == all addresses
+       -->
+      <attribute name="RmiBindAddress">${jboss.bind.address}</attribute>
+      <!-- The thread pool service used to control the bootstrap lookups -->
+      <depends optional-attribute-name="LookupPool"
+         proxy-type="attribute">jboss.system:service=ThreadPool</depends>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Security                                                             -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.security.plugins.SecurityConfig"
+      name="jboss.security:service=SecurityConfig">
+      <attribute name="LoginConfig">jboss.security:service=XMLLoginConfig</attribute>
+   </mbean>
+   <mbean code="org.jboss.security.auth.login.XMLLoginConfig"
+      name="jboss.security:service=XMLLoginConfig">
+      <attribute name="ConfigResource">login-config.xml</attribute>
+   </mbean>
+
+   <!-- JAAS security manager and realm mapping -->
+   <mbean code="org.jboss.security.plugins.JaasSecurityManagerService"
+      name="jboss.security:service=JaasSecurityManager">
+      <attribute name="SecurityManagerClassName">org.jboss.security.plugins.JaasSecurityManager</attribute>
+      <attribute name="DefaultUnauthenticatedPrincipal">anonymous</attribute>
+      <!-- DefaultCacheTimeout: Specifies the default timed cache policy timeout
+      in seconds.
+      If you want to disable caching of security credentials, set this to 0 to
+      force authentication to occur every time. This has no affect if the
+      AuthenticationCacheJndiName has been changed from the default value.
+      -->
+      <attribute name="DefaultCacheTimeout">0</attribute>
+      <!-- DefaultCacheResolution: Specifies the default timed cache policy
+      resolution in seconds. This controls the interval at which the cache
+      current timestamp is updated and should be less than the DefaultCacheTimeout
+      in order for the timeout to be meaningful. This has no affect if the
+      AuthenticationCacheJndiName has been changed from the default value.
+      -->
+      <attribute name="DefaultCacheResolution">60</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Transactions                                                         -->
+   <!-- ==================================================================== -->
+   <!-- The configurable Xid factory.  For use with Oracle, set pad to true -->
+   <mbean code="org.jboss.tm.XidFactory"
+      name="jboss:service=XidFactory">
+      <!--attribute name="Pad">true</attribute-->
+   </mbean>
+
+   <!--
+      | The fast in-memory transaction manager.
+    -->
+   <mbean code="org.jboss.tm.TransactionManagerService"
+      name="jboss:service=TransactionManager"
+      xmbean-dd="resource:xmdesc/TransactionManagerService-xmbean.xml">
+      <attribute name="TransactionTimeout">300</attribute>
+      <!-- set to false to disable transaction demarcation over IIOP -->
+      <attribute name="GlobalIdsEnabled">true</attribute>
+      <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
+   </mbean>
+   <!--
+      | UserTransaction support.
+    -->
+   <mbean code="org.jboss.tm.usertx.server.ClientUserTransactionService"
+      name="jboss:service=ClientUserTransaction"
+      xmbean-dd="resource:xmdesc/ClientUserTransaction-xmbean.xml">
+      <depends>
+         <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+            name="jboss:service=proxyFactory,target=ClientUserTransactionFactory">
+            <attribute name="InvokerName">jboss:service=invoker,type=jrmp</attribute>
+            <attribute name="TargetName">jboss:service=ClientUserTransaction</attribute>
+            <attribute name="JndiName">UserTransactionSessionFactory</attribute>
+            <attribute name="ExportedInterface">org.jboss.tm.usertx.interfaces.UserTransactionSessionFactory</attribute>
+            <attribute name="ClientInterceptors">
+               <interceptors>
+                  <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+                  <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+               </interceptors>
+            </attribute>
+            <depends>jboss:service=invoker,type=jrmp</depends>
+         </mbean>
+      </depends>
+      <depends optional-attribute-name="TxProxyName">
+         <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+            name="jboss:service=proxyFactory,target=ClientUserTransaction">
+            <attribute name="InvokerName">jboss:service=invoker,type=jrmp</attribute>
+            <attribute name="TargetName">jboss:service=ClientUserTransaction</attribute>
+            <attribute name="JndiName"></attribute>
+            <attribute name="ExportedInterface">org.jboss.tm.usertx.interfaces.UserTransactionSession</attribute>
+            <attribute name="ClientInterceptors">
+               <interceptors>
+                  <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+                  <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+               </interceptors>
+            </attribute>
+            <depends>jboss:service=invoker,type=jrmp</depends>
+         </mbean>
+      </depends>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Invokers to the JMX node                                             -->
+   <!-- ==================================================================== -->
+
+   <!-- RMI/JRMP invoker -->
+   <mbean code="org.jboss.invocation.jrmp.server.JRMPInvoker"
+      name="jboss:service=invoker,type=jrmp">
+      <attribute name="RMIObjectPort">4444</attribute>
+      <attribute name="ServerAddress">${jboss.bind.address}</attribute>
+      <!--
+      <attribute name="RMIClientSocketFactory">custom</attribute>
+      <attribute name="RMIServerSocketFactory">custom</attribute>
+      <attribute name="RMIServerSocketAddr">custom</attribute>
+      <attribute name="SecurityDomain">ssl-domain-name</attribute>
+      -->
+      <depends>jboss:service=TransactionManager</depends>
+   </mbean>
+
+   <mbean code="org.jboss.invocation.local.LocalInvoker"
+      name="jboss:service=invoker,type=local">
+
+      <depends>jboss:service=TransactionManager</depends>
+   </mbean>
+
+
+   <!-- ==================================================================== -->
+   <!-- Monitoring and Management                                            -->
+   <!-- ==================================================================== -->
+
+   <!-- Uncomment to enable JMX monitoring of the bean cache
+   <mbean code="org.jboss.monitor.BeanCacheMonitor"
+          name="jboss.monitor:name=BeanCacheMonitor"/>
+   -->
+
+   <!-- Uncomment to enable JMX monitoring of the entity bean locking
+   <mbean code="org.jboss.monitor.EntityLockMonitor"
+          name="jboss.monitor:name=EntityLockMonitor"/>
+   -->
+
+   <!-- ==================================================================== -->
+   <!-- An MBean that is a registry for JDBC type-mapping metadata           -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.ejb.plugins.cmp.jdbc.metadata.MetaDataLibrary"
+      name="jboss.jdbc:service=metadata"/>
+
+   <!-- ==================================================================== -->
+   <!-- Deployment Scanning                                                  -->
+   <!-- ==================================================================== -->
+
+   <!-- An mbean for hot deployment/undeployment of archives.
+   -->
+   <mbean code="org.jboss.deployment.scanner.URLDeploymentScanner"
+      name="jboss.deployment:type=DeploymentScanner,flavor=URL">
+
+      <!-- Uncomment (and comment/remove version below) to enable usage of the
+        DeploymentCache
+      <depends optional-attribute-name="Deployer">jboss.deployment:type=DeploymentCache</depends>
+      -->
+      <depends optional-attribute-name="Deployer">jboss.system:service=MainDeployer</depends>
+
+      <!-- The URLComparator can be used to specify a deployment ordering
+           for deployments found in a scanned directory.  The class specified
+           must be an implementation of java.util.Comparator, it must be able
+           to compare two URL objects, and it must have a no-arg constructor.
+           Two deployment comparators are shipped with JBoss:
+             - org.jboss.deployment.DeploymentSorter
+               Sorts by file extension, as follows:
+                 "sar", "service.xml", "rar", "jar", "war", "wsr", "ear", "zip",
+                 "*"
+             - org.jboss.deployment.scanner.PrefixDeploymentSorter
+               If the name portion of the url begins with 1 or more digits, those
+               digits are converted to an int (ignoring leading zeroes), and
+               files are deployed in that order.  Files that do not start with
+               any digits will be deployed first, and they will be sorted by
+               extension as above with DeploymentSorter.
+      -->
+      <attribute name="URLComparator">org.jboss.deployment.DeploymentSorter</attribute>
+      <!--
+      <attribute name="URLComparator">org.jboss.deployment.scanner.PrefixDeploymentSorter</attribute>
+      -->
+
+      <!-- The FilterInstance specifies a URLLister.URLFilter for scanned
+           directories. This DeploymentFilter is initialized with the given
+           prefixes, suffixes and matches that define which URLs should be
+           ignored.
+      -->
+      <attribute name="FilterInstance"
+         attributeClass="org.jboss.deployment.scanner.DeploymentFilter"
+         serialDataType="javaBean">
+         <!-- Files starting with theses strings are ignored -->
+         <property name="prefixes">#,%,\,,.,_$</property>
+         <!-- Files ending with theses strings are ignored -->
+         <property name="suffixes">#,$,%,~,\,v,.BAK,.bak,.old,.orig,.tmp,.rej,.sh</property>
+         <!-- Files matching with theses strings are ignored -->
+         <property name="matches">.make.state,.nse_depinfo,CVS,CVS.admin,RCS,RCSLOG,SCCS,TAGS,core,tags</property>
+      </attribute>
+
+      <!-- Frequency in milliseconds to rescan the URLs for changes -->
+      <attribute name="ScanPeriod">5000</attribute>
+      <!-- A flag to disable the scans -->
+      <attribute name="ScanEnabled">true</attribute>
+
+      <!-- URLs are comma separated and resolve relative to the server home URL
+         unless the given path is absolute. If the URL ends in "/" it is
+         considered a collection and scanned, otherwise it is simply deployed;
+         this follows RFC2518 convention and allows discrimination between
+         collections and directories that are simply unpacked archives.
+
+         URLs may be local (file:) or remote (http:). Scanning is supported
+         for remote URLs but unpacked deployment units are not.
+
+         Example URLs:
+            deploy/
+                 scans ${jboss.server.url}/deploy/, which is local or remote
+                 depending on the URL used to boot the server
+            ${jboss.server.home}/deploy/
+                 scans ${jboss.server.home)/deploy, which is always local
+            file:/var/opt/myapp.ear
+                 deploy myapp.ear from a local location
+            file:/var/opt/apps/
+                 scans the specified directory
+            http://www.test.com/netboot/myapp.ear
+                 deploys myapp.ear from a remote location
+            http://www.test.com/netboot/apps/
+                 scans the specified WebDAV location
+       -->
+      <attribute name="URLs">
+         deploy/
+      </attribute>
+
+      <!-- Indicates if the scanner should recursively scan directories that
+      contain no "." in their names. This can be used to group applications
+      and services that must be deployed and that have the same
+      logical function in the same directory i.e.
+        deploy/JMX/
+        deploy/JMS/
+        ...
+      -->
+
+      <attribute name="RecursiveSearch">True</attribute>
+
+   </mbean>
+
+</server>
Index: lams_build/conf/windows/jboss/service/mysql-ds.xml
===================================================================
diff -u -r7422a97db4b9d566a50b33fd0c8c3dddeb38ae64 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_build/conf/windows/jboss/service/mysql-ds.xml	(.../mysql-ds.xml)	(revision 7422a97db4b9d566a50b33fd0c8c3dddeb38ae64)
+++ lams_build/conf/windows/jboss/service/mysql-ds.xml	(.../mysql-ds.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -24,43 +24,5 @@
     <min-pool-size>0</min-pool-size>
     <!-- Connections not used after 5 minutes will be closed and removed -->
     <idle-timeout-minutes>5</idle-timeout-minutes>
-  </local-tx-datasource>
-
-  <!-- tool-ds datasource for use by Tools -->
-  <local-tx-datasource>
-    <jndi-name>jdbc/tool-ds</jndi-name>
-    <connection-url>jdbc:mysql://localhost:3306/@db.name@</connection-url>
-    <driver-class>com.mysql.jdbc.Driver</driver-class>
-    <!-- Tell MySQL Connector to use UTF-8 character encoding, -->
-    <!-- and convert MySQL zero times to null -->
-    <connection-property name="characterEncoding">utf8</connection-property>
-    <connection-property name="zeroDateTimeBehavior">convertToNull</connection-property>
-    <!-- Set transaction isolation level to match db -->
-    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
-    <user-name>@db.username@</user-name>
-    <password>@db.password@</password>
-    <!-- Set minimum adn maximum size of pool -->
-    <max-pool-size>64</max-pool-size>
-    <min-pool-size>0</min-pool-size>
-    <!-- Connections not used after 5 minutes will be closed and removed -->
-    <idle-timeout-minutes>5</idle-timeout-minutes>
-  </local-tx-datasource>
-  
-  <!-- quartz-ds datasource for use by Quartz -->
-  <local-tx-datasource>
-    <jndi-name>jdbc/quartz-ds</jndi-name>
-    <connection-url>jdbc:mysql://localhost:3306/@db.name@</connection-url>
-    <driver-class>com.mysql.jdbc.Driver</driver-class>
-    <connection-property name="characterEncoding">utf8</connection-property>
-    <!-- Set transaction isolation level to match db -->
-    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
-    <user-name>@db.username@</user-name>
-    <password>@db.password@</password>
-    <!-- Set minimum adn maximum size of pool -->
-    <max-pool-size>64</max-pool-size>
-    <min-pool-size>0</min-pool-size>
-    <!-- Connections not used after 5 minutes will be closed and removed -->
-    <idle-timeout-minutes>5</idle-timeout-minutes>
-  </local-tx-datasource>
-    
-</datasources>
+  </local-tx-datasource>    
+</datasources>
\ No newline at end of file
Index: lams_build/conf/windows/jboss/standardjboss.slim.xml
===================================================================
diff -u
--- lams_build/conf/windows/jboss/standardjboss.slim.xml	(revision 0)
+++ lams_build/conf/windows/jboss/standardjboss.slim.xml	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -0,0 +1,1038 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss PUBLIC
+   "-//JBoss//DTD JBOSS 4.0//EN"
+   "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
+<!-- ===================================================================== -->
+<!--  Standard JBoss EJB Configurations                                    -->
+<!-- ===================================================================== -->
+<!-- $Id$ -->
+
+<jboss>
+  <enforce-ejb-restrictions>false</enforce-ejb-restrictions>
+
+  <invoker-proxy-bindings>
+
+    <invoker-proxy-binding>
+      <name>entity-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmp</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactory</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.EntityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+          <list-entity>
+            <interceptor>org.jboss.proxy.ejb.ListEntityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </list-entity>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>clustered-entity-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.EntityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+          <list-entity>
+            <interceptor>org.jboss.proxy.ejb.ListEntityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </list-entity>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>stateless-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmp</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactory</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.StatelessSessionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>clustered-stateless-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.StatelessSessionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>stateful-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmp</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactory</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.StatefulSessionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>clustered-stateful-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.StatefulSessionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>message-driven-bean</name>
+      <invoker-mbean>default</invoker-mbean>
+      <proxy-factory>org.jboss.ejb.plugins.jms.JMSContainerInvoker</proxy-factory>
+      <proxy-factory-config>
+        <JMSProviderAdapterJNDI>DefaultJMSProvider</JMSProviderAdapterJNDI>
+        <ServerSessionPoolFactoryJNDI>StdJMSPool</ServerSessionPoolFactoryJNDI>
+        <CreateJBossMQDestination>true</CreateJBossMQDestination>
+        <!-- WARN: Don't set this to zero until a bug in the pooled executor is fixed -->
+        <MinimumSize>1</MinimumSize>
+        <MaximumSize>15</MaximumSize>
+        <KeepAliveMillis>30000</KeepAliveMillis>
+        <MaxMessages>1</MaxMessages>
+        <MDBConfig>
+          <ReconnectIntervalSec>10</ReconnectIntervalSec>
+          <DLQConfig>
+            <DestinationQueue>queue/DLQ</DestinationQueue>
+            <MaxTimesRedelivered>10</MaxTimesRedelivered>
+            <TimeToLive>0</TimeToLive>
+          </DLQConfig>
+        </MDBConfig>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <!-- Uncomment to use JMS message inflow from jmsra.rar
+    <invoker-proxy-binding>
+      <name>message-driven-bean</name>
+      <invoker-mbean>default</invoker-mbean>
+      <proxy-factory>org.jboss.ejb.plugins.inflow.JBossJMSMessageEndpointFactory</proxy-factory>
+      <proxy-factory-config>
+        <activation-config>
+           <activation-config-property>
+              <activation-config-property-name>providerAdapterJNDI</activation-config-property-name>
+              <activation-config-property-value>DefaultJMSProvider</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>minSession</activation-config-property-name>
+              <activation-config-property-value>1</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>maxSession</activation-config-property-name>
+              <activation-config-property-value>15</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>keepAlive</activation-config-property-name>
+              <activation-config-property-value>60000</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>maxMessages</activation-config-property-name>
+              <activation-config-property-value>1</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>reconnectInterval</activation-config-property-name>
+              <activation-config-property-value>10</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>useDLQ</activation-config-property-name>
+              <activation-config-property-value>true</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQHandler</activation-config-property-name>
+              <activation-config-property-value>org.jboss.resource.adapter.jms.inflow.dlq.GenericDLQHandler</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQJNDIName</activation-config-property-name>
+              <activation-config-property-value>queue/DLQ</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQMaxResent</activation-config-property-name>
+              <activation-config-property-value>10</activation-config-property-value>
+           </activation-config-property>
+        </activation-config>
+        <endpoint-interceptors>
+          <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+          <interceptor>org.jboss.ejb.plugins.inflow.MessageEndpointInterceptor</interceptor>
+          <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+          <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+        </endpoint-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+    -->
+    
+    <invoker-proxy-binding>
+      <name>singleton-message-driven-bean</name>
+      <invoker-mbean>default</invoker-mbean>
+      <proxy-factory>org.jboss.ejb.plugins.jms.JMSContainerInvoker</proxy-factory>
+      <proxy-factory-config>
+        <JMSProviderAdapterJNDI>DefaultJMSProvider</JMSProviderAdapterJNDI>
+        <ServerSessionPoolFactoryJNDI>StdJMSPool</ServerSessionPoolFactoryJNDI>
+        <CreateJBossMQDestination>true</CreateJBossMQDestination>
+        <!-- WARN: Don't set this to zero until a bug in the pooled executor is fixed -->
+        <MinimumSize>1</MinimumSize>
+        <MaximumSize>1</MaximumSize>
+        <KeepAliveMillis>30000</KeepAliveMillis>
+        <MaxMessages>1</MaxMessages>
+        <MDBConfig>
+          <ReconnectIntervalSec>10</ReconnectIntervalSec>
+          <DLQConfig>
+            <DestinationQueue>queue/DLQ</DestinationQueue>
+            <MaxTimesRedelivered>10</MaxTimesRedelivered>
+            <TimeToLive>0</TimeToLive>
+          </DLQConfig>
+        </MDBConfig>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>message-inflow-driven-bean</name>
+      <invoker-mbean>default</invoker-mbean>
+      <proxy-factory>org.jboss.ejb.plugins.inflow.JBossMessageEndpointFactory</proxy-factory>
+      <proxy-factory-config>
+        <endpoint-interceptors>
+          <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+          <interceptor>org.jboss.ejb.plugins.inflow.MessageEndpointInterceptor</interceptor>
+          <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+          <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+        </endpoint-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>iiop</name>
+      <invoker-mbean>jboss:service=invoker,type=iiop</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.IORFactory</proxy-factory>
+      <proxy-factory-config>
+        <web-class-loader>org.jboss.iiop.WebCL</web-class-loader>
+        <poa>per-servant</poa>
+        <register-ejbs-in-jnp-context>true</register-ejbs-in-jnp-context>
+        <jnp-context>iiop</jnp-context>
+        <interface-repository-supported>false</interface-repository-supported>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>jms-message-inflow-driven-bean</name>
+      <invoker-mbean>default</invoker-mbean>
+      <proxy-factory>org.jboss.ejb.plugins.inflow.JBossJMSMessageEndpointFactory</proxy-factory>
+      <proxy-factory-config>
+        <activation-config>
+           <activation-config-property>
+              <activation-config-property-name>providerAdapterJNDI</activation-config-property-name>
+              <activation-config-property-value>DefaultJMSProvider</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>minSession</activation-config-property-name>
+              <activation-config-property-value>1</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>maxSession</activation-config-property-name>
+              <activation-config-property-value>15</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>keepAlive</activation-config-property-name>
+              <activation-config-property-value>60000</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>maxMessages</activation-config-property-name>
+              <activation-config-property-value>1</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>reconnectInterval</activation-config-property-name>
+              <activation-config-property-value>10</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>useDLQ</activation-config-property-name>
+              <activation-config-property-value>true</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQHandler</activation-config-property-name>
+              <activation-config-property-value>org.jboss.resource.adapter.jms.inflow.dlq.GenericDLQHandler</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQJNDIName</activation-config-property-name>
+              <activation-config-property-value>queue/DLQ</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQMaxResent</activation-config-property-name>
+              <activation-config-property-value>10</activation-config-property-value>
+           </activation-config-property>
+        </activation-config>
+        <endpoint-interceptors>
+          <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+          <interceptor>org.jboss.ejb.plugins.inflow.MessageEndpointInterceptor</interceptor>
+          <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+          <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+        </endpoint-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+  </invoker-proxy-bindings>
+
+  <container-configurations>
+
+    <container-configuration>
+      <container-name>Standard CMP 2.x EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <call-ejb-store-on-clean>true</call-ejb-store-on-clean>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.InvalidableEntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>B</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <!--
+         | This is like standard IPT but with global (cross-transactional) row cache behind,
+         | i.e. no locking in EJB layer + global persistence data cache
+      -->
+      <container-name>cmp2.x jdbc2 pm</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>true</insert-after-ejb-post-create>
+      <call-ejb-store-on-clean>true</call-ejb-store-on-clean>
+      <container-interceptors>
+         <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+         <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+         <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.cmp.jdbc2.RelationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.PerTxEntityInstanceCache</instance-cache> 
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc2.JDBCStoreManager2</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.NoLock</locking-policy> 
+      <container-cache-conf>
+         <cache-policy-conf>
+            <min-capacity>500</min-capacity>
+            <max-capacity>10000</max-capacity>
+         </cache-policy-conf>
+         <cache-policy-conf-other>
+            <partitions>10</partitions>
+            <!-- uncomment to use JDBC java.sql.Statement.executeBatch()
+            <batch-commit-strategy/>
+            -->
+         </cache-policy-conf-other>
+      </container-cache-conf>
+      <container-pool-conf>
+         <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>C</commit-option> <!-- don't change, irrelevant, use container-cache-conf -->
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Clustered CMP 2.x EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>clustered-entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>B</commit-option>
+      <cluster-config>
+         <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+      </cluster-config>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard CMP 2.x EntityBean with cache invalidation</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+        <interceptor>org.jboss.cache.invalidation.triggers.EntityBeanCacheBatchInvalidatorInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.InvalidableEntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>A</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Instance Per Transaction CMP 2.x EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.PerTxEntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.NoLock</locking-policy>
+      <container-cache-conf/>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>C</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard CMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>A</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Clustered CMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>clustered-entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>A</commit-option>
+      <cluster-config>
+         <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+      </cluster-config>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Instance Per Transaction CMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.PerTxEntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.NoLock</locking-policy>
+      <container-cache-conf/>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>C</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard Stateless SessionBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>stateless-rmi-invoker</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.webservice.server.ServiceEndpointInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.webservice.server.ServiceEndpointInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.StatelessSessionInstancePool</instance-pool>
+      <instance-cache></instance-cache>
+      <persistence-manager></persistence-manager>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Clustered Stateless SessionBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>clustered-stateless-rmi-invoker</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.webservice.server.ServiceEndpointInterceptor </interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.webservice.server.ServiceEndpointInterceptor </interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.StatelessSessionInstancePool</instance-pool>
+      <instance-cache></instance-cache>
+      <persistence-manager></persistence-manager>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <cluster-config>
+         <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+      </cluster-config>
+    </container-configuration>
+
+
+    <container-configuration>
+      <container-name>Standard Stateful SessionBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>stateful-rmi-invoker</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+      </container-interceptors>
+      <instance-cache>org.jboss.ejb.plugins.StatefulSessionInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.StatefulSessionFilePersistenceManager</persistence-manager>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUStatefulContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <remover-period>1800</remover-period>
+          <max-bean-life>1800</max-bean-life>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Clustered Stateful SessionBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>clustered-stateful-rmi-invoker</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.StatefulHASessionSynchronisationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-cache>org.jboss.ejb.plugins.StatefulHASessionInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.StatefulHASessionPersistenceManager</persistence-manager>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUStatefulContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <remover-period>1800</remover-period>
+          <max-bean-life>1800</max-bean-life>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <cluster-config>
+         <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+      </cluster-config>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard BMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.BMPPersistenceManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>A</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Clustered BMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>clustered-entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.BMPPersistenceManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>A</commit-option>
+      <cluster-config>
+         <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+      </cluster-config>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Instance Per Transaction BMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.PerTxEntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.BMPPersistenceManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.NoLock</locking-policy>
+      <container-cache-conf/>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>C</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard Message Driven Bean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>message-driven-bean</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.RunAsSecurityInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenTxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.MessageDrivenInstancePool</instance-pool>
+      <instance-cache></instance-cache>
+      <persistence-manager></persistence-manager>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Singleton Message Driven Bean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>singleton-message-driven-bean</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.RunAsSecurityInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenTxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.MessageDrivenInstancePool</instance-pool>
+      <instance-cache></instance-cache>
+      <persistence-manager></persistence-manager>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard Message Inflow Driven Bean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>message-inflow-driven-bean</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.RunAsSecurityInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenTxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.MessageDrivenInstancePool</instance-pool>
+      <instance-cache></instance-cache>
+      <persistence-manager></persistence-manager>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+    </container-configuration>
+
+  </container-configurations>
+
+</jboss>
Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar
===================================================================
diff -u -r99ba615c898106bc9f6919b97edb8b8a49bca6c8 -r126d84999e520648cb187e465cb4aaa3baad222e
Binary files differ
Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -r49cb26ada930a59687956591672498c7f5613d34 -r126d84999e520648cb187e465cb4aaa3baad222e
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r42aa5319fbd33938828764c43dd0ab1ca80e2416 -r126d84999e520648cb187e465cb4aaa3baad222e
Binary files differ
Index: lams_central/conf/xdoclet/web-settings.xml
===================================================================
diff -u -ra8e4961c9f59aedf7bbc548462f658ecc539d0ca -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_central/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision a8e4961c9f59aedf7bbc548462f658ecc539d0ca)
+++ lams_central/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -5,21 +5,13 @@
 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-				classpath:/org/lamsfoundation/lams/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/web/webApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/integrationContext.xml
-				classpath:/org/lamsfoundation/lams/usermanagement/ldapContext.xml
-				classpath:/org/lamsfoundation/lams/gradebook/gradeBookApplicationContext.xml
-				<!--  Needed to communicate with the tools -->
-				classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				
-				<!--  Add tool contexts after this -->
-	</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: lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
===================================================================
diff -u -rc697b5c30ab742ab453859355b35cd518856334f -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	(.../authoringApplicationContext.xml)	(revision c697b5c30ab742ab453859355b35cd518856334f)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	(.../authoringApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -9,7 +9,7 @@
 	      <property name="proxyTargetClass"><value>true</value></property>     
 	</bean-->
 		<!-- ========================= GENERAL DEFINITIONS ========================= -->
-		<bean id="authoringMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+		<bean id="authoringMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename">
Index: lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml
===================================================================
diff -u -r36dec686075045d22059eaecf6e8d310ea3b6a50 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml	(.../webApplicationContext.xml)	(revision 36dec686075045d22059eaecf6e8d310ea3b6a50)
+++ lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml	(.../webApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -11,7 +11,7 @@
 	<bean id="centralMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 		<property name="basename"><value>org.lamsfoundation.lams.central.ApplicationResources</value></property>
 	</bean>
-	<bean id="centralMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="centralMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource"><ref local="centralMessageSource"/></property>										
 	</bean>
 	
Index: lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
===================================================================
diff -u -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	(.../workspaceApplicationContext.xml)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	(.../workspaceApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -2,7 +2,7 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
-	<bean id="workspaceMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="workspaceMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename">
Index: lams_central/web/WEB-INF/applicationContext.xml
===================================================================
diff -u
--- lams_central/web/WEB-INF/applicationContext.xml	(revision 0)
+++ lams_central/web/WEB-INF/applicationContext.xml	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -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: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -r7895606feec6effedc08860e4e1bb7f5157109c5 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision 7895606feec6effedc08860e4e1bb7f5157109c5)
+++ lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -474,8 +474,6 @@
      , create_date_time DATETIME NOT NULL
      , language_file VARCHAR(255)
      , modified_date_time DATETIME
-     , classpath_addition VARCHAR(255)
-     , context_file VARCHAR(255)
      , admin_url TEXT
      , supports_outputs TINYINT(1) DEFAULT 0
 	 , ext_lms_id VARCHAR(255) DEFAULT NULL
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
diff -u -rd5e8d7001b9fb1f67ee7216ac92ea3d9012165dd -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision d5e8d7001b9fb1f67ee7216ac92ea3d9012165dd)
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -34,16 +34,6 @@
 		<property name="jndiName"><value>java:jdbc/lams-ds</value></property>
 	</bean>
 
-	<!-- JNDI DataSource for all tools				      -->
-	<!-- uses tool-ds datasource set up in the app-server -->
-	<bean id="toolDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
-		<property name="jndiName"><value>java:jdbc/tool-ds</value></property>
-	</bean>
-	
-	<bean id="quartzDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
-		<property name="jndiName"><value>java:jdbc/quartz-ds</value></property>
-	</bean>
-
 	<!--  Transaction manager for all transactions involving the core classes or the content repository. -->
 	
 	<!--  If your code calls classes in the content repository or in the core, and your data needs   -->
@@ -54,5 +44,4 @@
 	<!--  But remember all application servers do not have the same JNDI name for their transaction manager! -->
 	<bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/>
 
-</beans>
-
+</beans>
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -0,0 +1,23 @@
+<?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"
+         class="org.springframework.context.support.ClassPathXmlApplicationContext">
+     <constructor-arg>
+       <list>
+       		<value>/org/lamsfoundation/lams/applicationContext.xml</value>
+			<value>/org/lamsfoundation/lams/toolApplicationContext.xml</value>
+			<value>/org/lamsfoundation/lams/contentrepository/applicationContext.xml</value>
+			<value>/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml</value>
+			<value>/org/lamsfoundation/lams/learning/learningApplicationContext.xml</value>
+			<value>classpath*:org/lamsfoundation/lams/tool/**/*pplicationContext.xml</value>
+			<value>/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml</value>
+			<value>/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml</value>
+			<value>/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml</value>
+			<value>/org/lamsfoundation/lams/web/webApplicationContext.xml</value>
+			<value>/org/lamsfoundation/lams/integrationContext.xml</value>
+			<value>/org/lamsfoundation/lams/usermanagement/ldapContext.xml</value>
+       </list>
+     </constructor-arg>
+   </bean>
+</beans>
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -ra8e4961c9f59aedf7bbc548462f658ecc539d0ca -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision a8e4961c9f59aedf7bbc548462f658ecc539d0ca)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -81,11 +81,19 @@
 				<!-- Pedagogical Planner related mapping files-->
 				<value>classpath:org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml</value>
 				
-				<!-- Gradebook related mapping files -->
+								<!-- Gradebook related mapping files -->
 				<value>classpath:org/lamsfoundation/lams/gradebook/GradeBookUserActivity.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/gradebook/GradeBookUserLesson.hbm.xml</value>
 				
+				<value>classpath:org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml</value>
+ 				<value>classpath:org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml</value>
+				<value>classpath:org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml</value>
+				<value>classpath:org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.hbm.xml</value>
+				<value>classpath:org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml</value>
+				<value>classpath:org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml</value>
+				
 				<!-- Mapping files for tools with complex conditions -->
+
 				<value>classpath*:org/lamsfoundation/lams/tool/**/*.hbm.xml</value>
 				<value>classpath*:org/lamsfoundation/lams/tool/**/model/*.hbm.xml</value>
 				<value>classpath*:org/lamsfoundation/lams/tool/**/persistence/*.hbm.xml</value>
@@ -204,7 +212,7 @@
 	</bean>
 	
     <!--  Processes a LAMS 1.0.2 import file. Called by exportToolContentService -->
-	<bean id="ld102Importer" class="org.lamsfoundation.lams.learningdesign.service.LD102Importer"  singleton="false">
+	<bean id="ld102Importer" class="org.lamsfoundation.lams.learningdesign.service.LD102Importer" singleton="false">
 		<property name="learningDesignService"><ref bean="learningDesignService"/></property>
 		<property name="messageService"><ref bean="commonMessageService"/></property>
 		<property name="baseDAO"><ref bean="baseDAO"/></property>
@@ -220,11 +228,11 @@
 	<!--  Access a message service related to a programatically loaded message file. -->
 	<!--  Can be used to arbitrarily access any message file that is on the classpath -->
 	<!--  as long as you know the file's name and full path.                          -->
-	<bean id="loadedMessageSourceService" class="org.lamsfoundation.lams.util.LoadedMessageSourceService" singleton="true">
+	<bean id="loadedMessageSourceService" class="org.lamsfoundation.lams.util.LoadedMessageSourceService">
     </bean>
     	
     <!--  Each message service created by loadedMessageService is a ResourceBundleMessageSource -->
-	<bean id="loadedMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource"  singleton="false">
+	<bean id="loadedMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource" singleton="false">
 	</bean>
 			
 	<!--  Core Notebook Service -->
@@ -256,27 +264,27 @@
 	
 	<!-- Event notification Service -->
 
-	 <bean id="eventNotificationScheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean" singleton="true">
-        <property name="applicationContextSchedulerContextKey" value="eventNotificationContext"/>
+	 <bean id="scheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
+        <property name="applicationContextSchedulerContextKey" value="context.central"/>
     	<property name="quartzProperties">
 			<props>
 				<prop key="org.quartz.jobStore.class">org.springframework.scheduling.quartz.LocalDataSourceJobStore</prop>
 				<prop key="org.quartz.jobStore.driverDelegateClass">org.quartz.impl.jdbcjobstore.StdJDBCDelegate</prop>
 				<prop key="org.quartz.jobStore.tablePrefix">lams_qtz_</prop>
 			</props>
 		</property> 
-		<property name="dataSource"><ref bean="quartzDataSource"/></property>     
+		<property name="dataSource"><ref bean="dataSource"/></property>     
     </bean>
 
 
-    <bean id="eventNotificationService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" singleton="true">
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+    <bean id="eventNotificationService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean="transactionManager"/></property>
 		<property name ="target">
 			<bean class="org.lamsfoundation.lams.events.EventNotificationService">
 				<property name="eventDAO"><ref bean="eventDAO" /></property>
 				<property name="userManagementService"><ref bean="userManagementService"/></property>
 				<constructor-arg>
-         		  <ref bean="eventNotificationScheduler"/>
+         		  <ref bean="scheduler"/>
         		</constructor-arg>
 			</bean>	
 		</property>  
@@ -294,13 +302,13 @@
 	</bean>
 	
 	<!--  Configuration service -->
-	<bean id="configurationService" class="org.lamsfoundation.lams.util.Configuration" singleton="true">
+	<bean id="configurationService" class="org.lamsfoundation.lams.util.Configuration">
 		<property name="configurationDAO"><ref bean="configurationDAO" /></property>
 		<property name="registrationDAO"><ref bean="registrationDAO" /></property>
 	</bean>
 	
 	<!-- auditing service -->
-	<bean id="auditService" class="org.lamsfoundation.lams.util.audit.AuditService"  singleton="true">
+	<bean id="auditService" class="org.lamsfoundation.lams.util.audit.AuditService" >
 		<property name="messageService"><ref bean="commonMessageService"/></property>
     </bean>
 
@@ -384,11 +392,6 @@
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
 	</bean>
 	
-	<!--  Gradebook related beans -->
-	<bean id="gradeBookDAO" class="org.lamsfoundation.lams.gradebook.dao.hibernate.GradeBookDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-	
 	<!--  System Session bean -->
 	<bean id="SystemSession"
 	    class="org.lamsfoundation.lams.web.session.SessionManager"
Index: lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
===================================================================
diff -u -r619fb1bc095cd82b4e89b97142444fc76b696314 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	(.../toolApplicationContext.xml)	(revision 619fb1bc095cd82b4e89b97142444fc76b696314)
+++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	(.../toolApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -24,7 +24,7 @@
 	
 	
 	<bean id="toolContentIDGeneratorTarget" class="org.lamsfoundation.lams.tool.ToolContentIDGenerator"
-		singleton="true"
+		
 	>
 		<property name="toolContentDao"><ref local="toolContentDAO"/></property>
 	</bean>	
@@ -39,9 +39,7 @@
 		</property>
 	</bean>
 	
-	<bean id="lamsCoreToolServiceTarget" class="org.lamsfoundation.lams.tool.service.LamsCoreToolService"
-		singleton="false"
-	>
+	<bean id="lamsCoreToolServiceTarget" class="org.lamsfoundation.lams.tool.service.LamsCoreToolService" singleton="false">
 		<property name="toolContentDAO"><ref bean="toolContentDAO"/></property>
 		<property name="toolSessionDAO"><ref bean="toolSessionDAO"/></property>
 		<property name="systemToolDAO"><ref bean="systemToolDAO"/></property>
Index: lams_contentrepository/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb01fb12780783a75d4df4140bca833cd69bc940d -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_contentrepository/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b01fb12780783a75d4df4140bca833cd69bc940d)
+++ lams_contentrepository/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -1,7 +1,12 @@
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			classpath:/org/lamsfoundation/lams/applicationContext.xml
-			classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-		</param-value>
-	</context-param>
+<context-param> 
+	<param-name>contextConfigLocation</param-name>
+	<param-value></param-value>
+</context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
\ No newline at end of file
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml
===================================================================
diff -u -r86bb830745541b9a9966b58fb4132cf55b56d5c3 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	(.../applicationContext.xml)	(revision 86bb830745541b9a9966b58fb4132cf55b56d5c3)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	(.../applicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -7,22 +7,6 @@
  -->
 <beans>
 
-	<!-- Hibernate SessionFactory -->
-	<bean id="crSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="dataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml</value>
- 				<value>org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml</value>
-				<value>org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml</value>
-				<value>org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.hbm.xml</value>
-				<value>org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml</value>
-				<value>org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml</value>
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
-
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 
 	<!--  repository (as repositoryAdminService) and ticket are the two main interfaces -->
@@ -90,15 +74,15 @@
 
 	<!--  DAO classes -->
 	<bean id="workspaceDAO" class="org.lamsfoundation.lams.contentrepository.dao.hibernate.WorkspaceDAO">
-		<property name="sessionFactory"><ref local="crSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 
 	<bean id="credentialDAO" class="org.lamsfoundation.lams.contentrepository.dao.hibernate.CredentialDAO">
-		<property name="sessionFactory"><ref local="crSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 
 	<bean id="nodeDAO" class="org.lamsfoundation.lams.contentrepository.dao.hibernate.NodeDAO">
-		<property name="sessionFactory"><ref local="crSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 
 	<!--  Most DAO's are for Hibernate. fileDAO manages reading and writing files to the filesystem -->
Index: lams_contentrepository/web/WEB-INF/applicationContext.xml
===================================================================
diff -u
--- lams_contentrepository/web/WEB-INF/applicationContext.xml	(revision 0)
+++ lams_contentrepository/web/WEB-INF/applicationContext.xml	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -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: lams_learning/conf/xdoclet/web-settings.xml
===================================================================
diff -u -re851ecbb7a28dba597688df7f4466b2ab603405c -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
+++ lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -1,19 +1,27 @@
-
 <context-param>
-  	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>org.lamsfoundation.lams.learning.ApplicationResources</param-value>
+	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+	<param-value>org.lamsfoundation.lams.learning.ApplicationResources</param-value>
 </context-param>
+
 <context-param>
+	<param-name>messageSource</param-name>
+	<param-value>learningMessageSource</param-value>
+</context-param>
+
+<context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-		classpath:/org/lamsfoundation/lams/applicationContext.xml
-		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
-		<!--  Add tool contexts after this -->
-	</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>
 		org.springframework.web.context.ContextLoaderListener
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
===================================================================
diff -u -rc209be8131f22f6fe37bd8d6c14b56425a78b766 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision c209be8131f22f6fe37bd8d6c14b56425a78b766)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -9,13 +9,15 @@
 <beans>
 
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
-	<bean id="learningMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="learningMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+		<property name="basename">
+			<value>org.lamsfoundation.lams.monitoring.ApplicationResources</value>
+		</property>
+	</bean>
+	
+	<bean id="learningMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
-			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
-				<property name="basename">
-					<value>org.lamsfoundation.lams.learning.ApplicationResources</value>
-				</property>
-			</bean>
+			<ref bean="learningMessageSource"/>
 		</property>
     </bean>
 	
@@ -83,11 +85,11 @@
 	<!-- bean id="toolService" class="org.lamsfoundation.lams.tool.service.DummyToolService" singleton="false">
 	</bean-->
 
-	<bean id="progressEngine" class="org.lamsfoundation.lams.learning.progress.ProgressEngine" singleton="true">
+	<bean id="progressEngine" class="org.lamsfoundation.lams.learning.progress.ProgressEngine" >
 		<property name="activityDAO"><ref bean="activityDAO"/></property>
 	</bean>
 	
-	<bean id="activityMapping" class="org.lamsfoundation.lams.learning.web.util.ActivityMapping" singleton="true">
+	<bean id="activityMapping" class="org.lamsfoundation.lams.learning.web.util.ActivityMapping" >
 		<property name="toolService"><ref bean="lamsCoreToolService"/></property>
 	</bean>
 	
Index: lams_learning/web/WEB-INF/applicationContext.xml
===================================================================
diff -u
--- lams_learning/web/WEB-INF/applicationContext.xml	(revision 0)
+++ lams_learning/web/WEB-INF/applicationContext.xml	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -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: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r6a00a381d27bc31726597217200978ae4423be7e -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 6a00a381d27bc31726597217200978ae4423be7e)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -18,13 +18,13 @@
       type="org.lamsfoundation.lams.learning.web.form.TestDblSubmitForm"
     />
     <form-bean
-      name="optionsActivityForm"
-      type="org.lamsfoundation.lams.learning.web.form.OptionsActivityForm"
-    />
-    <form-bean
       name="activityForm"
       type="org.lamsfoundation.lams.learning.web.form.ActivityForm"
     />
+    <form-bean
+      name="optionsActivityForm"
+      type="org.lamsfoundation.lams.learning.web.form.OptionsActivityForm"
+    />
 
    <form-bean name="GroupingForm"  type="org.apache.struts.action.DynaActionForm">
 	<form-property name="title" type="java.lang.String" />
@@ -94,45 +94,72 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/gate"
-      type="org.lamsfoundation.lams.learning.web.action.GateAction"
-      name="GateForm"
+      path="/grouping"
+      type="org.lamsfoundation.lams.learning.web.action.GroupingAction"
+      name="GroupingForm"
       scope="request"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="permissionGate"
-        path=".permissionGate"
+        name="viewGroup"
+        path="/grouping.do?method=viewGrouping"
         redirect="false"
       />
       <forward
-        name="scheduleGate"
-        path=".scheduleGate"
+        name="showGroup"
+        path=".showgroup"
         redirect="false"
       />
       <forward
-        name="synchGate"
-        path=".synchGate"
+        name="waitGroup"
+        path=".waitgroup"
         redirect="false"
       />
       <forward
-        name="conditionGate"
-        path=".conditionGate"
+        name="chooseGroup"
+        path=".choosegroup"
         redirect="false"
       />
     </action>
     <action
-      path="/ChooseActivity"
-      type="org.lamsfoundation.lams.learning.web.action.ChooseActivityAction"
+      path="/learner"
+      type="org.lamsfoundation.lams.learning.web.action.LearnerAction"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="displayActivity"
+        path="/DisplayActivity.do"
+        redirect="false"
+      />
+      <forward
+        name="displayProgress"
+        path="/progress.jsp"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/CompleteActivity"
+      type="org.lamsfoundation.lams.learning.web.action.CompleteActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
     </action>
     <action
+      path="/DisplayToolActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayToolActivityAction"
+      name="activityForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+    </action>
+    <action
       path="/notebook"
       type="org.lamsfoundation.lams.learning.web.action.NotebookAction"
       name="NotebookForm"
@@ -168,47 +195,34 @@
       />
     </action>
     <action
-      path="/DisplayParallelActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayParallelActivityAction"
+      path="/LessonComplete"
+      type="org.lamsfoundation.lams.learning.web.action.LessonCompleteActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="displayParallel"
-        path=".parallelActivity"
+        name="lessonComplete"
+        path=".lessonComplete"
         redirect="false"
       />
     </action>
     <action
-      path="/learner"
-      type="org.lamsfoundation.lams.learning.web.action.LearnerAction"
-      parameter="method"
+      path="/test/DblSubmit"
+      type="org.lamsfoundation.lams.learning.web.action.TestDblSubmitAction"
+      name="testDblSubmitForm"
+      scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="displayActivity"
-        path="/DisplayActivity.do"
+        name="display"
+        path="/test/dblSubmitTest.jsp"
         redirect="false"
       />
-      <forward
-        name="displayProgress"
-        path="/progress.jsp"
-        redirect="false"
-      />
     </action>
     <action
-      path="/SequenceActivity"
-      type="org.lamsfoundation.lams.learning.web.action.SequenceActivityAction"
-      name="activityForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
-    </action>
-    <action
       path="/branching"
       type="org.lamsfoundation.lams.learning.web.action.BranchingActivityAction"
       name="BranchingForm"
@@ -229,148 +243,134 @@
       />
     </action>
     <action
-      path="/LoadToolActivity"
-      type="org.lamsfoundation.lams.learning.web.action.LoadToolActivityAction"
+      path="/ChooseActivity"
+      type="org.lamsfoundation.lams.learning.web.action.ChooseActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
-      <forward
-        name="displayTool"
-        path=".loadToolActivity"
-        redirect="false"
-      />
-      <forward
-        name="previewDefineLater"
-        path=".previewDefineLater"
-        redirect="false"
-      />
     </action>
     <action
-      path="/test/DblSubmit"
-      type="org.lamsfoundation.lams.learning.web.action.TestDblSubmitAction"
-      name="testDblSubmitForm"
+      path="/DisplayOptionsActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayOptionsActivityAction"
+      name="optionsActivityForm"
       scope="request"
+      input="/Activity.do"
       unknown="false"
       validate="false"
     >
       <forward
-        name="display"
-        path="/test/dblSubmitTest.jsp"
+        name="displayOptions"
+        path=".optionsActivity"
         redirect="false"
       />
     </action>
     <action
-      path="/LessonComplete"
-      type="org.lamsfoundation.lams.learning.web.action.LessonCompleteActivityAction"
-      name="activityForm"
+      path="/gate"
+      type="org.lamsfoundation.lams.learning.web.action.GateAction"
+      name="GateForm"
       scope="request"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="lessonComplete"
-        path=".lessonComplete"
+        name="permissionGate"
+        path=".permissionGate"
         redirect="false"
       />
-    </action>
-    <action
-      path="/DisplayActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayActivityAction"
-      name="activityForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="displayParallelActivity"
-        path="/DisplayParallelActivity.do"
+        name="scheduleGate"
+        path=".scheduleGate"
         redirect="false"
       />
       <forward
-        name="displayOptionsActivity"
-        path="/DisplayOptionsActivity.do"
+        name="synchGate"
+        path=".synchGate"
         redirect="false"
       />
       <forward
-        name="loadToolActivity"
-        path="/LoadToolActivity.do"
+        name="conditionGate"
+        path=".conditionGate"
         redirect="false"
       />
+    </action>
+    <action
+      path="/LoadToolActivity"
+      type="org.lamsfoundation.lams.learning.web.action.LoadToolActivityAction"
+      name="activityForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="parallelWait"
-        path="/parallelWait.do"
+        name="displayTool"
+        path=".loadToolActivity"
         redirect="false"
       />
       <forward
-        name="lessonComplete"
-        path="/lessonComplete.do"
+        name="previewDefineLater"
+        path=".previewDefineLater"
         redirect="false"
       />
     </action>
     <action
-      path="/DisplayToolActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayToolActivityAction"
+      path="/SequenceActivity"
+      type="org.lamsfoundation.lams.learning.web.action.SequenceActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
     </action>
     <action
-      path="/grouping"
-      type="org.lamsfoundation.lams.learning.web.action.GroupingAction"
-      name="GroupingForm"
+      path="/DisplayActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayActivityAction"
+      name="activityForm"
       scope="request"
-      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="viewGroup"
-        path="/grouping.do?method=viewGrouping"
+        name="displayParallelActivity"
+        path="/DisplayParallelActivity.do"
         redirect="false"
       />
       <forward
-        name="showGroup"
-        path=".showgroup"
+        name="displayOptionsActivity"
+        path="/DisplayOptionsActivity.do"
         redirect="false"
       />
       <forward
-        name="waitGroup"
-        path=".waitgroup"
+        name="loadToolActivity"
+        path="/LoadToolActivity.do"
         redirect="false"
       />
       <forward
-        name="chooseGroup"
-        path=".choosegroup"
+        name="parallelWait"
+        path="/parallelWait.do"
         redirect="false"
       />
-    </action>
-    <action
-      path="/DisplayOptionsActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayOptionsActivityAction"
-      name="optionsActivityForm"
-      scope="request"
-      input="/Activity.do"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="displayOptions"
-        path=".optionsActivity"
+        name="lessonComplete"
+        path="/lessonComplete.do"
         redirect="false"
       />
     </action>
     <action
-      path="/CompleteActivity"
-      type="org.lamsfoundation.lams.learning.web.action.CompleteActivityAction"
+      path="/DisplayParallelActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayParallelActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
+      <forward
+        name="displayParallel"
+        path=".parallelActivity"
+        redirect="false"
+      />
     </action>
 
 <action path="/index"
Index: lams_monitoring/conf/xdoclet/web-settings.xml
===================================================================
diff -u -re072ea15fa2f2c552fea711ec72e4332d3f8785a -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_monitoring/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision e072ea15fa2f2c552fea711ec72e4332d3f8785a)
+++ lams_monitoring/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -2,17 +2,22 @@
   	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
   	<param-value>org.lamsfoundation.lams.monitoring.ApplicationResources</param-value>
 </context-param>
+
 <context-param>
+	<param-name>messageSource</param-name>
+	<param-value>monitoringMessageSource</param-value>
+</context-param>
+
+<context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-		classpath:/org/lamsfoundation/lams/applicationContext.xml
-		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
-		<!--  Add tool contexts after this -->
-	</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: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
===================================================================
diff -u -redba2c28d900fba6e7bb761fb0a828aad979629e -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(.../monitoringApplicationContext.xml)	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(.../monitoringApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -8,29 +8,27 @@
 	- dataAccessContext.xml (see web.xml's "contextConfigLocation").
 	-->
 <beans>
+		<bean id="monitoringMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+			<property name="basename">
+				<value>org.lamsfoundation.lams.monitoring.ApplicationResources</value>
+			</property>
+		</bean>
 
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
-		<bean id="monitoringMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
-		<property name="messageSource">
-			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
-				<property name="basename">
-					<value>org.lamsfoundation.lams.monitoring.ApplicationResources</value>
-				</property>
-			</bean>
-		</property>
-		
-	</bean>
+		<bean id="monitoringMessageService" class="org.lamsfoundation.lams.util.MessageService" >
+			<property name="messageSource">
+				<ref bean="monitoringMessageSource"/>
+			</property>
+		</bean>
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 
 
 	<!--
 	  - Lams monitoring primary business object (default implementation), as an inner bean wrapped
 		- by an outer transactional proxy. The two bean definitions could have been separate,
 		- but this is cleaner as there is no need to ever access the unwrapped object.
-	-->   
-	<bean id="monitoringServiceTarget" class="org.lamsfoundation.lams.monitoring.service.MonitoringService"
-		singleton="false"
-	>
+	-->
+	<bean id="monitoringServiceTarget" class="org.lamsfoundation.lams.monitoring.service.MonitoringService" singleton="false">
 		<property name="baseDAO"><ref bean="baseDAO"/></property>
 		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
 		<property name="groupDAO"><ref bean="groupDAO"/></property>
@@ -99,16 +97,4 @@
         </property>
     </bean>
     
-    <bean id="scheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
-        <property name="applicationContextSchedulerContextKey" value="monitoringApplicationContext"/>
-    	<property name="quartzProperties">
-			<props>
-				<prop key="org.quartz.jobStore.class">org.springframework.scheduling.quartz.LocalDataSourceJobStore</prop>
-				<prop key="org.quartz.jobStore.driverDelegateClass">org.quartz.impl.jdbcjobstore.StdJDBCDelegate</prop>
-				<prop key="org.quartz.jobStore.tablePrefix">lams_qtz_</prop>
-			</props>
-		</property> 
-		<property name="dataSource"><ref bean="quartzDataSource"/></property>     
-    </bean>
-    
-</beans>
+</beans>
\ No newline at end of file
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/MonitoringJob.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/MonitoringJob.java	(.../MonitoringJob.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/MonitoringJob.java	(.../MonitoringJob.java)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -31,25 +31,25 @@
 import org.quartz.SchedulerException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.scheduling.quartz.QuartzJobBean;
+
 /**
- * All Quartz Job Bean super classes in monitoring. It provides a simple helper method to 
- * get monitoringService.
+ * All Quartz Job Bean super classes in monitoring. It provides a simple helper method to get monitoringService.
  * 
  * @author Steve.Ni
  * 
  * @version $Revision$
  */
-public abstract class MonitoringJob extends QuartzJobBean{
-	private static final String CONTEXT_NAME = "monitoringApplicationContext";
-	private static final String SERVICE_NAME = "monitoringService";
-	
-	protected IMonitoringService getMonitoringService(JobExecutionContext context) throws JobExecutionException{
-		try {
-			SchedulerContext  sc = context.getScheduler().getContext();
-			ApplicationContext cxt = (ApplicationContext) sc.get(CONTEXT_NAME);
-			return (IMonitoringService) cxt.getBean(SERVICE_NAME);
-		} catch (SchedulerException e) {
-			throw new JobExecutionException("Failed look up the Scheduler" + e.toString());
-		}
+public abstract class MonitoringJob extends QuartzJobBean {
+    private static final String CONTEXT_NAME = "context.central";
+    private static final String SERVICE_NAME = "monitoringService";
+
+    protected IMonitoringService getMonitoringService(JobExecutionContext context) throws JobExecutionException {
+	try {
+	    SchedulerContext sc = context.getScheduler().getContext();
+	    ApplicationContext cxt = (ApplicationContext) sc.get(MonitoringJob.CONTEXT_NAME);
+	    return (IMonitoringService) cxt.getBean(MonitoringJob.SERVICE_NAME);
+	} catch (SchedulerException e) {
+	    throw new JobExecutionException("Failed look up the Scheduler" + e.toString());
 	}
+    }
 }
Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java
===================================================================
diff -u -r68d2988cca350af15ba4087814f74e1527a71997 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java	(.../TestMonitoringService.java)	(revision 68d2988cca350af15ba4087814f74e1527a71997)
+++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java	(.../TestMonitoringService.java)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -51,24 +51,22 @@
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.springframework.jdbc.core.JdbcTemplate;
 
-
 /**
  * 
  * @author Jacky Fang 9/02/2005
  * @author Manpreet Minhas
  */
-public class TestMonitoringService extends AbstractLamsTestCase
-{
-    //---------------------------------------------------------------------
+public class TestMonitoringService extends AbstractLamsTestCase {
+    // ---------------------------------------------------------------------
     // Dependent services
-    //---------------------------------------------------------------------
+    // ---------------------------------------------------------------------
     private IMonitoringService monitoringService;
     private IUserManagementService usermanageService;
-    private ILessonDAO lessonDao; 
+    private ILessonDAO lessonDao;
     private IActivityDAO activityDao;
-    //---------------------------------------------------------------------
+    // ---------------------------------------------------------------------
     // Testing Data - Constants
-    //---------------------------------------------------------------------
+    // ---------------------------------------------------------------------
     private final Integer TEST_USER_ID = new Integer(1);
     private final Integer TEST_LEARNER_ID = new Integer(2);
     private final Integer TEST_STAFF_ID = new Integer(3);
@@ -81,15 +79,15 @@
     private final long TEST_COPIED_LEARNING_DESIGN_ID = 3;
     private final Integer TEST_ORGANIZATION_ID = new Integer(1);
     private final Long TEST_SCHEDULE_GATE_ID = new Long(27);
-    private final Long TEST_LESSION_ID = new Long(1); // "Test_Lesson" from insert_test_data script 
-    private final Integer MELCOE_WORKSPACE = new Integer(3); // MELCOE workspace from insert_test_data script 
+    private final Long TEST_LESSION_ID = new Long(1); // "Test_Lesson" from insert_test_data script
+    private final Integer MELCOE_WORKSPACE = new Integer(3); // MELCOE workspace from insert_test_data script
 
-    //it might be different because it is automatically generated by database
-    //TODO create a get lesson by design method in lesson dao.
+    // it might be different because it is automatically generated by database
+    // TODO create a get lesson by design method in lesson dao.
     private static Long TEST_LESSON_ID = null;
-    //---------------------------------------------------------------------
+    // ---------------------------------------------------------------------
     // Testing Data - Instance Variables
-    //---------------------------------------------------------------------
+    // ---------------------------------------------------------------------
     private User testUser;
     private User testStaff;
     private User testLearner;
@@ -100,304 +98,295 @@
     /*
      * @see AbstractLamsCommonTestCase#setUp()
      */
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        monitoringService = (IMonitoringService)this.context.getBean("monitoringService");
-        usermanageService = (IUserManagementService)this.context.getBean("userManagementService");
-        lessonDao = (LessonDAO)this.context.getBean("lessonDAO");
-        activityDao = (ActivityDAO)this.context.getBean("activityDAO");
-        dataSource = (DataSource) this.context.getBean("dataSource");
-       
-        initializeTestingData();
+    @Override
+    protected void setUp() throws Exception {
+	super.setUp();
+	monitoringService = (IMonitoringService) context.getBean("monitoringService");
+	usermanageService = (IUserManagementService) context.getBean("userManagementService");
+	lessonDao = (LessonDAO) context.getBean("lessonDAO");
+	activityDao = (ActivityDAO) context.getBean("activityDAO");
+	dataSource = (DataSource) context.getBean("dataSource");
+
+	initializeTestingData();
     }
+
     /**
      * @see AbstractLamsCommonTestCase#tearDown()
      */
-    protected void tearDown() throws Exception
-    {
-        super.tearDown();
-        context = null; // try to trigger some memory to get freed - running out of memory.
+    @Override
+    protected void tearDown() throws Exception {
+	super.tearDown();
+	context = null; // try to trigger some memory to get freed - running out of memory.
     }
 
     /**
      * Constructor for TestMonitoringService.
+     * 
      * @param name
      */
-    public TestMonitoringService(String name)
-    {
-        super(name);
+    public TestMonitoringService(String name) {
+	super(name);
     }
-    
+
     /**
      * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
      */
-    protected String[] getContextConfigLocation()
-    {
-        return new String[] { 
-        		"/org/lamsfoundation/lams/localApplicationContext.xml",
-        		"/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
-        		"/org/lamsfoundation/lams/toolApplicationContext.xml",
-          		"/org/lamsfoundation/lams/learning/learningApplicationContext.xml",        					  
-          		"/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml",
-          		"/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml",
-        		"/org/lamsfoundation/lams/tool/survey/applicationContext.xml"};            
+    @Override
+    protected String[] getContextConfigLocation() {
+	return new String[] { "/org/lamsfoundation/lams/localApplicationContext.xml",
+		"/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
+		"/org/lamsfoundation/lams/toolApplicationContext.xml",
+		"/org/lamsfoundation/lams/learning/learningApplicationContext.xml",
+		"/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml",
+		"/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml",
+		"/org/lamsfoundation/lams/tool/survey/applicationContext.xml" };
     }
+
     /**
      * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
      */
-    protected String getHibernateSessionFactoryName()
-    {
-        return "coreSessionFactory";
+    @Override
+    protected String getHibernateSessionFactoryName() {
+	return "coreSessionFactory";
     }
-   public void testInitializeLesson()
-    {
-        
-       String lamsLearningDesignTableName = "lams_learning_design";
-       String idName = "learning_design_id";
-       long previousLDId = getMaxId(lamsLearningDesignTableName, idName);
 
-        Lesson testLesson = monitoringService.initializeLesson("Test_Lesson",
-                                                               "Test_Description",
-                                                               Boolean.TRUE,
-                                                               TEST_LEARNING_DESIGN_ID,
-                                                               null,
-                                                               testUser.getUserId(),
-                                                               null,
-                                                               false,
-                                                               false,
-                                                               false);
-        TEST_LESSON_ID=testLesson.getLessonId();
-        Lesson createdLesson = lessonDao.getLesson(TEST_LESSON_ID);
-        assertNotNull(createdLesson);
-        
-        // can't reliably predict the id of the copied learning design - depends on what
-        // has happened before the test and what might be running at the same time.
-        // so compare it to the last id created in this table. This will usually be the 
-        // right value as it it looked up using getLastInsertId() and that works
-        // on per connection basis - it is unlikely that this test case will be sharing 
-        // the connection with anything else that will update this table. This may
-        // change in the future if more test cases are added.
-        long mostRecentLDId = getMaxId(lamsLearningDesignTableName, idName);
-        long copiedLDId = testLesson.getLearningDesign().getLearningDesignId().longValue();
-        assertTrue("A learning design has been created (previous insert #previousLDId, recent insert #mostRecentLDId",
-                	previousLDId!=mostRecentLDId);
-        assertTrue("Copied learning design is the new id", copiedLDId == mostRecentLDId);
-        	
-        assertEquals("verify the user", TEST_USER_ID,createdLesson.getUser().getUserId());
-        assertEquals("verify the lesson state",Lesson.CREATED,createdLesson.getLessonStateId());
-      }
+    public void testInitializeLesson() {
 
-    public void testCreateLessonClassForLesson()
-    {
-        LinkedList learners = new LinkedList();
-        learners.add(testLearner);
-        LinkedList staffs = new LinkedList();
-        staffs.add(testStaff);
-        
-        Lesson testLesson = monitoringService.createLessonClassForLesson(TEST_LESSON_ID.longValue(),
-                                                                         testOrganisation,
-                                                                         "leaner group",
-                                                                         learners,
-                                                                         "staff group",
-                                                                         staffs,
-                                                                         TEST_STAFF_ID);
-        Lesson createdLesson = lessonDao.getLesson(TEST_LESSON_ID);
-        
-        assertEquals("verify the staff group",staffs.size(),createdLesson.getLessonClass().getStaffGroup().getUsers().size());
-		assertNotNull("verify lesson has organisation",createdLesson.getOrganisation());
-        assertEquals("verify the organization",TEST_ORGANIZATION_ID,createdLesson.getOrganisation().getOrganisationId());
-        assertEquals("verify number of the learners",1,createdLesson.getAllLearners().size());
-        assertEquals("verify the lesson class",Grouping.CLASS_GROUPING_TYPE,createdLesson.getLessonClass().getGroupingTypeId());
-        assertEquals("verify the learner group",1,createdLesson.getLessonClass().getGroups().size());
+	String lamsLearningDesignTableName = "lams_learning_design";
+	String idName = "learning_design_id";
+	long previousLDId = getMaxId(lamsLearningDesignTableName, idName);
 
-        
+	Lesson testLesson = monitoringService.initializeLesson("Test_Lesson", "Test_Description", Boolean.TRUE,
+		TEST_LEARNING_DESIGN_ID, null, testUser.getUserId(), null, false, false, false);
+	TestMonitoringService.TEST_LESSON_ID = testLesson.getLessonId();
+	Lesson createdLesson = lessonDao.getLesson(TestMonitoringService.TEST_LESSON_ID);
+	assertNotNull(createdLesson);
+
+	// can't reliably predict the id of the copied learning design - depends on what
+	// has happened before the test and what might be running at the same time.
+	// so compare it to the last id created in this table. This will usually be the
+	// right value as it it looked up using getLastInsertId() and that works
+	// on per connection basis - it is unlikely that this test case will be sharing
+	// the connection with anything else that will update this table. This may
+	// change in the future if more test cases are added.
+	long mostRecentLDId = getMaxId(lamsLearningDesignTableName, idName);
+	long copiedLDId = testLesson.getLearningDesign().getLearningDesignId().longValue();
+	assertTrue("A learning design has been created (previous insert #previousLDId, recent insert #mostRecentLDId",
+		previousLDId != mostRecentLDId);
+	assertTrue("Copied learning design is the new id", copiedLDId == mostRecentLDId);
+
+	assertEquals("verify the user", TEST_USER_ID, createdLesson.getUser().getUserId());
+	assertEquals("verify the lesson state", Lesson.CREATED, createdLesson.getLessonStateId());
     }
-    
-    public void testStartlesson() throws LamsToolServiceException
-    {
-        monitoringService.startLesson(TEST_LESSON_ID.longValue(),TEST_STAFF_ID);
-        assertTrue(true);
-        
-        Lesson startedLesson = lessonDao.getLesson(TEST_LESSON_ID);
-        
-        assertNotNull(startedLesson);
-        assertEquals("verify the lesson status",Lesson.STARTED_STATE,startedLesson.getLessonStateId());
-        
-        
+
+    public void testCreateLessonClassForLesson() {
+	LinkedList learners = new LinkedList();
+	learners.add(testLearner);
+	LinkedList staffs = new LinkedList();
+	staffs.add(testStaff);
+
+	Lesson testLesson = monitoringService.createLessonClassForLesson(TestMonitoringService.TEST_LESSON_ID
+		.longValue(), testOrganisation, "leaner group", learners, "staff group", staffs, TEST_STAFF_ID);
+	Lesson createdLesson = lessonDao.getLesson(TestMonitoringService.TEST_LESSON_ID);
+
+	assertEquals("verify the staff group", staffs.size(), createdLesson.getLessonClass().getStaffGroup().getUsers()
+		.size());
+	assertNotNull("verify lesson has organisation", createdLesson.getOrganisation());
+	assertEquals("verify the organization", TEST_ORGANIZATION_ID, createdLesson.getOrganisation()
+		.getOrganisationId());
+	assertEquals("verify number of the learners", 1, createdLesson.getAllLearners().size());
+	assertEquals("verify the lesson class", Grouping.CLASS_GROUPING_TYPE, createdLesson.getLessonClass()
+		.getGroupingTypeId());
+	assertEquals("verify the learner group", 1, createdLesson.getLessonClass().getGroups().size());
+
     }
 
-    public void testOpenGate()
-    {
-        monitoringService.openGate(TEST_SCHEDULE_GATE_ID);
-        Activity openedScheduleGate = activityDao.getActivityByActivityId(TEST_SCHEDULE_GATE_ID);
-        assertTrue("the gate should be opened",((GateActivity)openedScheduleGate).getGateOpen().booleanValue());
+    public void testStartlesson() throws LamsToolServiceException {
+	monitoringService.startLesson(TestMonitoringService.TEST_LESSON_ID.longValue(), TEST_STAFF_ID);
+	assertTrue(true);
+
+	Lesson startedLesson = lessonDao.getLesson(TestMonitoringService.TEST_LESSON_ID);
+
+	assertNotNull(startedLesson);
+	assertEquals("verify the lesson status", Lesson.STARTED_STATE, startedLesson.getLessonStateId());
+
     }
 
-    public void testCloseGate()
-    {
-        monitoringService.closeGate(TEST_SCHEDULE_GATE_ID);
-        Activity closedScheduleGate = activityDao.getActivityByActivityId(TEST_SCHEDULE_GATE_ID);
-        assertTrue("the gate should be closed",!((GateActivity)closedScheduleGate).getGateOpen().booleanValue());
+    public void testOpenGate() {
+	monitoringService.openGate(TEST_SCHEDULE_GATE_ID);
+	Activity openedScheduleGate = activityDao.getActivityByActivityId(TEST_SCHEDULE_GATE_ID);
+	assertTrue("the gate should be opened", ((GateActivity) openedScheduleGate).getGateOpen().booleanValue());
     }
 
-    public void testForceCompleteLessonByUser()
-    {
+    public void testCloseGate() {
+	monitoringService.closeGate(TEST_SCHEDULE_GATE_ID);
+	Activity closedScheduleGate = activityDao.getActivityByActivityId(TEST_SCHEDULE_GATE_ID);
+	assertTrue("the gate should be closed", !((GateActivity) closedScheduleGate).getGateOpen().booleanValue());
     }
-    
-    public void testGetLessonDetails() throws IOException{
-    	String packet = monitoringService.getLessonDetails(TEST_LESSION_ID,TEST_STAFF_ID);    	
-    	System.out.print(packet);
+
+    public void testForceCompleteLessonByUser() {
     }
-    public void testGetLessonLearners() throws IOException{
-    	String packet = monitoringService.getLessonLearners(TEST_LESSION_ID,TEST_STAFF_ID);    	
-    	System.out.println(packet);
+
+    public void testGetLessonDetails() throws IOException {
+	String packet = monitoringService.getLessonDetails(TEST_LESSION_ID, TEST_STAFF_ID);
+	System.out.print(packet);
     }
-    public void testGetLessonDesign()throws IOException{
-    	String packet = monitoringService.getLearningDesignDetails(TEST_LESSION_ID);    	
-    	System.out.println(packet);
+
+    public void testGetLessonLearners() throws IOException {
+	String packet = monitoringService.getLessonLearners(TEST_LESSION_ID, TEST_STAFF_ID);
+	System.out.println(packet);
     }
-    public void testGetAllLearnersProgress() throws IOException{
-    	String packet = monitoringService.getAllLearnersProgress(TEST_LESSION_ID,TEST_STAFF_ID);    	
-    	System.out.println(packet);
+
+    public void testGetLessonDesign() throws IOException {
+	String packet = monitoringService.getLearningDesignDetails(TEST_LESSION_ID);
+	System.out.println(packet);
     }
-    public void testGetLearnerActivityURL() throws Exception{
-    	String url = monitoringService.getLearnerActivityURL(TEST_LESSION_ID, new Long(29),TEST_LEARNER_ID,TEST_STAFF_ID);    	
-    	System.out.println(url);
+
+    public void testGetAllLearnersProgress() throws IOException {
+	String packet = monitoringService.getAllLearnersProgress(TEST_LESSION_ID, TEST_STAFF_ID, false);
+	System.out.println(packet);
     }
-    public void  testGellAllContributeActivities()throws IOException, LearningDesignProcessorException{
-    	String packet = monitoringService.getAllContributeActivities(TEST_LESSION_ID);    	
-    	System.out.println(packet);
+
+    public void testGetLearnerActivityURL() throws Exception {
+	String url = monitoringService.getLearnerActivityURL(TEST_LESSION_ID, new Long(29), TEST_LEARNER_ID,
+		TEST_STAFF_ID);
+	System.out.println(url);
     }
-    
-    public void testMoveLesson() throws IOException{
-    	String packet = monitoringService.moveLesson(TEST_LESSION_ID,MELCOE_WORKSPACE,TEST_USER_ID);    
-    	System.out.println(packet);
+
+    public void testGellAllContributeActivities() throws IOException, LearningDesignProcessorException {
+	String packet = monitoringService.getAllContributeActivities(TEST_LESSION_ID);
+	System.out.println(packet);
     }
-    public void testRenameLesson()throws IOException{
-        String newName = "New name after renaming";
-    	String packet = monitoringService.renameLesson(TEST_LESSION_ID,newName,TEST_USER_ID);    	
-    	Lesson updatedLesson = lessonDao.getLesson(TEST_LESSION_ID);
-    	assertEquals("Name changed correctly", newName, updatedLesson.getLessonName());
-    	System.out.println(packet);
-    } 
+
+    public void testMoveLesson() throws IOException {
+	String packet = monitoringService.moveLesson(TEST_LESSION_ID, MELCOE_WORKSPACE, TEST_USER_ID);
+	System.out.println(packet);
+    }
+
+    public void testRenameLesson() throws IOException {
+	String newName = "New name after renaming";
+	String packet = monitoringService.renameLesson(TEST_LESSION_ID, newName, TEST_USER_ID);
+	Lesson updatedLesson = lessonDao.getLesson(TEST_LESSION_ID);
+	assertEquals("Name changed correctly", newName, updatedLesson.getLessonName());
+	System.out.println(packet);
+    }
+
     /**
      * Initialize all instance variables for testing
      */
-   private void initializeTestingData()
-    {
-        testUser = (User)usermanageService.findById(User.class,TEST_USER_ID);
-        testStaff = (User)usermanageService.findById(User.class,TEST_STAFF_ID);
-        testLearner = (User)usermanageService.findById(User.class,TEST_LEARNER_ID);        
-        testOrganisation = (Organisation)usermanageService.findById(Organisation.class,TEST_ORGANIZATION_ID);
+    private void initializeTestingData() {
+	testUser = (User) usermanageService.findById(User.class, TEST_USER_ID);
+	testStaff = (User) usermanageService.findById(User.class, TEST_STAFF_ID);
+	testLearner = (User) usermanageService.findById(User.class, TEST_LEARNER_ID);
+	testOrganisation = (Organisation) usermanageService.findById(Organisation.class, TEST_ORGANIZATION_ID);
     }
-   
-    public void testCheckGateStatus() throws IOException
-    {
-	     Long syncGateID = new Long(33);
-	     Long scheduleGateID = new Long(34);
-	     Long permissionGateID = new Long(35);
-	     Long lessonID = new Long(2);
-    
-        
-        String packet = monitoringService.checkGateStatus(scheduleGateID, lessonID); //schedule gate
-        System.out.println(packet);
-        
+
+    public void testCheckGateStatus() throws IOException {
+	Long syncGateID = new Long(33);
+	Long scheduleGateID = new Long(34);
+	Long permissionGateID = new Long(35);
+	Long lessonID = new Long(2);
+
+	String packet = monitoringService.checkGateStatus(scheduleGateID, lessonID); // schedule gate
+	System.out.println(packet);
+
     }
-    
-    public void testReleaseGate() throws IOException
-    {
-        Long syncGateID = new Long(33);
-	    Long scheduleGateID = new Long(34);
-	    Long permissionGateID = new Long(35);
-	    
-	    String packet = monitoringService.releaseGate(syncGateID); //schedule gate
-        System.out.println(packet);
-        
+
+    public void testReleaseGate() throws IOException {
+	Long syncGateID = new Long(33);
+	Long scheduleGateID = new Long(34);
+	Long permissionGateID = new Long(35);
+
+	String packet = monitoringService.releaseGate(syncGateID); // schedule gate
+	System.out.println(packet);
+
     }
 
-    /** Get the largest id that was last inserted into a table. This will normally be the last
-     * id inserted. Why not use LAST_INSERT_ID() - that works per connection and there is 
-     * no guarantee that this test case is running using the same connection as the 
-     * service. 
+    /**
+     * Get the largest id that was last inserted into a table. This will normally be the last id inserted. Why not use
+     * LAST_INSERT_ID() - that works per connection and there is no guarantee that this test case is running using the
+     * same connection as the service.
      */
-    private long getMaxId(String tablename, String idname)
-    {
-        JdbcTemplate jt = new JdbcTemplate(dataSource);
-        return jt.queryForLong("SELECT max("+idname+") FROM "+tablename);
+    private long getMaxId(String tablename, String idname) {
+	JdbcTemplate jt = new JdbcTemplate(dataSource);
+	return jt.queryForLong("SELECT max(" + idname + ") FROM " + tablename);
     }
 
-	/*
-	 * Test method for 'org.lamsfoundation.lams.preview.service.PreviewService.startPreviewLesson(int, long, String, String)'
-	 */
-	public void testStartPreviewLesson() {
-		String testName = "LESSON";
-		String testDesc = "DESC";
-		Lesson lesson = startLesson(testName, testDesc);
-		assertEquals("Lesson has correct title",testName, lesson.getLessonName());
-		assertEquals("Lesson has correct description",testDesc, lesson.getLessonDescription());
+    /*
+     * Test method for 'org.lamsfoundation.lams.preview.service.PreviewService.startPreviewLesson(int, long, String,
+     * String)'
+     */
+    public void testStartPreviewLesson() {
+	String testName = "LESSON";
+	String testDesc = "DESC";
+	Lesson lesson = startLesson(testName, testDesc);
+	assertEquals("Lesson has correct title", testName, lesson.getLessonName());
+	assertEquals("Lesson has correct description", testDesc, lesson.getLessonDescription());
 
-		Lesson newLesson = lessonDao.getLesson(lesson.getLessonId());
-		assertNotNull("Lesson can be found in database",newLesson);
-	}
+	Lesson newLesson = lessonDao.getLesson(lesson.getLessonId());
+	assertNotNull("Lesson can be found in database", newLesson);
+    }
 
-	private Lesson startLesson(String testName, String testDesc) {
-		try {
-	        Lesson previewLesson = monitoringService.initializeLessonForPreview(testName,testDesc,TEST_LEARNING_DESIGN_SURVEY_ONLY_ID,TEST_USER_ID, null, false, false, false);
-	        assertNotNull("Lesson created",previewLesson);
-			assertNotNull("Lesson has been saved - an id exists", previewLesson.getLessonId());
+    private Lesson startLesson(String testName, String testDesc) {
+	try {
+	    Lesson previewLesson = monitoringService.initializeLessonForPreview(testName, testDesc,
+		    TEST_LEARNING_DESIGN_SURVEY_ONLY_ID, TEST_USER_ID, null, false, false, false);
+	    assertNotNull("Lesson created", previewLesson);
+	    assertNotNull("Lesson has been saved - an id exists", previewLesson.getLessonId());
 
-	        Lesson newLesson = monitoringService.createPreviewClassForLesson(TEST_USER_ID.intValue(), previewLesson.getLessonId().longValue());
-	        assertNotNull("Lesson returned from create class",newLesson);
-	        assertSame("Lesson updated from create class", newLesson.getLessonId(),previewLesson.getLessonId());
+	    Lesson newLesson = monitoringService.createPreviewClassForLesson(TEST_USER_ID.intValue(), previewLesson
+		    .getLessonId().longValue());
+	    assertNotNull("Lesson returned from create class", newLesson);
+	    assertSame("Lesson updated from create class", newLesson.getLessonId(), previewLesson.getLessonId());
 
-	        monitoringService.startLesson(previewLesson.getLessonId().longValue(),TEST_STAFF_ID);
+	    monitoringService.startLesson(previewLesson.getLessonId().longValue(), TEST_STAFF_ID);
 
-			return previewLesson;
-		} catch (UserAccessDeniedException e) {
-			fail("Unable to start lesson as due to a user exception");
-		}
-		return null;
-		
+	    return previewLesson;
+	} catch (UserAccessDeniedException e) {
+	    fail("Unable to start lesson as due to a user exception");
 	}
-	
-	/*
-	 * Test method for 'org.lamsfoundation.lams.preview.service.PreviewService.deletePreviewLesson(long)'
-	 */
-	public void testDeletePreviewLesson() {
-		String testName = "LESSON TO DELETE";
-		String testDesc = "TO BE DELETED";
-		Lesson lesson = startLesson(testName, testDesc);
-		Long lessonId = lesson.getLessonId();
-		
-		monitoringService.deletePreviewLesson(lessonId.longValue());
-		Lesson deletedLesson = lessonDao.getLesson(lessonId);
-		assertNull("Deleted lesson cannot be found",deletedLesson);
-	}
+	return null;
 
-	/*
-	 * Test method for 'org.lamsfoundation.lams.preview.service.PreviewService.deleteAllOldPreviewLessons(int)'
-	 */
-	public void testDeleteAllOldPreviewLessons() {
-		// need to dummy up something to delete. Create a lesson and force it to be over 7 days old.
-		String testName = "LESSON TO DELETE By BATCH";
-		String testDesc = "TO BE DELETED BY THE BATCH CALL";
-		Lesson lesson = startLesson(testName, testDesc);
-		Long lessonId = lesson.getLessonId();
-		
-		int numDays = Configuration.getAsInt(ConfigurationKeys.PREVIEW_CLEANUP_NUM_DAYS);
-		assertTrue("Number of days till the cleanup should be deleted is greater than zero (value is "+numDays+")", numDays > 0);
+    }
 
-		//Configuration.
-		Calendar calendar = new GregorianCalendar();
-		calendar.setTime(new Date());
-		calendar.add(Calendar.DAY_OF_MONTH, -8);
-		lesson.setStartDateTime(calendar.getTime());
-		int lessonsDeleted = monitoringService.deleteAllOldPreviewLessons();
-		assertTrue("deleteAllOldPreviewLessons returns at least 1 lesson", lessonsDeleted>=1);
-		
-		Lesson deletedLesson = lessonDao.getLesson(lessonId);
-		assertNull("Batch deleted lesson cannot be found",deletedLesson);
-	}
+    /*
+     * Test method for 'org.lamsfoundation.lams.preview.service.PreviewService.deletePreviewLesson(long)'
+     */
+    public void testDeletePreviewLesson() {
+	String testName = "LESSON TO DELETE";
+	String testDesc = "TO BE DELETED";
+	Lesson lesson = startLesson(testName, testDesc);
+	Long lessonId = lesson.getLessonId();
 
+	monitoringService.deletePreviewLesson(lessonId.longValue());
+	Lesson deletedLesson = lessonDao.getLesson(lessonId);
+	assertNull("Deleted lesson cannot be found", deletedLesson);
+    }
+
+    /*
+     * Test method for 'org.lamsfoundation.lams.preview.service.PreviewService.deleteAllOldPreviewLessons(int)'
+     */
+    public void testDeleteAllOldPreviewLessons() {
+	// need to dummy up something to delete. Create a lesson and force it to be over 7 days old.
+	String testName = "LESSON TO DELETE By BATCH";
+	String testDesc = "TO BE DELETED BY THE BATCH CALL";
+	Lesson lesson = startLesson(testName, testDesc);
+	Long lessonId = lesson.getLessonId();
+
+	int numDays = Configuration.getAsInt(ConfigurationKeys.PREVIEW_CLEANUP_NUM_DAYS);
+	assertTrue("Number of days till the cleanup should be deleted is greater than zero (value is " + numDays + ")",
+		numDays > 0);
+
+	// Configuration.
+	Calendar calendar = new GregorianCalendar();
+	calendar.setTime(new Date());
+	calendar.add(Calendar.DAY_OF_MONTH, -8);
+	lesson.setStartDateTime(calendar.getTime());
+	int lessonsDeleted = monitoringService.deleteAllOldPreviewLessons();
+	assertTrue("deleteAllOldPreviewLessons returns at least 1 lesson", lessonsDeleted >= 1);
+
+	Lesson deletedLesson = lessonDao.getLesson(lessonId);
+	assertNull("Batch deleted lesson cannot be found", deletedLesson);
+    }
+
 }
Index: lams_monitoring/web/WEB-INF/applicationContext.xml
===================================================================
diff -u
--- lams_monitoring/web/WEB-INF/applicationContext.xml	(revision 0)
+++ lams_monitoring/web/WEB-INF/applicationContext.xml	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -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: lams_monitoring/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_monitoring/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83)
+++ lams_monitoring/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -44,24 +44,29 @@
   <global-forwards>
       <forward
       	name="error"
-      	path="/error.jsp"
+      	path=".systemError"
       />
 </global-forwards>
 
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/toolBranching"
-      type="org.lamsfoundation.lams.monitoring.web.ToolOutputBranchingAction"
+      path="/grouping"
+      type="org.lamsfoundation.lams.monitoring.web.GroupingAJAXAction"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="viewBranches"
-        path=".viewBranches"
+        name="chosenGrouping"
+        path="/grouping/chosenGrouping.jsp"
         redirect="false"
       />
+      <forward
+        name="viewGroups"
+        path=".viewGroups"
+        redirect="false"
+      />
     </action>
     <action
       path="/gate"
@@ -94,37 +99,38 @@
       />
     </action>
     <action
-      path="/complexProgress"
-      type="org.lamsfoundation.lams.monitoring.web.ComplexLearnerProgressAction"
+      path="/groupedBranching"
+      type="org.lamsfoundation.lams.monitoring.web.GroupBasedBranchingAJAXAction"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="complexProgress"
-        path=".complexProgress"
+        name="groupedSelection"
+        path="/branching/groupedSelection.jsp"
         redirect="false"
       />
       <forward
-        name="parallelProgress"
-        path="/parallelProgress.jsp"
+        name="viewBranches"
+        path=".viewBranches"
         redirect="false"
       />
     </action>
     <action
-      path="/grouping"
-      type="org.lamsfoundation.lams.monitoring.web.GroupingAJAXAction"
+      path="/chosenBranching"
+      type="org.lamsfoundation.lams.monitoring.web.ChosenBranchingAJAXAction"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="chosenGrouping"
-        path="/grouping/chosenGrouping.jsp"
+        name="chosenSelection"
+        path="/branching/chosenSelection.jsp"
         redirect="false"
       />
       <forward
-        name="viewGroups"
-        path=".viewGroups"
+        name="viewBranches"
+        path=".viewBranches"
         redirect="false"
       />
     </action>
@@ -146,59 +152,53 @@
         redirect="false"
       />
       <forward
-      	name="timeChart"
-      	path="/timeChart.jsp"
-      	redirect="false" 
+        name="timeChart"
+        path="/timeChart.jsp"
+        redirect="false"
       />
     </action>
     <action
-      path="/chosenBranching"
-      type="org.lamsfoundation.lams.monitoring.web.ChosenBranchingAJAXAction"
+      path="/toolBranching"
+      type="org.lamsfoundation.lams.monitoring.web.ToolOutputBranchingAction"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="chosenSelection"
-        path="/branching/chosenSelection.jsp"
-        redirect="false"
-      />
-      <forward
         name="viewBranches"
         path=".viewBranches"
         redirect="false"
       />
     </action>
     <action
-      path="/groupedBranching"
-      type="org.lamsfoundation.lams.monitoring.web.GroupBasedBranchingAJAXAction"
+      path="/sequence"
+      type="org.lamsfoundation.lams.monitoring.web.SequenceAction"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="groupedSelection"
-        path="/branching/groupedSelection.jsp"
+        name="viewSequence"
+        path=".viewSequence"
         redirect="false"
       />
-      <forward
-        name="viewBranches"
-        path=".viewBranches"
-        redirect="false"
-      />
     </action>
     <action
-      path="/sequence"
-      type="org.lamsfoundation.lams.monitoring.web.SequenceAction"
-      parameter="method"
+      path="/complexProgress"
+      type="org.lamsfoundation.lams.monitoring.web.ComplexLearnerProgressAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="viewSequence"
-        path=".viewSequence"
+        name="complexProgress"
+        path=".complexProgress"
         redirect="false"
       />
+      <forward
+        name="parallelProgress"
+        path="/parallelProgress.jsp"
+        redirect="false"
+      />
     </action>
 
     <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
Index: lams_tool_assessment/db/sql/tool_insert.sql
===================================================================
diff -u -r6e6db32c93f144dc842f21601eb37745cdd7ca60 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_assessment/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 6e6db32c93f144dc842f21601eb37745cdd7ca60)
+++ lams_tool_assessment/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -27,8 +27,6 @@
 moderation_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 supports_outputs
@@ -58,8 +56,6 @@
 'tool/laasse10/moderate.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/laasse10',
 'org.lamsfoundation.lams.tool.assessment.ApplicationResources',
-'lams-tool-laasse10.jar',
-'/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml',
 NOW(),
 NOW(),
 1
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
===================================================================
diff -u -r6e6db32c93f144dc842f21601eb37745cdd7ca60 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision 6e6db32c93f144dc842f21601eb37745cdd7ca60)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -4,36 +4,15 @@
 
 <beans>
 
-	<bean id="messageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="messageService" class="org.lamsfoundation.lams.util.MessageService">
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename"><value>org.lamsfoundation.lams.tool.assessment.ApplicationResources</value></property>
 			</bean>
 		</property>										
 	</bean>
     <!-- Hibernate SessionFactory -->
-    <bean id="assessmentSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
 
-        <!-- Must references all OR mapping files. -->
-        <property name="mappingResources">
-            <list>
-               <value>org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/assessment/model/AssessmentOverallFeedback.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/assessment/model/AssessmentUnit.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/assessment/model/AssessmentOptionAnswer.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/assessment/model/AssessmentAttachment.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.hbm.xml</value>
-            </list>
-        </property>
-    </bean>
-
     <!-- OutputFactory -->
 	<bean id="assessmentOutputFactory" class="org.lamsfoundation.lams.tool.assessment.service.AssessmentOutputFactory">  
     	<property name="toolMessageService"><ref bean="messageService"/></property>  
@@ -42,40 +21,40 @@
     <!-- core beans -->
     <bean id="assessmentDao" class="org.lamsfoundation.lams.tool.assessment.dao.hibernate.AssessmentDAOHibernate">
         <property name="sessionFactory">
-            <ref local="assessmentSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     <bean id="assessmentQuestionDao" class="org.lamsfoundation.lams.tool.assessment.dao.hibernate.AssessmentQuestionDAOHibernate">
         <property name="sessionFactory">
-            <ref local="assessmentSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     <bean id="assessmentQuestionResultDao" class="org.lamsfoundation.lams.tool.assessment.dao.hibernate.AssessmentQuestionResultDAOHibernate">
         <property name="sessionFactory">
-            <ref local="assessmentSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     <bean id="assessmentResultDao" class="org.lamsfoundation.lams.tool.assessment.dao.hibernate.AssessmentResultDAOHibernate">
         <property name="sessionFactory">
-            <ref local="assessmentSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="assessmentAttachmentDao" class="org.lamsfoundation.lams.tool.assessment.dao.hibernate.AssessmentAttachmentDAOHibernate">
         <property name="sessionFactory">
-            <ref local="assessmentSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="assessmentUserDao" class="org.lamsfoundation.lams.tool.assessment.dao.hibernate.AssessmentUserDAOHibernate">
         <property name="sessionFactory">
-            <ref local="assessmentSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="assessmentSessionDao" class="org.lamsfoundation.lams.tool.assessment.dao.hibernate.AssessmentSessionDAOHibernate">
         <property name="sessionFactory">
-            <ref local="assessmentSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
Index: lams_tool_assessment/web/WEB-INF/applicationContext.xml
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/applicationContext.xml	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/applicationContext.xml	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -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: 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 -->
Index: lams_tool_chat/conf/xdoclet/filters.xml
===================================================================
diff -u -rab63557ac7bf5cadc87fd5bbbcae7073856c0a9d -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_chat/conf/xdoclet/filters.xml	(.../filters.xml)	(revision ab63557ac7bf5cadc87fd5bbbcae7073856c0a9d)
+++ lams_tool_chat/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>chatSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: lams_tool_chat/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_chat/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_chat/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -7,14 +7,14 @@
 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-				classpath:/org/lamsfoundation/lams/applicationContext.xml
-	            classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-            	classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	
-				classpath:/org/lamsfoundation/lams/tool/chat/dbupdates/autopatchContext.xml		
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/chat/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
Index: lams_tool_chat/db/sql/tool_insert.sql
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_chat/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_chat/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -26,8 +26,6 @@
 pedagogical_planner_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 supports_outputs
@@ -58,8 +56,6 @@
 'tool/lachat11/pedagogicalPlanner.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lachat11',
 'org.lamsfoundation.lams.tool.chat.ApplicationResources',
-'lams-tool-lachat11.jar',
-'/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml',
 NOW(),
 NOW(),
 1
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
===================================================================
diff -u -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	(.../chatApplicationContext.xml)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	(.../chatApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -10,33 +10,17 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<bean id="chatMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="chatMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename"><value>org.lamsfoundation.lams.tool.chat.ApplicationResources</value></property>
 			</bean>
 		</property>										
 	</bean>
 	
-	<!-- Hibernate SessionFactory -->
-	  <bean id="chatSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/chat/model/Chat.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/chat/model/ChatSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/chat/model/ChatUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/chat/model/ChatMessage.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/chat/model/ChatAttachment.hbm.xml</value> 
-				<value>org/lamsfoundation/lams/tool/chat/model/ChatCondition.hbm.xml</value>
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
-	<bean id="chatOutputFactory" class="org.lamsfoundation.lams.tool.chat.service.ChatOutputFactory" singleton="true">  
+	<bean id="chatOutputFactory" class="org.lamsfoundation.lams.tool.chat.service.ChatOutputFactory" >  
     	<property name="toolMessageService"><ref bean="chatMessageService"/></property>  
 	</bean> 
 	<bean id="chatService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -82,23 +66,23 @@
 	
 	<!--  DAO classes -->
 	<bean id="chatDAO" class="org.lamsfoundation.lams.tool.chat.dao.hibernate.ChatDAO">
-		<property name="sessionFactory"><ref local="chatSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 
 	<bean id="chatSessionDAO" class="org.lamsfoundation.lams.tool.chat.dao.hibernate.ChatSessionDAO">
-		<property name="sessionFactory"><ref local="chatSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="chatUserDAO" class="org.lamsfoundation.lams.tool.chat.dao.hibernate.ChatUserDAO">
-		<property name="sessionFactory"><ref local="chatSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="chatMessageDAO" class="org.lamsfoundation.lams.tool.chat.dao.hibernate.ChatMessageDAO">
-		<property name="sessionFactory"><ref local="chatSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="chatAttachmentDAO" class="org.lamsfoundation.lams.tool.chat.dao.hibernate.ChatAttachmentDAO">
-		<property name="sessionFactory"><ref local="chatSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="chatToolContentHandler" class="org.lamsfoundation.lams.tool.chat.util.ChatToolContentHandler">
Index: lams_tool_daco/db/sql/tool_insert.sql
===================================================================
diff -u -r955a2a0ed552a7c8e8ffd9894cac59233e56747e -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_daco/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 955a2a0ed552a7c8e8ffd9894cac59233e56747e)
+++ lams_tool_daco/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -27,8 +27,6 @@
 moderation_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 supports_outputs
@@ -58,8 +56,6 @@
 'tool/ladaco10/moderate.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/ladaco10',
 'org.lamsfoundation.lams.tool.daco.ApplicationResources',
-'lams-tool-ladaco10.jar',
-'/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml',
 NOW(),
 NOW(),
 1
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml
===================================================================
diff -u -r955a2a0ed552a7c8e8ffd9894cac59233e56747e -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml	(.../dacoApplicationContext.xml)	(revision 955a2a0ed552a7c8e8ffd9894cac59233e56747e)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml	(.../dacoApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -4,58 +4,40 @@
 
 <beans>
 
-	<bean id="messageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="dacoMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename"><value>org.lamsfoundation.lams.tool.daco.ApplicationResources</value></property>
 			</bean>
 		</property>										
 	</bean>
-    <!-- Hibernate SessionFactory -->
-    <bean id="dacoSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
 
-        <!-- Must references all OR mapping files. -->
-        <property name="mappingResources">
-            <list>
-               <value>org/lamsfoundation/lams/tool/daco/model/DacoUser.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/daco/model/Daco.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/daco/model/DacoQuestion.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/daco/model/DacoAttachment.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/daco/model/DacoSession.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/daco/model/DacoAnswer.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/daco/model/DacoAnswerOption.hbm.xml</value>
-            </list>
-        </property>
-    </bean>
-
     <!-- core beans -->
     <bean id="dacoDao" class="org.lamsfoundation.lams.tool.daco.dao.hibernate.DacoDAOHibernate">
         <property name="sessionFactory">
-            <ref local="dacoSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     <bean id="dacoQuestionDao" class="org.lamsfoundation.lams.tool.daco.dao.hibernate.DacoQuestionDAOHibernate">
         <property name="sessionFactory">
-            <ref local="dacoSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="dacoUserDao" class="org.lamsfoundation.lams.tool.daco.dao.hibernate.DacoUserDAOHibernate">
         <property name="sessionFactory">
-            <ref local="dacoSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="dacoSessionDao" class="org.lamsfoundation.lams.tool.daco.dao.hibernate.DacoSessionDAOHibernate">
         <property name="sessionFactory">
-            <ref local="dacoSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
    <bean id="dacoAnswerDao" class="org.lamsfoundation.lams.tool.daco.dao.hibernate.DacoAnswerDAOHibernate">
         <property name="sessionFactory">
-            <ref local="dacoSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
@@ -65,7 +47,7 @@
 	</bean> 
 	
 	<bean id="dacoOutputFactory" class="org.lamsfoundation.lams.tool.daco.service.DacoOutputFactory">
- 		<property name="toolMessageService"><ref bean="messageService"/></property>
+ 		<property name="toolMessageService"><ref bean="dacoMessageService"/></property>
  	</bean>
 	
     <bean id="dacoManagerTarget" class="org.lamsfoundation.lams.tool.daco.service.DacoServiceImpl">
@@ -106,7 +88,7 @@
    			<ref bean="exportToolContentService"/>
    		</property>
    		<property name="messageService">
-   			<ref bean="messageService"/>
+   			<ref bean="dacoMessageService"/>
    		</property>
 		<property name="coreNotebookService">
 			<ref bean="coreNotebookService"/>
Index: lams_tool_daco/web/WEB-INF/web.xml
===================================================================
diff -u -r0732f5d12802da95cf69e474b30630653924abc5 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_daco/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
+++ lams_tool_daco/web/WEB-INF/web.xml	(.../web.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -9,18 +9,18 @@
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
 	<param-value>org.lamsfoundation.lams.tool.daco.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/daco/dacoApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/tool/daco/dbupdates/autopatchContext.xml
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/daco/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
 <listener>
 	<listener-class>
@@ -40,7 +40,7 @@
     </filter-class>
     <init-param>
       <param-name>sessionFactoryBeanName</param-name>
-      <param-value>dacoSessionFactory</param-value>
+      <param-value>coreSessionFactory</param-value>
     </init-param>
    </filter>
    <!-- System session filter -->
Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java
===================================================================
diff -u -r19ee29ae5f88059a3941ba2e5341be261f75d13b -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java	(.../Deploy.java)	(revision 19ee29ae5f88059a3941ba2e5341be261f75d13b)
+++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java	(.../Deploy.java)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -24,224 +24,196 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.deploy;
 
-import java.util.LinkedList;
 import java.util.List;
 
-
-
-
-
 /**
  * Tool Deployer Main Class
  * 
- * Command Line Parameters:
- * properties_file_path: mandatory
- * forcedb: optional, defaults to false. if true, deletes any old entries in db.
+ * Command Line Parameters: properties_file_path: mandatory forcedb: optional, defaults to false. if true, deletes any
+ * old entries in db.
  * 
- * Only use forceDB for development - not designed for production. If forceDB is set, 
- * then toolSignature and toolTablesDeleteScriptPath are needed.
- *
+ * Only use forceDB for development - not designed for production. If forceDB is set, then toolSignature and
+ * toolTablesDeleteScriptPath are needed.
+ * 
  * @author Chris Perfect, modifications by Fiona Malikoff, Luke Foxton
  */
-public class Deploy
-{
-    
+public class Deploy {
+
     /** Creates a new instance of Deploy */
-    public Deploy()
-    {
+    public Deploy() {
     }
-    
+
     /**
      * Runs the Deploy
-     * @param args the command line arguments
+     * 
+     * @param args
+     *                the command line arguments
      */
-    public static void main(String[] args) throws Exception
-    {
-        
-        if ((args.length < 1) || (args[0] == null))
-        {
-            throw new IllegalArgumentException("Usage: Deployer <properties_file_path> <forceDB>. n" +
-            		"\nforceDB deletes the old database entries before creating the new entries." +
-            		"\nSo it should be set to false for production and true for development");
-        }
-        Boolean forceDB = Boolean.FALSE;
-        if ( args.length == 2 &&  args[1] != null) {
-            forceDB = new Boolean(args[1]);
-        }
-        
-        
-        System.out.println("Starting Tool Deploy");
-        try
-        {
-            System.out.println("Reading Configuration File "+args[0]);
-            DeployToolConfig config =  new DeployToolConfig(null, args[0]);
-            
-            String toolSignature = config.getToolSignature();
-            String toolVersionStr = config.getToolVersion();
-                    
-            /**
-             * Checking if the tool is installed, if not continue to install the new tool
-             * If it is, check if the tool to be installed is newer than the current
-             * If it is newer, update the db, jar and war files, otherwise
-             * put up a message that the tool is already up to date and do nothing 
-             */
-            ToolDBUpdater dbUpdater = new ToolDBUpdater();
-            dbUpdater.setDbUsername(config.getDbUsername());
-            dbUpdater.setDbPassword(config.getDbPassword());
-            dbUpdater.setDbDriverClass(config.getDbDriverClass());
-            dbUpdater.setDbDriverUrl(config.getDbDriverUrl());
-            dbUpdater.setToolSignature(config.getToolSignature());
-            dbUpdater.setToolVersion(config.getToolVersion());
-            dbUpdater.setToolCompatibleVersion(config.getMinServerVersionNumber());
-            dbUpdater.checkInstalledVersion();
-            if (dbUpdater.getToolExists() && forceDB==false)
-            {
-            	if (dbUpdater.getToolNewer())
-            	{
-            		System.out.println("Updating tool: " +toolSignature+ " with version " +toolVersionStr);
-            		
-            		// Disabling the tool while update takes place
-            		System.out.println("Disabling tool for update, valid flags set to 0.");
-            		dbUpdater.activateTool(toolSignature, 0);
-            		
-            		// updates the lams_tool table with the lams_version
-            		dbUpdater.execute();
-            		
-            		// Run update scripts if present           		
-            		ToolDBDeployTask dbDeployTask = new ToolDBDeployTask();
-                    dbDeployTask.setDbUsername(config.getDbUsername());
-                    dbDeployTask.setDbPassword(config.getDbPassword());
-                    dbDeployTask.setDbDriverClass(config.getDbDriverClass());
-                    dbDeployTask.setDbDriverUrl(config.getDbDriverUrl());
-                    dbDeployTask.setToolUpdateScriptPath(config.getToolUpdateScriptPath());
-                    dbDeployTask.runToolUpdateScript(config.getToolUpdateScriptPath());
-            		
-            		// deploy the jar and war files
-            		System.out.println("Deploying files to ear");
-                    DeployFilesTask deployFilesTask = new DeployFilesTask();
-                    deployFilesTask.setLamsEarPath(config.getLamsEarPath());
-                    deployFilesTask.setDeployFiles(config.getDeployFiles());
-                    deployFilesTask.execute();
-                    
-                    // deploy the language files
-                    List<String> files = config.getLanguageFiles();
-                    if ( files != null && files.size() > 0 ) {
-        	            DeployLanguageFilesTask deployLanguageFilesTask = new DeployLanguageFilesTask();
-        	            deployLanguageFilesTask.setLamsEarPath(config.getLamsEarPath());
-        	            deployLanguageFilesTask.setDictionaryPacket(config.getLanguageFilesPackage());
-        	            deployLanguageFilesTask.setDeployFiles(config.getLanguageFiles());
-        	            deployLanguageFilesTask.execute();
-                    }                    
-                    
-                    // Enabling the tool so it can now be used by LAMS (if not to be hidden)
-                    if (config.getHideTool()==false)
-                    {
-                    	System.out.println("Enabling Tool, valid flags set to 1");
-                    	dbUpdater.activateTool(toolSignature, 1);
-                    }
-                    else
-                    {
-                    	System.out.println("Hiding Tool, valid flags set to 0");
-                    	dbUpdater.hideTool(toolSignature);
-                    }
-                    	
-                    System.out.println("Tool update completed");
-                    System.exit(0);
-            	}
-            	else
-            	{
-            		System.out.println("The tool to be installed: " +toolSignature+ " " +toolVersionStr+ " is already up to date.");
-            		System.exit(0);
-            	}
-            }
-            else
-            {
-            	System.out.println("The tool to be installed: " +toolSignature+ " does not exist in database");
-            	System.out.println("Continuing with full install");
-            	// Do nothing, continue with full install
-            }
-            
-            
-            if ( forceDB.booleanValue() ) {
-                System.out.println("Removing old tool entries from database");
-                ToolDBRemoveToolEntriesTask dbRemoveTask = new ToolDBRemoveToolEntriesTask();
-                dbRemoveTask.setDbUsername(config.getDbUsername());
-                dbRemoveTask.setDbPassword(config.getDbPassword());
-                dbRemoveTask.setDbDriverClass(config.getDbDriverClass());
-                dbRemoveTask.setDbDriverUrl(config.getDbDriverUrl());
-                dbRemoveTask.setToolSignature(config.getToolSignature());
-                dbRemoveTask.setToolTablesDeleteScriptPath(config.getToolTablesDeleteScriptPath());
-                dbRemoveTask.execute();
-            }
-            
-            System.out.println("Running Tool DB Deploy");
-            ToolDBDeployTask dbDeployTask = new ToolDBDeployTask();
-            dbDeployTask.setDbUsername(config.getDbUsername());
-            dbDeployTask.setDbPassword(config.getDbPassword());
-            dbDeployTask.setDbDriverClass(config.getDbDriverClass());
-            dbDeployTask.setDbDriverUrl(config.getDbDriverUrl());
-            dbDeployTask.setToolInsertScriptPath(config.getToolInsertScriptPath());
-            dbDeployTask.setToolLibraryInsertScriptPath(config.getToolLibraryInsertScriptPath());
-            dbDeployTask.setToolActivityInsertScriptPath(config.getToolActivityInsertScriptPath());
-            dbDeployTask.setToolTablesScriptPath(config.getToolTablesScriptPath());
-            if (config.getToolDBVersionScriptPath() != null 
-        	    && config.getToolDBVersionScriptPath().trim().length() > 0) {
-        	dbDeployTask.setToolDBVersionScriptPath(config.getToolDBVersionScriptPath());
-            }
-            dbDeployTask.execute();
-            
-            System.out.println("Deploying files to ear");
-            DeployFilesTask deployFilesTask = new DeployFilesTask();
-            deployFilesTask.setLamsEarPath(config.getLamsEarPath());
-            deployFilesTask.setDeployFiles(config.getDeployFiles());
-            deployFilesTask.execute();
-            
-            List<String> files = config.getLanguageFiles();
-            if ( files != null && files.size() > 0 ) {
-	            DeployLanguageFilesTask deployLanguageFilesTask = new DeployLanguageFilesTask();
-	            deployLanguageFilesTask.setLamsEarPath(config.getLamsEarPath());
-	            deployLanguageFilesTask.setDictionaryPacket(config.getLanguageFilesPackage());
-	            deployLanguageFilesTask.setDeployFiles(config.getLanguageFiles());
-	            deployLanguageFilesTask.execute();
-            }
+    public static void main(String[] args) throws Exception {
 
-            AddWebAppToApplicationXmlTask addWebAppTask =  new AddWebAppToApplicationXmlTask();
-            addWebAppTask.setLamsEarPath(config.getLamsEarPath());
-            addWebAppTask.setContextRoot(config.getToolContext());
-            addWebAppTask.setWebUri(config.getToolWebUri());
-            addWebAppTask.execute();
-            
-            
-            List<String> warFiles = new LinkedList<String>();
-            warFiles.add("lams-central.war");
-            warFiles.add("lams-learning.war");
-            warFiles.add("lams-monitoring.war");
-            InsertToolContextClasspathTask updateWebXmlTask = new InsertToolContextClasspathTask();
-            updateWebXmlTask.setLamsEarPath(config.getLamsEarPath());
-            updateWebXmlTask.setArchivesToUpdate(warFiles);
-            updateWebXmlTask.setApplicationContextPath(config.getToolApplicationContextPath());
-            updateWebXmlTask.setJarFileName(config.getToolJarFileName());
-            updateWebXmlTask.execute();
+	if (args.length < 1 || args[0] == null) {
+	    throw new IllegalArgumentException("Usage: Deployer <properties_file_path> <forceDB>. n"
+		    + "\nforceDB deletes the old database entries before creating the new entries."
+		    + "\nSo it should be set to false for production and true for development");
+	}
+	Boolean forceDB = Boolean.FALSE;
+	if (args.length == 2 && args[1] != null) {
+	    forceDB = new Boolean(args[1]);
+	}
 
-            
-            if (config.getHideTool()==false)
-            {
-            	System.out.println("Activating Tool: " + config.getToolSignature());
-                dbUpdater.activateTool(config.getToolSignature(), 1);
-            }
-            else
-            {
-            	System.out.println("Hiding tool: " + config.getToolSignature());
-            	dbUpdater.hideTool(config.getToolSignature());
-            }
-            
-            System.out.println("Tool Deployed");
-        }
-        catch (Exception ex)
-        {
-            System.out.println("TOOL DEPLOY FAILED");
-            ex.printStackTrace();
-        }
+	System.out.println("Starting Tool Deploy");
+	try {
+	    System.out.println("Reading Configuration File " + args[0]);
+	    DeployToolConfig config = new DeployToolConfig(null, args[0]);
+
+	    String toolSignature = config.getToolSignature();
+	    String toolVersionStr = config.getToolVersion();
+
+	    /**
+	     * Checking if the tool is installed, if not continue to install the new tool If it is, check if the tool to
+	     * be installed is newer than the current If it is newer, update the db, jar and war files, otherwise put up
+	     * a message that the tool is already up to date and do nothing
+	     */
+	    ToolDBUpdater dbUpdater = new ToolDBUpdater();
+	    dbUpdater.setDbUsername(config.getDbUsername());
+	    dbUpdater.setDbPassword(config.getDbPassword());
+	    dbUpdater.setDbDriverClass(config.getDbDriverClass());
+	    dbUpdater.setDbDriverUrl(config.getDbDriverUrl());
+	    dbUpdater.setToolSignature(config.getToolSignature());
+	    dbUpdater.setToolVersion(config.getToolVersion());
+	    dbUpdater.setToolCompatibleVersion(config.getMinServerVersionNumber());
+	    dbUpdater.checkInstalledVersion();
+	    if (dbUpdater.getToolExists() && forceDB == false) {
+		if (dbUpdater.getToolNewer()) {
+		    System.out.println("Updating tool: " + toolSignature + " with version " + toolVersionStr);
+
+		    // Disabling the tool while update takes place
+		    System.out.println("Disabling tool for update, valid flags set to 0.");
+		    dbUpdater.activateTool(toolSignature, 0);
+
+		    // updates the lams_tool table with the lams_version
+		    dbUpdater.execute();
+
+		    // Run update scripts if present
+		    ToolDBDeployTask dbDeployTask = new ToolDBDeployTask();
+		    dbDeployTask.setDbUsername(config.getDbUsername());
+		    dbDeployTask.setDbPassword(config.getDbPassword());
+		    dbDeployTask.setDbDriverClass(config.getDbDriverClass());
+		    dbDeployTask.setDbDriverUrl(config.getDbDriverUrl());
+		    dbDeployTask.setToolUpdateScriptPath(config.getToolUpdateScriptPath());
+		    dbDeployTask.runToolUpdateScript(config.getToolUpdateScriptPath());
+
+		    // deploy the jar and war files
+		    System.out.println("Deploying files to ear");
+		    DeployFilesTask deployFilesTask = new DeployFilesTask();
+		    deployFilesTask.setLamsEarPath(config.getLamsEarPath());
+		    deployFilesTask.setDeployFiles(config.getDeployFiles());
+		    deployFilesTask.execute();
+
+		    // deploy the language files
+		    List<String> files = config.getLanguageFiles();
+		    if (files != null && files.size() > 0) {
+			DeployLanguageFilesTask deployLanguageFilesTask = new DeployLanguageFilesTask();
+			deployLanguageFilesTask.setLamsEarPath(config.getLamsEarPath());
+			deployLanguageFilesTask.setDictionaryPacket(config.getLanguageFilesPackage());
+			deployLanguageFilesTask.setDeployFiles(config.getLanguageFiles());
+			deployLanguageFilesTask.execute();
+		    }
+
+		    // Enabling the tool so it can now be used by LAMS (if not to be hidden)
+		    if (config.getHideTool() == false) {
+			System.out.println("Enabling Tool, valid flags set to 1");
+			dbUpdater.activateTool(toolSignature, 1);
+		    } else {
+			System.out.println("Hiding Tool, valid flags set to 0");
+			dbUpdater.hideTool(toolSignature);
+		    }
+
+		    System.out.println("Tool update completed");
+		    System.exit(0);
+		} else {
+		    System.out.println("The tool to be installed: " + toolSignature + " " + toolVersionStr
+			    + " is already up to date.");
+		    System.exit(0);
+		}
+	    } else {
+		System.out.println("The tool to be installed: " + toolSignature + " does not exist in database");
+		System.out.println("Continuing with full install");
+		// Do nothing, continue with full install
+	    }
+
+	    if (forceDB.booleanValue()) {
+		System.out.println("Removing old tool entries from database");
+		ToolDBRemoveToolEntriesTask dbRemoveTask = new ToolDBRemoveToolEntriesTask();
+		dbRemoveTask.setDbUsername(config.getDbUsername());
+		dbRemoveTask.setDbPassword(config.getDbPassword());
+		dbRemoveTask.setDbDriverClass(config.getDbDriverClass());
+		dbRemoveTask.setDbDriverUrl(config.getDbDriverUrl());
+		dbRemoveTask.setToolSignature(config.getToolSignature());
+		dbRemoveTask.setToolTablesDeleteScriptPath(config.getToolTablesDeleteScriptPath());
+		dbRemoveTask.execute();
+	    }
+
+	    System.out.println("Running Tool DB Deploy");
+	    ToolDBDeployTask dbDeployTask = new ToolDBDeployTask();
+	    dbDeployTask.setDbUsername(config.getDbUsername());
+	    dbDeployTask.setDbPassword(config.getDbPassword());
+	    dbDeployTask.setDbDriverClass(config.getDbDriverClass());
+	    dbDeployTask.setDbDriverUrl(config.getDbDriverUrl());
+	    dbDeployTask.setToolInsertScriptPath(config.getToolInsertScriptPath());
+	    dbDeployTask.setToolLibraryInsertScriptPath(config.getToolLibraryInsertScriptPath());
+	    dbDeployTask.setToolActivityInsertScriptPath(config.getToolActivityInsertScriptPath());
+	    dbDeployTask.setToolTablesScriptPath(config.getToolTablesScriptPath());
+	    if (config.getToolDBVersionScriptPath() != null && config.getToolDBVersionScriptPath().trim().length() > 0) {
+		dbDeployTask.setToolDBVersionScriptPath(config.getToolDBVersionScriptPath());
+	    }
+	    dbDeployTask.execute();
+
+	    System.out.println("Deploying files to ear");
+	    DeployFilesTask deployFilesTask = new DeployFilesTask();
+	    deployFilesTask.setLamsEarPath(config.getLamsEarPath());
+	    deployFilesTask.setDeployFiles(config.getDeployFiles());
+	    deployFilesTask.execute();
+
+	    List<String> files = config.getLanguageFiles();
+	    if (files != null && files.size() > 0) {
+		DeployLanguageFilesTask deployLanguageFilesTask = new DeployLanguageFilesTask();
+		deployLanguageFilesTask.setLamsEarPath(config.getLamsEarPath());
+		deployLanguageFilesTask.setDictionaryPacket(config.getLanguageFilesPackage());
+		deployLanguageFilesTask.setDeployFiles(config.getLanguageFiles());
+		deployLanguageFilesTask.execute();
+	    }
+
+	    AddWebAppToApplicationXmlTask addWebAppTask = new AddWebAppToApplicationXmlTask();
+	    addWebAppTask.setLamsEarPath(config.getLamsEarPath());
+	    addWebAppTask.setContextRoot(config.getToolContext());
+	    addWebAppTask.setWebUri(config.getToolWebUri());
+	    addWebAppTask.execute();
+
+	    /*
+	     * LDEV-2174: This update is no longer needed since we use shared Spring context.
+	     *
+	     * List<String> warFiles = new LinkedList<String>(); warFiles.add("lams-central.war");
+	     * warFiles.add("lams-learning.war"); warFiles.add("lams-monitoring.war"); InsertToolContextClasspathTask
+	     * updateWebXmlTask = new InsertToolContextClasspathTask();
+	     * updateWebXmlTask.setLamsEarPath(config.getLamsEarPath()); updateWebXmlTask.setArchivesToUpdate(warFiles);
+	     * updateWebXmlTask.setApplicationContextPath(config.getToolApplicationContextPath());
+	     * updateWebXmlTask.setJarFileName(config.getToolJarFileName()); updateWebXmlTask.execute();
+	     */
+
+	    if (config.getHideTool() == false) {
+		System.out.println("Activating Tool: " + config.getToolSignature());
+		dbUpdater.activateTool(config.getToolSignature(), 1);
+	    } else {
+		System.out.println("Hiding tool: " + config.getToolSignature());
+		dbUpdater.hideTool(config.getToolSignature());
+	    }
+
+	    System.out.println("Tool Deployed");
+	} catch (Exception ex) {
+	    System.out.println("TOOL DEPLOY FAILED");
+	    ex.printStackTrace();
+	}
     }
-    
+
 }
Index: lams_tool_dimdim/conf/xdoclet/filters.xml
===================================================================
diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_dimdim/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 4c8de20e6e3ea73f98892f70662508e4011e96f6)
+++ lams_tool_dimdim/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>dimdimSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: lams_tool_dimdim/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_dimdim/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_dimdim/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -7,14 +7,14 @@
 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-				classpath:/org/lamsfoundation/lams/applicationContext.xml
-	            classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-            	classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/dimdim/dbupdates/autopatchContext.xml			
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/dimdim/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
Index: lams_tool_dimdim/db/sql/tool_insert.sql
===================================================================
diff -u -rcd6be92480151a7cfb6ae306f5b1f8b41870dadd -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_dimdim/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision cd6be92480151a7cfb6ae306f5b1f8b41870dadd)
+++ lams_tool_dimdim/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -26,8 +26,6 @@
 help_url,
 admin_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time
 )
@@ -57,8 +55,6 @@
 'http://wiki.lamsfoundation.org/display/lamsdocs/laddim10',
 'tool/laddim10/admin/view.do',
 'org.lamsfoundation.lams.tool.dimdim.ApplicationResources',
-'lams-tool-laddim10.jar',
-'/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml',
 NOW(),
 NOW()
 )
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml
===================================================================
diff -u -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml	(.../dimdimApplicationContext.xml)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml	(.../dimdimApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -10,20 +10,6 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<!-- Hibernate SessionFactory -->
-	  <bean id="dimdimSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/tool/dimdim/model/Dimdim.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/dimdim/model/DimdimUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/dimdim/model/DimdimAttachment.hbm.xml</value> 
-				<value>org/lamsfoundation/lams/tool/dimdim/model/DimdimConfig.hbm.xml</value>
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="dimdimService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -69,23 +55,23 @@
 	
 	<!--  DAO classes -->
 	<bean id="dimdimDAO" class="org.lamsfoundation.lams.tool.dimdim.dao.hibernate.DimdimDAO">
-		<property name="sessionFactory"><ref local="dimdimSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 
 	<bean id="dimdimSessionDAO" class="org.lamsfoundation.lams.tool.dimdim.dao.hibernate.DimdimSessionDAO">
-		<property name="sessionFactory"><ref local="dimdimSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="dimdimUserDAO" class="org.lamsfoundation.lams.tool.dimdim.dao.hibernate.DimdimUserDAO">
-		<property name="sessionFactory"><ref local="dimdimSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="dimdimAttachmentDAO" class="org.lamsfoundation.lams.tool.dimdim.dao.hibernate.DimdimAttachmentDAO">
-		<property name="sessionFactory"><ref local="dimdimSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="dimdimConfigDAO" class="org.lamsfoundation.lams.tool.dimdim.dao.hibernate.DimdimConfigDAO">
-		<property name="sessionFactory"><ref local="dimdimSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="dimdimToolContentHandler" class="org.lamsfoundation.lams.tool.dimdim.util.DimdimToolContentHandler">
Index: lams_tool_forum/conf/xdoclet/filters.xml
===================================================================
diff -u -r59e4b8d442ec5f40e2e7a5bef1bda2059953b59a -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_forum/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 59e4b8d442ec5f40e2e7a5bef1bda2059953b59a)
+++ lams_tool_forum/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -5,7 +5,7 @@
     </filter-class>
     <init-param>
       <param-name>sessionFactoryBeanName</param-name>
-      <param-value>forumSessionFactory</param-value>
+      <param-value>coreSessionFactory</param-value>
     </init-param>
    </filter>
    
Index: lams_tool_forum/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_forum/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_forum/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -9,16 +9,17 @@
 	
 </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/forum/forumApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/tool/forum/dbupdates/autopatchContext.xml
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/forum/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
+
Index: lams_tool_forum/db/sql/tool_insert.sql
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_forum/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_forum/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -26,8 +26,6 @@
 pedagogical_planner_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 supports_outputs
@@ -58,8 +56,6 @@
 'tool/lafrum11/authoring/initPedagogicalPlannerForm.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lafrum11',
 'org.lamsfoundation.lams.tool.forum.ApplicationResources',
-'lams-tool-lafrum11.jar',
-'/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml',
 NOW(),
 NOW(),
 1
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
===================================================================
diff -u -r59e4b8d442ec5f40e2e7a5bef1bda2059953b59a -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 59e4b8d442ec5f40e2e7a5bef1bda2059953b59a)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -2,7 +2,7 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
 	<bean id="forumMessageService" class="org.lamsfoundation.lams.util.MessageService"
-		singleton="true">
+		>
 		<property name="messageSource">
 			<bean id="messageSource"
 				class="org.springframework.context.support.ResourceBundleMessageSource">
@@ -12,77 +12,51 @@
 			</bean>
 		</property>
 	</bean>
-	<!-- Hibernate SessionFactory -->
-	<bean id="forumSessionFactory"
-		class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource">
-			<ref bean="toolDataSource" />
-		</property>
-		<property name="hibernateProperties">
-			<ref bean="hibernateProperties" />
-		</property>
 
-		<!-- Must references all OR mapping files. -->
-		<property name="mappingResources">
-			<list>
-				<value>org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/forum/persistence/ForumReport.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/forum/persistence/MessageSeq.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/forum/persistence/Timestamp.hbm.xml</value>
-			</list>
-		</property>
-	</bean>
-
 	<!-- core beans -->
 	<bean id="forumDao" class="org.lamsfoundation.lams.tool.forum.persistence.ForumDao">
 		<property name="sessionFactory">
-			<ref local="forumSessionFactory" />
+			<ref bean="coreSessionFactory" />
 		</property>
 	</bean>
 	<bean id="forumUserDao"
 		class="org.lamsfoundation.lams.tool.forum.persistence.ForumUserDao">
 		<property name="sessionFactory">
-			<ref local="forumSessionFactory" />
+			<ref bean="coreSessionFactory" />
 		</property>
 	</bean>
 
 	<bean id="attachmentDao"
 		class="org.lamsfoundation.lams.tool.forum.persistence.AttachmentDao">
 		<property name="sessionFactory">
-			<ref local="forumSessionFactory" />
+			<ref bean="coreSessionFactory" />
 		</property>
 	</bean>
 
 	<bean id="messageDao"
 		class="org.lamsfoundation.lams.tool.forum.persistence.MessageDao">
 		<property name="sessionFactory">
-			<ref local="forumSessionFactory" />
+			<ref bean="coreSessionFactory" />
 		</property>
 	</bean>
 
 	<bean id="timestampDao"
 		class="org.lamsfoundation.lams.tool.forum.persistence.TimestampDao">
 		<property name="sessionFactory">
-			<ref local="forumSessionFactory" />
+			<ref bean="coreSessionFactory" />
 		</property>
 	</bean>
 
 	<bean id="messageSeqDao"
 		class="org.lamsfoundation.lams.tool.forum.persistence.MessageSeqDao">
 		<property name="sessionFactory">
-			<ref local="forumSessionFactory" />
+			<ref bean="coreSessionFactory" />
 		</property>
 	</bean>
 	<bean id="forumToolSessionDao"
 		class="org.lamsfoundation.lams.tool.forum.persistence.ForumToolSessionDao">
 		<property name="sessionFactory">
-			<ref local="forumSessionFactory" />
+			<ref bean="coreSessionFactory" />
 		</property>
 	</bean>
 
Index: lams_tool_gmap/conf/xdoclet/filters.xml
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_gmap/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>gmapSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: lams_tool_gmap/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_gmap/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_gmap/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -7,14 +7,14 @@
 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-				classpath:/org/lamsfoundation/lams/applicationContext.xml
-	            classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-            	classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml			
-				classpath:/org/lamsfoundation/lams/tool/gmap/dbupdates/autopatchContext.xml	
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/gmap/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
Index: lams_tool_gmap/db/sql/tool_insert.sql
===================================================================
diff -u -r1a587674fef832ce66f7b8b2d1301bec346bdfae -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_gmap/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 1a587674fef832ce66f7b8b2d1301bec346bdfae)
+++ lams_tool_gmap/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -25,8 +25,6 @@
 moderation_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 admin_url
@@ -56,8 +54,6 @@
 'tool/lagmap10/moderate.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lagmap10',
 'org.lamsfoundation.lams.tool.gmap.ApplicationResources',
-'lams-tool-lagmap10.jar',
-'/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml',
 NOW(),
 NOW(),
 'tool/lagmap10/lagmap10admin.do'
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml
===================================================================
diff -u -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	(.../gmapApplicationContext.xml)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	(.../gmapApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -10,22 +10,8 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<!-- Hibernate SessionFactory -->
-	  <bean id="gmapSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/gmap/model/GmapSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/gmap/model/GmapUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/gmap/model/GmapAttachment.hbm.xml</value> 		
-				<value>org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/gmap/model/GmapConfigItem.hbm.xml</value>
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
+
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="gmapService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
@@ -71,27 +57,27 @@
 	
 	<!--  DAO classes -->
 	<bean id="gmapDAO" class="org.lamsfoundation.lams.tool.gmap.dao.hibernate.GmapDAO">
-		<property name="sessionFactory"><ref local="gmapSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 	
 	<bean id="gmapMarkerDAO" class="org.lamsfoundation.lams.tool.gmap.dao.hibernate.GmapMarkerDAO">
-		<property name="sessionFactory"><ref local="gmapSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 	
 	<bean id="gmapConfigItemDAO" class="org.lamsfoundation.lams.tool.gmap.dao.hibernate.GmapConfigItemDAO">
-		<property name="sessionFactory"><ref local="gmapSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean> 
 
 	<bean id="gmapSessionDAO" class="org.lamsfoundation.lams.tool.gmap.dao.hibernate.GmapSessionDAO">
-		<property name="sessionFactory"><ref local="gmapSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="gmapUserDAO" class="org.lamsfoundation.lams.tool.gmap.dao.hibernate.GmapUserDAO">
-		<property name="sessionFactory"><ref local="gmapSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="gmapAttachmentDAO" class="org.lamsfoundation.lams.tool.gmap.dao.hibernate.GmapAttachmentDAO">
-		<property name="sessionFactory"><ref local="gmapSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="gmapToolContentHandler" class="org.lamsfoundation.lams.tool.gmap.util.GmapToolContentHandler">
Index: lams_tool_images/db/sql/tool_insert.sql
===================================================================
diff -u -r3a1cbcfc06aaf55285140e18e4336ca65db9e255 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_images/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 3a1cbcfc06aaf55285140e18e4336ca65db9e255)
+++ lams_tool_images/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -27,8 +27,6 @@
 moderation_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 admin_url,
@@ -59,8 +57,6 @@
 'tool/laimag10/moderate.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/laimag10',
 'org.lamsfoundation.lams.tool.imageGallery.ApplicationResources',
-'lams-tool-laimag10.jar',
-'/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml',
 NOW(),
 NOW(),
 'tool/laimag10/laimag10admin/start.do',
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml
===================================================================
diff -u -rdb681dba0a5e44ae9f4e4cf6b9bc575d6175212f -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	(.../imageGalleryApplicationContext.xml)	(revision db681dba0a5e44ae9f4e4cf6b9bc575d6175212f)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	(.../imageGalleryApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -7,30 +7,9 @@
 	<bean id="laimagMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 		<property name="basename"><value>org.lamsfoundation.lams.tool.imageGallery.ApplicationResources</value></property>
 	</bean>
-	<bean id="laimagMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="laimagMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource"><ref local="laimagMessageSource"/></property>										
 	</bean>
-    <!-- Hibernate SessionFactory -->
-    <bean id="laimagImageGallerySessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-
-        <!-- Must references all OR mapping files. -->
-        <property name="mappingResources">
-            <list>
-               <value>org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/imageGallery/model/ImageComment.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/imageGallery/model/ImageRating.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/imageGallery/model/ImageVote.hbm.xml</value>                       
-               <value>org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItemVisitLog.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryAttachment.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.hbm.xml</value>
-			   <value>org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryConfigItem.hbm.xml</value>               
-            </list>
-        </property>
-    </bean>
     
     <!-- OutputFactory -->
 	<bean id="imageGalleryOutputFactory" class="org.lamsfoundation.lams.tool.imageGallery.service.ImageGalleryOutputFactory">  
@@ -40,56 +19,56 @@
     <!-- core beans -->
     <bean id="laimagImageGalleryDao" class="org.lamsfoundation.lams.tool.imageGallery.dao.hibernate.ImageGalleryDAOHibernate">
         <property name="sessionFactory">
-            <ref local="laimagImageGallerySessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     <bean id="laimagImageGalleryItemDao" class="org.lamsfoundation.lams.tool.imageGallery.dao.hibernate.ImageGalleryItemDAOHibernate">
         <property name="sessionFactory">
-            <ref local="laimagImageGallerySessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     <bean id="laimagImageCommentDao" class="org.lamsfoundation.lams.tool.imageGallery.dao.hibernate.ImageCommentDAOHibernate">
         <property name="sessionFactory">
-            <ref local="laimagImageGallerySessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>   
     <bean id="laimagImageRatingDao" class="org.lamsfoundation.lams.tool.imageGallery.dao.hibernate.ImageRatingDAOHibernate">
         <property name="sessionFactory">
-            <ref local="laimagImageGallerySessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     <bean id="laimagImageVoteDao" class="org.lamsfoundation.lams.tool.imageGallery.dao.hibernate.ImageVoteDAOHibernate">
         <property name="sessionFactory">
-            <ref local="laimagImageGallerySessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>      
     <bean id="laimagImageGalleryItemVisitDao" class="org.lamsfoundation.lams.tool.imageGallery.dao.hibernate.ImageGalleryItemVisitDAOHibernate">
         <property name="sessionFactory">
-            <ref local="laimagImageGallerySessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="laimagImageGalleryAttachmentDao" class="org.lamsfoundation.lams.tool.imageGallery.dao.hibernate.ImageGalleryAttachmentDAOHibernate">
         <property name="sessionFactory">
-            <ref local="laimagImageGallerySessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="laimagImageGalleryUserDao" class="org.lamsfoundation.lams.tool.imageGallery.dao.hibernate.ImageGalleryUserDAOHibernate">
         <property name="sessionFactory">
-            <ref local="laimagImageGallerySessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="laimagImageGallerySessionDao" class="org.lamsfoundation.lams.tool.imageGallery.dao.hibernate.ImageGallerySessionDAOHibernate">
         <property name="sessionFactory">
-            <ref local="laimagImageGallerySessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     
    <bean id="laimagImageGalleryConfigItemDAO" class="org.lamsfoundation.lams.tool.imageGallery.dao.hibernate.ImageGalleryConfigItemDAOHibernate">
         <property name="sessionFactory">
-            <ref local="laimagImageGallerySessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>    
 
Index: lams_tool_images/web/WEB-INF/web.xml
===================================================================
diff -u -r0732f5d12802da95cf69e474b30630653924abc5 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_images/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
+++ lams_tool_images/web/WEB-INF/web.xml	(.../web.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -9,18 +9,18 @@
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
 	<param-value>org.lamsfoundation.lams.tool.imageGallery.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/imageGallery/imageGalleryApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/tool/imageGallery/dbupdates/autopatchContext.xml
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/imageGallery/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
 <listener>
 	<listener-class>
@@ -41,7 +41,7 @@
     </filter-class>
     <init-param>
       <param-name>sessionFactoryBeanName</param-name>
-      <param-value>laimagImageGallerySessionFactory</param-value>
+      <param-value>coreSessionFactory</param-value>
     </init-param>
    </filter>
    <!-- System session filter -->
Index: lams_tool_lamc/db/sql/tool_insert.sql
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_lamc/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_lamc/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -26,8 +26,6 @@
 pedagogical_planner_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 supports_outputs
@@ -58,8 +56,6 @@
 'tool/lamc11/pedagogicalPlanner.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lamc11',
 'org.lamsfoundation.lams.tool.mc.ApplicationResources',
-'lams-tool-lamc11.jar',
-'/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml',
 NOW(),
 NOW(),
 1)
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
===================================================================
diff -u -r7936e8f7de045aea09aaa715f3027061f05a1c15 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision 7936e8f7de045aea09aaa715f3027061f05a1c15)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -12,56 +12,39 @@
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
 	
-	<!-- Hibernate SessionFactory -->
-	<bean id="mcSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-  			  	<value>/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml</value> 
-				<value>/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml</value>
-			  	<value>/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/mc/McUploadedFile.hbm.xml</value>				
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
-
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 
 	<!-- data access and repository access beans -->
 
 
 	<bean id="mcContentDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McContentDAO">
-		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 
 	<bean id="mcSessionDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McSessionDAO">
-		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 	<bean id="mcUserDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McUserDAO">
-		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="mcQueContentDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McQueContentDAO">
-		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="mcOptionsContentDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McOptionsContentDAO">
-		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	
 	<bean id="mcUsrAttemptDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McUsrAttemptDAO">
-		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 
 	<bean id="mcUploadedFileDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McUploadedFileDAO">
-		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="mcToolContentHandler" class="org.lamsfoundation.lams.tool.mc.util.McToolContentHandler">
@@ -74,7 +57,7 @@
 		<property name="basename"><value>org.lamsfoundation.lams.tool.mc.ApplicationResources</value></property>
 	</bean>
 	
-	<bean id="lamcMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="lamcMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource"><ref local="lamcMessageSource"/></property>										
 	</bean>
 
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/testmcApplicationContext.xml
===================================================================
diff -u -rea33dbf01ef0e0cd3474279bb471fc0b09d2295e -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/testmcApplicationContext.xml	(.../testmcApplicationContext.xml)	(revision ea33dbf01ef0e0cd3474279bb471fc0b09d2295e)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/testmcApplicationContext.xml	(.../testmcApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -59,7 +59,7 @@
 	<!-- bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/-->
 	<!-- Transaction manager for a single Hibernate SessionFactory (alternative to JTA) -->
 	<bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
-		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 
@@ -70,34 +70,34 @@
 	<!-- tool beans -->
 
 	<bean id="mcContentDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McContentDAO">
-		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 
 	<bean id="mcSessionDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McSessionDAO">
-		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 	<bean id="mcUserDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McUserDAO">
-		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="mcQueContentDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McQueContentDAO">
-		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="mcOptionsContentDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McOptionsContentDAO">
-		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	
 	<bean id="mcUsrAttemptDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McUsrAttemptDAO">
-		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 
 <!-- 	
 	<bean id="mcUploadedFileDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McUploadedFileDAO">
-		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 -->
 	
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
diff -u -r0732f5d12802da95cf69e474b30630653924abc5 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
+++ lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -6,18 +6,18 @@
   	<param-value>org.lamsfoundation.lams.tool.mc.ApplicationResources</param-value>
 	</context-param>
 	
-	<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/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.xml
-			</param-value>
-	</context-param>
+<context-param> 
+	<param-name>contextConfigLocation</param-name>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.xml</param-value>
+</context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
     <filter>
 	    <filter-name>SystemSessionFilter</filter-name>
@@ -33,7 +33,7 @@
 	    </filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
-		    <param-value>mcSessionFactory</param-value>
+		    <param-value>coreSessionFactory</param-value>
 		</init-param>
    </filter>
 
Index: lams_tool_laqa/db/sql/tool_insert.sql
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_laqa/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_laqa/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -47,8 +47,6 @@
 pedagogical_planner_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 supports_outputs,
@@ -80,8 +78,6 @@
 'tool/laqa11/pedagogicalPlanner.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/laqa11',
 'org.lamsfoundation.lams.tool.qa.ApplicationResources',
-'lams-tool-laqa11.jar',
-'/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml',
 NOW(),
 NOW(),
 1,
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
diff -u -r80a367726b9e7607851be28429bda54d9b306159 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 80a367726b9e7607851be28429bda54d9b306159)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -11,75 +11,54 @@
 <!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<bean id="qaMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="qaMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename"><value>org.lamsfoundation.lams.tool.qa.ApplicationResources</value></property>
 			</bean>
 		</property>										
 	</bean>
 	
-	<!-- Hibernate SessionFactory -->
-	<bean id="qaSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>
-				<value>org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/qa/QaConfigItem.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/qa/QaWizardCategory.hbm.xml</value>
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<!-- OutputFactory -->
-	<bean id="qaOutputFactory" class="org.lamsfoundation.lams.tool.qa.service.QaOutputFactory" singleton="true">  
+	<bean id="qaOutputFactory" class="org.lamsfoundation.lams.tool.qa.service.QaOutputFactory" >  
     	<property name="toolMessageService"><ref bean="qaMessageService"/></property>  
 	</bean> 
 	
 	<!-- tool beans -->
 
 
 	<bean id="qaContentDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaContentDAO">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 
 	<bean id="qaSessionDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaSessionDAO">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 	<bean id="qaQueUsrDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaQueUsrDAO">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 	<bean id="qaQueContentDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaQueContentDAO">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 	<bean id="qaUsrRespDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaUsrRespDAO">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 	<bean id="qaUploadedFileDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaUploadedFileDAO">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="qaConfigItemDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaConfigItemDAO">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="qaWizardDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaWizardDAO">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="qaToolContentHandler" class="org.lamsfoundation.lams.tool.qa.util.QaToolContentHandler">
Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
diff -u -rb859dab1f3cce4985a7b5266083b899bdfc92fdb -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision b859dab1f3cce4985a7b5266083b899bdfc92fdb)
+++ lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -7,18 +7,18 @@
 	  	<param-value>org.lamsfoundation.lams.tool.qa.ApplicationResources</param-value>
 	</context-param>
 	
-	<context-param> 
-		<param-name>contextConfigLocation</param-name>
-			<param-value>
-				classpath:/org/lamsfoundation/lams/applicationContext.xml
-		    	classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-		    	classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-		    	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/qa/dbupdates/autopatchContext.xml
-			</param-value>
-	</context-param>
+<context-param> 
+	<param-name>contextConfigLocation</param-name>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/qa/dbupdates/autopatchContext.xml</param-value>
+</context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
     <filter>
 	    <filter-name>SystemSessionFilter</filter-name>
@@ -34,7 +34,7 @@
 	    </filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
-			<param-value>qaSessionFactory</param-value>
+			<param-value>coreSessionFactory</param-value>
 		</init-param>
    </filter>
 
Index: lams_tool_larsrc/db/sql/tool_insert.sql
===================================================================
diff -u -r3fe05cc69b1d0cfa2cb494a4778a8ab00dec2d60 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_larsrc/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 3fe05cc69b1d0cfa2cb494a4778a8ab00dec2d60)
+++ lams_tool_larsrc/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -28,8 +28,6 @@
 pedagogical_planner_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time
 )
@@ -59,8 +57,6 @@
 'tool/larsrc11/authoring/initPedagogicalPlannerForm.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/larsrc11',
 'org.lamsfoundation.lams.tool.rsrc.ApplicationResources',
-'lams-tool-larsrc11.jar',
-'/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml',
 NOW(),
 NOW()
 )
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
===================================================================
diff -u -ref2417616a93e7d6f1eaee601fd78455a90564d6 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	(.../rsrcApplicationContext.xml)	(revision ef2417616a93e7d6f1eaee601fd78455a90564d6)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	(.../rsrcApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -4,64 +4,45 @@
 
 <beans>
 
-	<bean id="messageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="resourceMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename"><value>org.lamsfoundation.lams.tool.rsrc.ApplicationResources</value></property>
 			</bean>
 		</property>										
 	</bean>
-    <!-- Hibernate SessionFactory -->
-    <bean id="resourceSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-
-        <!-- Must references all OR mapping files. -->
-        <property name="mappingResources">
-            <list>
-               <value>org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/rsrc/model/ResourceAttachment.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml</value>
-            </list>
-        </property>
-    </bean>
-
     <!-- core beans -->
     <bean id="resourceDao" class="org.lamsfoundation.lams.tool.rsrc.dao.hibernate.ResourceDAOHibernate">
         <property name="sessionFactory">
-            <ref local="resourceSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     <bean id="resourceItemDao" class="org.lamsfoundation.lams.tool.rsrc.dao.hibernate.ResourceItemDAOHibernate">
         <property name="sessionFactory">
-            <ref local="resourceSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     <bean id="resourceItemVisitDao" class="org.lamsfoundation.lams.tool.rsrc.dao.hibernate.ResourceItemVisitDAOHibernate">
         <property name="sessionFactory">
-            <ref local="resourceSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="resourceAttachmentDao" class="org.lamsfoundation.lams.tool.rsrc.dao.hibernate.ResourceAttachmentDAOHibernate">
         <property name="sessionFactory">
-            <ref local="resourceSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="resourceUserDao" class="org.lamsfoundation.lams.tool.rsrc.dao.hibernate.ResourceUserDAOHibernate">
         <property name="sessionFactory">
-            <ref local="resourceSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="resourceSessionDao" class="org.lamsfoundation.lams.tool.rsrc.dao.hibernate.ResourceSessionDAOHibernate">
         <property name="sessionFactory">
-            <ref local="resourceSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
@@ -111,7 +92,7 @@
    		<property name="exportContentService">
    			<ref bean="exportToolContentService"/>
    		</property>
-   		<property name="messageService"><ref bean="messageService"/></property>
+   		<property name="messageService"><ref bean="resourceMessageService"/></property>
 		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>   
 		<property name="eventNotificationService">
 			<ref bean="eventNotificationService"/>
Index: lams_tool_larsrc/web/WEB-INF/web.xml
===================================================================
diff -u -raf0f333826569e48655569fbf9c8b13decd475b0 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision af0f333826569e48655569fbf9c8b13decd475b0)
+++ lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -9,18 +9,18 @@
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
 	<param-value>org.lamsfoundation.lams.tool.rsrc.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/rsrc/rsrcApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/tool/rsrc/dbupdates/autopatchContext.xml
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/rsrc/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
 <listener>
 	<listener-class>
@@ -41,7 +41,7 @@
     </filter-class>
     <init-param>
       <param-name>sessionFactoryBeanName</param-name>
-      <param-value>resourceSessionFactory</param-value>
+      <param-value>coreSessionFactory</param-value>
     </init-param>
    </filter>
    <!-- System session filter -->
Index: lams_tool_nb/conf/xdoclet/filters.xml
===================================================================
diff -u -r8f07317c71b1749ef616c0d42f5b49e9a14c43a8 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_nb/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 8f07317c71b1749ef616c0d42f5b49e9a14c43a8)
+++ lams_tool_nb/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -20,7 +20,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>nbSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
 
Index: lams_tool_nb/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_nb/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_nb/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -2,15 +2,15 @@
   	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
   	<param-value>org.lamsfoundation.lams.tool.noticeboard.ApplicationResources</param-value>
 </context-param>
-	<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/tool/noticeboard/applicationContext.xml
-			classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-			classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-			classpath:/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml
-		</param-value>
-	</context-param>
+<context-param> 
+	<param-name>contextConfigLocation</param-name>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml</param-value>
+</context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
Index: lams_tool_nb/db/sql/tool_insert.sql
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_nb/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_nb/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -26,8 +26,6 @@
 pedagogical_planner_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time
 )
@@ -57,8 +55,6 @@
 'tool/lanb11/pedagogicalPlanner.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lanb11',
 'org.lamsfoundation.lams.tool.noticeboard.ApplicationResources',
-'lams-tool-lanb11.jar',
-'/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml',
 NOW(),
 NOW()
 );
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml
===================================================================
diff -u
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	(revision 0)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+ 	<!--
+ 	- Application context definition for lams noticeboard business layer.
+	-->
+<beans>
+
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+
+	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
+
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
+	<bean id="nbService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name ="target">
+			<bean class="org.lamsfoundation.lams.tool.noticeboard.service.NoticeboardServicePOJO">
+				<property name="nbContentDAO"><ref bean="nbContentDAO"/></property>
+				<property name="nbSessionDAO"><ref bean="nbSessionDAO"/></property>
+				<property name="nbUserDAO"><ref bean="nbUserDAO"/></property>
+				<property name="nbAttachmentDAO"><ref bean="nbAttachmentDAO"/></property>
+				<property name="toolService"><ref bean="lamsToolService"/></property>
+				<property name="learnerService"><ref bean="learnerService"/></property>			
+				<property name="nbToolContentHandler"><ref bean="nbToolContentHandler"/></property>			
+				<property name="exportContentService"><ref bean="exportToolContentService"/></property>
+				<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
+			</bean>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="copy*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="retrieve*">PROPAGATION_REQUIRED</prop>
+				<prop key="remove*">PROPAGATION_REQUIRED</prop>
+				<prop key="add*">PROPAGATION_REQUIRED</prop>
+				<prop key="leaveToolSession">PROPAGATION_REQUIRED</prop>
+                <prop key="setAsDefineLater">PROPAGATION_REQUIRED</prop>
+                <prop key="setAsRunOffline">PROPAGATION_REQUIRED</prop>
+                <prop key="exportToolSession">PROPAGATION_REQUIRED</prop>
+
+				<prop key="importToolContent">PROPAGATION_REQUIRED</prop>
+				<prop key="exportToolContent">PROPAGATION_REQUIRED</prop>
+				<prop key="import102ToolContent">PROPAGATION_REQUIRED</prop>
+				<prop key="setReflectiveData">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean> 
+
+
+
+	<!--  DAO classes -->
+	<bean id="nbContentDAO" class="org.lamsfoundation.lams.tool.noticeboard.dao.hibernate.NoticeboardContentDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>  
+
+	<bean id="nbSessionDAO" class="org.lamsfoundation.lams.tool.noticeboard.dao.hibernate.NoticeboardSessionDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="nbUserDAO" class="org.lamsfoundation.lams.tool.noticeboard.dao.hibernate.NoticeboardUserDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="nbAttachmentDAO" class="org.lamsfoundation.lams.tool.noticeboard.dao.hibernate.NoticeboardAttachmentDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="nbToolContentHandler" class="org.lamsfoundation.lams.tool.noticeboard.util.NbToolContentHandler">
+ 		<property name="repositoryService"><ref bean="repositoryService"/></property>
+	</bean> 
+
+</beans>
Index: lams_tool_notebook/conf/xdoclet/filters.xml
===================================================================
diff -u -r5948e17402e1ad574aeddbe55f93dca2f58bbbec -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_notebook/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 5948e17402e1ad574aeddbe55f93dca2f58bbbec)
+++ lams_tool_notebook/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>notebookSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: lams_tool_notebook/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_notebook/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_notebook/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -7,14 +7,14 @@
 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-				classpath:/org/lamsfoundation/lams/applicationContext.xml
-	            classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-            	classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml			
-				classpath:/org/lamsfoundation/lams/tool/notebook/dbupdates/autopatchContext.xml	
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/notebook/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
Index: lams_tool_notebook/db/sql/tool_insert.sql
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_notebook/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_notebook/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -26,8 +26,6 @@
 pedagogical_planner_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 supports_outputs
@@ -58,8 +56,6 @@
 'tool/lantbk11/pedagogicalPlanner.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lantbk11',
 'org.lamsfoundation.lams.tool.notebook.ApplicationResources',
-'lams-tool-lantbk11.jar',
-'/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml',
 NOW(),
 NOW(),
 1
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml
===================================================================
diff -u -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	(.../notebookApplicationContext.xml)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	(.../notebookApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -10,31 +10,16 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<bean id="notebookMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="notebookMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename"><value>org.lamsfoundation.lams.tool.notebook.ApplicationResources</value></property>
 			</bean>
 		</property>										
 	</bean>
-	<!-- Hibernate SessionFactory -->
-	  <bean id="notebookSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/notebook/model/NotebookSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/notebook/model/NotebookUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/notebook/model/NotebookAttachment.hbm.xml</value> 
-				<value>org/lamsfoundation/lams/tool/notebook/model/NotebookCondition.hbm.xml</value> 
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
-	<bean id="notebookOutputFactory" class="org.lamsfoundation.lams.tool.notebook.service.NotebookOutputFactory" singleton="true">  
+	<bean id="notebookOutputFactory" class="org.lamsfoundation.lams.tool.notebook.service.NotebookOutputFactory" >  
     	<property name="toolMessageService"><ref bean="notebookMessageService"/></property>  
 	</bean> 
 	<bean id="notebookService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -80,19 +65,19 @@
 	
 	<!--  DAO classes -->
 	<bean id="notebookDAO" class="org.lamsfoundation.lams.tool.notebook.dao.hibernate.NotebookDAO">
-		<property name="sessionFactory"><ref local="notebookSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 
 	<bean id="notebookSessionDAO" class="org.lamsfoundation.lams.tool.notebook.dao.hibernate.NotebookSessionDAO">
-		<property name="sessionFactory"><ref local="notebookSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="notebookUserDAO" class="org.lamsfoundation.lams.tool.notebook.dao.hibernate.NotebookUserDAO">
-		<property name="sessionFactory"><ref local="notebookSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="notebookAttachmentDAO" class="org.lamsfoundation.lams.tool.notebook.dao.hibernate.NotebookAttachmentDAO">
-		<property name="sessionFactory"><ref local="notebookSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="notebookToolContentHandler" class="org.lamsfoundation.lams.tool.notebook.util.NotebookToolContentHandler">
Index: lams_tool_pixlr/conf/xdoclet/filters.xml
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_pixlr/conf/xdoclet/filters.xml	(.../filters.xml)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>pixlrSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: lams_tool_pixlr/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_pixlr/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -7,14 +7,14 @@
 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-				classpath:/org/lamsfoundation/lams/applicationContext.xml
-	            classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-            	classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml			
-				classpath:/org/lamsfoundation/lams/tool/pixlr/dbupdates/autopatchContext.xml	
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/pixlr/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
Index: lams_tool_pixlr/db/sql/tool_insert.sql
===================================================================
diff -u -rf31b75c40cca57454726c6f43dfba57cc2dae37c -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_pixlr/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision f31b75c40cca57454726c6f43dfba57cc2dae37c)
+++ lams_tool_pixlr/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -25,8 +25,6 @@
 moderation_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 supports_outputs,
@@ -57,8 +55,6 @@
 'tool/lapixl10/moderate.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lapixl10',
 'org.lamsfoundation.lams.tool.pixlr.ApplicationResources',
-'lams-tool-lapixl10.jar',
-'/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml',
 NOW(),
 NOW(),
 0,
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml
===================================================================
diff -u -r647644862f7a21c589db91a4e21bba36970ce236 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	(.../pixlrApplicationContext.xml)	(revision 647644862f7a21c589db91a4e21bba36970ce236)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	(.../pixlrApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -10,30 +10,16 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<bean id="pixlrMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="pixlrMessageService" class="org.lamsfoundation.lams.util.MessageService">
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename"><value>org.lamsfoundation.lams.tool.pixlr.ApplicationResources</value></property>
 			</bean>
 		</property>										
 	</bean>
-	<!-- Hibernate SessionFactory -->
-	  <bean id="pixlrSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/tool/pixlr/model/Pixlr.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/pixlr/model/PixlrSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/pixlr/model/PixlrUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/pixlr/model/PixlrAttachment.hbm.xml</value> 
-				<value>org/lamsfoundation/lams/tool/pixlr/model/PixlrConfigItem.hbm.xml</value> 
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
-	<bean id="pixlrOutputFactory" class="org.lamsfoundation.lams.tool.pixlr.service.PixlrOutputFactory" singleton="true">  
+	<bean id="pixlrOutputFactory" class="org.lamsfoundation.lams.tool.pixlr.service.PixlrOutputFactory">  
     	<property name="toolMessageService"><ref bean="pixlrMessageService"/></property>  
 	</bean> 
 	<bean id="pixlrService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -80,27 +66,27 @@
 	
 	<!--  DAO classes -->
 	<bean id="pixlrDAO" class="org.lamsfoundation.lams.tool.pixlr.dao.hibernate.PixlrDAO">
-		<property name="sessionFactory"><ref local="pixlrSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 
 	<bean id="pixlrSessionDAO" class="org.lamsfoundation.lams.tool.pixlr.dao.hibernate.PixlrSessionDAO">
-		<property name="sessionFactory"><ref local="pixlrSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="pixlrUserDAO" class="org.lamsfoundation.lams.tool.pixlr.dao.hibernate.PixlrUserDAO">
-		<property name="sessionFactory"><ref local="pixlrSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="pixlrAttachmentDAO" class="org.lamsfoundation.lams.tool.pixlr.dao.hibernate.PixlrAttachmentDAO">
-		<property name="sessionFactory"><ref local="pixlrSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="pixlrToolContentHandler" class="org.lamsfoundation.lams.tool.pixlr.util.PixlrToolContentHandler">
  		<property name="repositoryService"><ref bean="repositoryService"/></property>
 	</bean>  
 	
 	<bean id="pixlrConfigItemDAO" class="org.lamsfoundation.lams.tool.pixlr.dao.hibernate.PixlrConfigItemDAO">
- 		<property name="sessionFactory"><ref local="pixlrSessionFactory"/></property>
+ 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 </beans>
Index: lams_tool_sbmt/conf/xdoclet/filters.xml
===================================================================
diff -u -r8f07317c71b1749ef616c0d42f5b49e9a14c43a8 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_sbmt/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 8f07317c71b1749ef616c0d42f5b49e9a14c43a8)
+++ lams_tool_sbmt/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -5,7 +5,7 @@
     </filter-class>
     <init-param>
       <param-name>sessionFactoryBeanName</param-name>
-      <param-value>sbmtSessionFactory</param-value>
+      <param-value>coreSessionFactory</param-value>
     </init-param>
    </filter>
    
Index: lams_tool_sbmt/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_sbmt/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_sbmt/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -1,19 +1,19 @@
 <display-name>LAMS</display-name>
 
 <description>Learning Activity Management System</description>
-<context-param>
+<context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-		classpath:/org/lamsfoundation/lams/applicationContext.xml
-		classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
-		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	
-		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml	
-		classpath:/org/lamsfoundation/lams/toolApplicationContext.xml	
-		classpath:/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.xml
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.xml</param-value>
 </context-param>
 <context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
+<context-param>
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
 	<param-value>org.lamsfoundation.lams.tool.sbmt.ApplicationResources</param-value>
 </context-param>
\ No newline at end of file
Index: lams_tool_sbmt/db/sql/tool_insert.sql
===================================================================
diff -u -r3636757b4afafb785ae0c6c8295a969c605f8e28 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_sbmt/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 3636757b4afafb785ae0c6c8295a969c605f8e28)
+++ lams_tool_sbmt/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -26,8 +26,6 @@
 pedagogical_planner_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time
 )
@@ -57,8 +55,6 @@
 'tool/lasbmt11/pedagogicalPlanner.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lasbmt11',
 'org.lamsfoundation.lams.tool.sbmt.ApplicationResources',
-'lams-tool-lasbmt11.jar',
-'/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml',
 NOW(),
 NOW()
 );
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
diff -u -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -4,7 +4,7 @@
 <!-- Application context definition for Submit Files Tool -->
 
 <beans>
-	<bean id="sbmtMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="sbmtMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename"><value>org.lamsfoundation.lams.tool.sbmt.ApplicationResources</value></property>
@@ -13,46 +13,31 @@
 	</bean>
 	
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-  	<!-- Hibernate SessionFactory -->
-	<bean id="sbmtSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>
-				<value>org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml</value>				
-				<value>org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml</value>				
-				<value>org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml</value>				
-				<value>org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml</value>				
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- Submit Files related beans-->
 	
 	<bean id="submitFilesContentDAO" class="org.lamsfoundation.lams.tool.sbmt.dao.hibernate.SubmitFilesContentDAO">
-		<property name="sessionFactory"><ref local="sbmtSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="submitFilesSessionDAO" class="org.lamsfoundation.lams.tool.sbmt.dao.hibernate.SubmitFilesSessionDAO">
-		<property name="sessionFactory"><ref local="sbmtSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="submitFilesReportDAO" class="org.lamsfoundation.lams.tool.sbmt.dao.hibernate.SubmitFilesReportDAO">
-		<property name="sessionFactory"><ref local="sbmtSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>	
 	
 	<bean id="submissionDetailsDAO" class="org.lamsfoundation.lams.tool.sbmt.dao.hibernate.SubmissionDetailsDAO">
-		<property name="sessionFactory"><ref local="sbmtSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 	<bean id="submitUserDAO" class="org.lamsfoundation.lams.tool.sbmt.dao.hibernate.SubmitUserDAO">
-		<property name="sessionFactory"><ref local="sbmtSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 	<bean id="attachmentDAO" class="org.lamsfoundation.lams.tool.sbmt.dao.hibernate.AttachmentDAO">
-		<property name="sessionFactory"><ref local="sbmtSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="submitFilesServiceTarget" class="org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesService">
Index: lams_tool_scribe/conf/xdoclet/filters.xml
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_scribe/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>lascrbScribeSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: lams_tool_scribe/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_scribe/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_scribe/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -7,14 +7,14 @@
 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-				classpath:/org/lamsfoundation/lams/applicationContext.xml
-	            classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-            	classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml			
-				classpath:/org/lamsfoundation/lams/tool/scribe/dbupdates/autopatchContext.xml	
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/scribe/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
Index: lams_tool_scribe/db/sql/tool_insert.sql
===================================================================
diff -u -r8f7975d272f91acc26c785848d82d26d6b5dd357 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_scribe/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 8f7975d272f91acc26c785848d82d26d6b5dd357)
+++ lams_tool_scribe/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -26,8 +26,6 @@
 pedagogical_planner_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time
 )
@@ -57,8 +55,6 @@
 'tool/lascrb11/pedagogicalPlanner.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lascrb11',
 'org.lamsfoundation.lams.tool.scribe.ApplicationResources',
-'lams-tool-lascrb11.jar',
-'/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml',
 NOW(),
 NOW()
 )
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml
===================================================================
diff -u -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	(.../scribeApplicationContext.xml)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	(.../scribeApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -10,21 +10,6 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<!-- Hibernate SessionFactory -->
-	  <bean id="lascrbScribeSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/scribe/model/ScribeUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/scribe/model/ScribeAttachment.hbm.xml</value> 
-				<value>org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.hbm.xml</value> 
-				<value>org/lamsfoundation/lams/tool/scribe/model/ScribeReportEntry.hbm.xml</value> 
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="lascrbScribeService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -69,22 +54,22 @@
 	
 	<!--  DAO classes -->
 	<bean id="lascrbScribeDAO" class="org.lamsfoundation.lams.tool.scribe.dao.hibernate.ScribeDAO">
-		<property name="sessionFactory"><ref local="lascrbScribeSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 
 	<bean id="lascrbScribeSessionDAO" class="org.lamsfoundation.lams.tool.scribe.dao.hibernate.ScribeSessionDAO">
-		<property name="sessionFactory"><ref local="lascrbScribeSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="lascrbScribeUserDAO" class="org.lamsfoundation.lams.tool.scribe.dao.hibernate.ScribeUserDAO">
-		<property name="sessionFactory"><ref local="lascrbScribeSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="lascrbScribeHeadingDAO" class="org.lamsfoundation.lams.tool.scribe.dao.hibernate.ScribeHeadingDAO">
-		<property name="sessionFactory"><ref local="lascrbScribeSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<bean id="lascrbScribeAttachmentDAO" class="org.lamsfoundation.lams.tool.scribe.dao.hibernate.ScribeAttachmentDAO">
-		<property name="sessionFactory"><ref local="lascrbScribeSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="lascrbScribeToolContentHandler" class="org.lamsfoundation.lams.tool.scribe.util.ScribeToolContentHandler">
Index: lams_tool_spreadsheet/db/sql/tool_insert.sql
===================================================================
diff -u -r7f9f772433a7fd55c4475241d4e3bc0765f474e8 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_spreadsheet/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 7f9f772433a7fd55c4475241d4e3bc0765f474e8)
+++ lams_tool_spreadsheet/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -27,8 +27,6 @@
 moderation_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time
 )
@@ -57,8 +55,6 @@
 'tool/lasprd10/moderate.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lasprd10',
 'org.lamsfoundation.lams.tool.spreadsheet.ApplicationResources',
-'lams-tool-lasprd10.jar',
-'/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml',
 NOW(),
 NOW()
 )
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml
===================================================================
diff -u -ra7fed1be51941ace379dbb695d52bd08a315dae6 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml	(.../spreadsheetApplicationContext.xml)	(revision a7fed1be51941ace379dbb695d52bd08a315dae6)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml	(.../spreadsheetApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -4,65 +4,49 @@
 
 <beans>
 
-	<bean id="messageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="spreadsheetMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename"><value>org.lamsfoundation.lams.tool.spreadsheet.ApplicationResources</value></property>
 			</bean>
 		</property>										
 	</bean>
-    <!-- Hibernate SessionFactory -->
-    <bean id="spreadsheetSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
 
-        <!-- Must references all OR mapping files. -->
-        <property name="mappingResources">
-            <list>
-               <value>org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetUser.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetMark.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetAttachment.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.hbm.xml</value>
-            </list>
-        </property>
-    </bean>
 
     <!-- core beans -->
     <bean id="spreadsheetDao" class="org.lamsfoundation.lams.tool.spreadsheet.dao.hibernate.SpreadsheetDAOHibernate">
         <property name="sessionFactory">
-            <ref local="spreadsheetSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     
     <bean id="userModifiedSpreadsheetDao" class="org.lamsfoundation.lams.tool.spreadsheet.dao.hibernate.UserModifiedSpreadsheetDAOHibernate">
         <property name="sessionFactory">
-            <ref local="spreadsheetSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     
     <bean id="spreadsheetMarkDao" class="org.lamsfoundation.lams.tool.spreadsheet.dao.hibernate.SpreadsheetMarkDAOHibernate">
         <property name="sessionFactory">
-            <ref local="spreadsheetSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="spreadsheetAttachmentDao" class="org.lamsfoundation.lams.tool.spreadsheet.dao.hibernate.SpreadsheetAttachmentDAOHibernate">
         <property name="sessionFactory">
-            <ref local="spreadsheetSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="spreadsheetUserDao" class="org.lamsfoundation.lams.tool.spreadsheet.dao.hibernate.SpreadsheetUserDAOHibernate">
         <property name="sessionFactory">
-            <ref local="spreadsheetSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="spreadsheetSessionDao" class="org.lamsfoundation.lams.tool.spreadsheet.dao.hibernate.SpreadsheetSessionDAOHibernate">
         <property name="sessionFactory">
-            <ref local="spreadsheetSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
@@ -112,7 +96,7 @@
    		<property name="exportContentService">
    			<ref bean="exportToolContentService"/>
    		</property>
-   		<property name="messageService"><ref bean="messageService"/></property>
+   		<property name="messageService"><ref bean="spreadsheetMessageService"/></property>
 		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>   		
     </bean>
 
Index: lams_tool_spreadsheet/web/WEB-INF/web.xml
===================================================================
diff -u -r0732f5d12802da95cf69e474b30630653924abc5 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_spreadsheet/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
+++ lams_tool_spreadsheet/web/WEB-INF/web.xml	(.../web.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -9,18 +9,18 @@
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
 	<param-value>org.lamsfoundation.lams.tool.spreadsheet.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/spreadsheet/spreadsheetApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/autopatchContext.xml
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
 <listener>
 	<listener-class>
@@ -35,7 +35,7 @@
     </filter-class>
     <init-param>
       <param-name>sessionFactoryBeanName</param-name>
-      <param-value>spreadsheetSessionFactory</param-value>
+      <param-value>coreSessionFactory</param-value>
     </init-param>
    </filter>
    <!-- System session filter -->
Index: lams_tool_survey/db/sql/tool_insert.sql
===================================================================
diff -u -r7b79396263b36a933d66390fb9ab12821956d59d -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_survey/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 7b79396263b36a933d66390fb9ab12821956d59d)
+++ lams_tool_survey/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -27,8 +27,6 @@
 moderation_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 supports_outputs
@@ -58,8 +56,6 @@
 'tool/lasurv11/moderate.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lasurv11',
 'org.lamsfoundation.lams.tool.survey.ApplicationResources',
-'lams-tool-lasurv11.jar',
-'/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml',
 NOW(),
 NOW(),
 1
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml
===================================================================
diff -u -r7b79396263b36a933d66390fb9ab12821956d59d -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	(.../surveyApplicationContext.xml)	(revision 7b79396263b36a933d66390fb9ab12821956d59d)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	(.../surveyApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -7,65 +7,46 @@
 	<bean id="lasurvMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 		<property name="basename"><value>org.lamsfoundation.lams.tool.survey.ApplicationResources</value></property>
 	</bean>
-	<bean id="lasurvMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="lasurvMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource"><ref local="lasurvMessageSource"/></property>										
 	</bean>
-    <!-- Hibernate SessionFactory -->
-    <bean id="lasurvSurveySessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
 
-        <!-- Must references all OR mapping files. -->
-        <property name="mappingResources">
-            <list>
-          	   <value>org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/survey/model/SurveyAttachment.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml</value>
-            </list>
-        </property>
-    </bean>
     <!-- OutputFactory -->
-	<bean id="surveyOutputFactory" class="org.lamsfoundation.lams.tool.survey.service.SurveyOutputFactory" singleton="true">  
+	<bean id="surveyOutputFactory" class="org.lamsfoundation.lams.tool.survey.service.SurveyOutputFactory" >  
     	<property name="toolMessageService"><ref bean="lasurvMessageService"/></property>  
 	</bean> 
     <!-- core beans -->
     <bean id="lasurvSurveyDao" class="org.lamsfoundation.lams.tool.survey.dao.hibernate.SurveyDAOHibernate">
         <property name="sessionFactory">
-            <ref local="lasurvSurveySessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     <bean id="lasurvSurveyQuestionDao" class="org.lamsfoundation.lams.tool.survey.dao.hibernate.SurveyQuestionDAOHibernate">
         <property name="sessionFactory">
-            <ref local="lasurvSurveySessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     <bean id="lasurvSurveyAnswerDao" class="org.lamsfoundation.lams.tool.survey.dao.hibernate.SurveyAnswerDAOHibernate">
         <property name="sessionFactory">
-            <ref local="lasurvSurveySessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="lasurvSurveyAttachmentDao" class="org.lamsfoundation.lams.tool.survey.dao.hibernate.SurveyAttachmentDAOHibernate">
         <property name="sessionFactory">
-            <ref local="lasurvSurveySessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="lasurvSurveyUserDao" class="org.lamsfoundation.lams.tool.survey.dao.hibernate.SurveyUserDAOHibernate">
         <property name="sessionFactory">
-            <ref local="lasurvSurveySessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="lasurvSurveySessionDao" class="org.lamsfoundation.lams.tool.survey.dao.hibernate.SurveySessionDAOHibernate">
         <property name="sessionFactory">
-            <ref local="lasurvSurveySessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
Index: lams_tool_survey/web/WEB-INF/web.xml
===================================================================
diff -u -r0732f5d12802da95cf69e474b30630653924abc5 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_survey/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
+++ lams_tool_survey/web/WEB-INF/web.xml	(.../web.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -9,18 +9,18 @@
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
 	<param-value>org.lamsfoundation.lams.tool.survey.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/survey/surveyApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/tool/survey/dbupdates/autopatchContext.xml
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/survey/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
 <listener>
 	<listener-class>
@@ -40,7 +40,7 @@
     </filter-class>
     <init-param>
       <param-name>sessionFactoryBeanName</param-name>
-      <param-value>lasurvSurveySessionFactory</param-value>
+      <param-value>coreSessionFactory</param-value>
     </init-param>
    </filter>
    <!-- System session filter -->
Index: lams_tool_task/db/sql/tool_insert.sql
===================================================================
diff -u -r3636757b4afafb785ae0c6c8295a969c605f8e28 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_task/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 3636757b4afafb785ae0c6c8295a969c605f8e28)
+++ lams_tool_task/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -28,8 +28,6 @@
 pedagogical_planner_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 supports_outputs
@@ -60,8 +58,6 @@
 'tool/latask10/authoring/initPedagogicalPlannerForm.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/latask10',
 'org.lamsfoundation.lams.tool.taskList.ApplicationResources',
-'lams-tool-latask10.jar',
-'/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml',
 NOW(),
 NOW(),
 1
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml
===================================================================
diff -u -r12a0e5152335f664f19ad5b1449633f7fec6b8a9 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml	(.../taskListApplicationContext.xml)	(revision 12a0e5152335f664f19ad5b1449633f7fec6b8a9)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml	(.../taskListApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -7,30 +7,10 @@
 	<bean id="lataskMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 		<property name="basename"><value>org.lamsfoundation.lams.tool.taskList.ApplicationResources</value></property>
 	</bean>
-	<bean id="lataskMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="lataskMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource"><ref local="lataskMessageSource"/></property>										
 	</bean>
-    <!-- Hibernate SessionFactory -->
-    <bean id="lataskTaskListSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
 
-        <!-- Must references all OR mapping files. -->
-        <property name="mappingResources">
-            <list>
-               <value>org/lamsfoundation/lams/tool/taskList/model/TaskListUser.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/taskList/model/TaskList.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/taskList/model/TaskListItemVisitLog.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/taskList/model/TaskListItemComment.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/taskList/model/TaskListAttachment.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/taskList/model/TaskListSession.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml</value>
-            </list>
-        </property>
-    </bean>
-
 	<!-- OutputFactory -->
 	<bean id="taskListOutputFactory" class="org.lamsfoundation.lams.tool.taskList.service.TaskListOutputFactory">  
     	<property name="toolMessageService"><ref bean="lataskMessageService"/></property>  
@@ -39,41 +19,41 @@
     <!-- core beans -->
     <bean id="lataskTaskListDao" class="org.lamsfoundation.lams.tool.taskList.dao.hibernate.TaskListDAOHibernate">
         <property name="sessionFactory">
-            <ref local="lataskTaskListSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     <bean id="lataskTaskListItemDao" class="org.lamsfoundation.lams.tool.taskList.dao.hibernate.TaskListItemDAOHibernate">
         <property name="sessionFactory">
-            <ref local="lataskTaskListSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     <bean id="lataskTaskListItemVisitDao" class="org.lamsfoundation.lams.tool.taskList.dao.hibernate.TaskListItemVisitDAOHibernate">
         <property name="sessionFactory">
-            <ref local="lataskTaskListSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="lataskTaskListAttachmentDao" class="org.lamsfoundation.lams.tool.taskList.dao.hibernate.TaskListAttachmentDAOHibernate">
         <property name="sessionFactory">
-            <ref local="lataskTaskListSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
     
     <bean id="lataskTaskListConditionDao" class="org.lamsfoundation.lams.tool.taskList.dao.hibernate.TaskListConditionDAOHibernate">
         <property name="sessionFactory">
-            <ref local="lataskTaskListSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="lataskTaskListUserDao" class="org.lamsfoundation.lams.tool.taskList.dao.hibernate.TaskListUserDAOHibernate">
         <property name="sessionFactory">
-            <ref local="lataskTaskListSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
    <bean id="lataskTaskListSessionDao" class="org.lamsfoundation.lams.tool.taskList.dao.hibernate.TaskListSessionDAOHibernate">
         <property name="sessionFactory">
-            <ref local="lataskTaskListSessionFactory"/>
+            <ref bean="coreSessionFactory"/>
         </property>
     </bean>
 
Index: lams_tool_task/web/WEB-INF/web.xml
===================================================================
diff -u -r0732f5d12802da95cf69e474b30630653924abc5 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_task/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
+++ lams_tool_task/web/WEB-INF/web.xml	(.../web.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -9,18 +9,18 @@
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
 	<param-value>org.lamsfoundation.lams.tool.taskList.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/taskList/taskListApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/tool/taskList/dbupdates/autopatchContext.xml
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/taskList/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
 <listener>
 	<listener-class>
@@ -40,7 +40,7 @@
     </filter-class>
     <init-param>
       <param-name>sessionFactoryBeanName</param-name>
-      <param-value>lataskTaskListSessionFactory</param-value>
+      <param-value>coreSessionFactory</param-value>
     </init-param>
    </filter>
    <!-- System session filter -->
Index: lams_tool_videorecorder/.classpath
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_videorecorder/.classpath	(.../.classpath)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/.classpath	(.../.classpath)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -11,5 +11,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_contentrepository"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/lams_monitoring"/>
 	<classpathentry kind="output" path="build/classes/java"/>
 </classpath>
Index: lams_tool_videorecorder/conf/xdoclet/filters.xml
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_videorecorder/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>videoRecorderSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: lams_tool_videorecorder/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_videorecorder/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -7,14 +7,14 @@
 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-				classpath:/org/lamsfoundation/lams/applicationContext.xml
-	            classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-            	classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml			
-				classpath:/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/autopatchContext.xml	
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
Index: lams_tool_videorecorder/db/sql/tool_insert.sql
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_videorecorder/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -25,8 +25,6 @@
 moderation_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 supports_outputs
@@ -56,8 +54,6 @@
 'tool/lavidr10/moderate.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lavidr10',
 'org.lamsfoundation.lams.tool.videoRecorder.ApplicationResources',
-'lams-tool-lavidr10.jar',
-'/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml',
 NOW(),
 NOW(),
 1
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml
===================================================================
diff -u -r01f1d853607cc14f73aa2429275084f4890f92b7 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml	(.../videoRecorderApplicationContext.xml)	(revision 01f1d853607cc14f73aa2429275084f4890f92b7)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml	(.../videoRecorderApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -10,34 +10,16 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<bean id="videoRecorderMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="videoRecorderMessageService" class="org.lamsfoundation.lams.util.MessageService">
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename"><value>org.lamsfoundation.lams.tool.videoRecorder.ApplicationResources</value></property>
 			</bean>
 		</property>										
 	</bean>
-	<!-- Hibernate SessionFactory -->
-	  <bean id="videoRecorderSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderAttachment.hbm.xml</value> 
-				<value>org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderCondition.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRating.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderComment.hbm.xml</value>  
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
-	<bean id="videoRecorderOutputFactory" class="org.lamsfoundation.lams.tool.videoRecorder.service.VideoRecorderOutputFactory" singleton="true">  
+	<bean id="videoRecorderOutputFactory" class="org.lamsfoundation.lams.tool.videoRecorder.service.VideoRecorderOutputFactory">  
     	<property name="toolMessageService"><ref bean="videoRecorderMessageService"/></property>  
 	</bean> 
 	<bean id="videoRecorderService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -87,31 +69,31 @@
 	
 	<!--  DAO classes -->
 	<bean id="videoRecorderDAO" class="org.lamsfoundation.lams.tool.videoRecorder.dao.hibernate.VideoRecorderDAO">
-		<property name="sessionFactory"><ref local="videoRecorderSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 
 	<bean id="videoRecorderSessionDAO" class="org.lamsfoundation.lams.tool.videoRecorder.dao.hibernate.VideoRecorderSessionDAO">
-		<property name="sessionFactory"><ref local="videoRecorderSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="videoRecorderUserDAO" class="org.lamsfoundation.lams.tool.videoRecorder.dao.hibernate.VideoRecorderUserDAO">
-		<property name="sessionFactory"><ref local="videoRecorderSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 	<bean id="videoRecorderRecordingDAO" class="org.lamsfoundation.lams.tool.videoRecorder.dao.hibernate.VideoRecorderRecordingDAO">
-		<property name="sessionFactory"><ref local="videoRecorderSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="videoRecorderAttachmentDAO" class="org.lamsfoundation.lams.tool.videoRecorder.dao.hibernate.VideoRecorderAttachmentDAO">
-		<property name="sessionFactory"><ref local="videoRecorderSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 	<bean id="videoRecorderRatingDAO" class="org.lamsfoundation.lams.tool.videoRecorder.dao.hibernate.VideoRecorderRatingDAO">
-		<property name="sessionFactory"><ref local="videoRecorderSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 	<bean id="videoRecorderCommentDAO" class="org.lamsfoundation.lams.tool.videoRecorder.dao.hibernate.VideoRecorderCommentDAO">
-		<property name="sessionFactory"><ref local="videoRecorderSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="videoRecorderToolContentHandler" class="org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderToolContentHandler">
Index: lams_tool_vote/db/sql/tool_insert.sql
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_vote/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_vote/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -47,8 +47,6 @@
 pedagogical_planner_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 supports_outputs
@@ -79,8 +77,6 @@
 'tool/lavote11/pedagogicalPlanner.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lavote11',
 'org.lamsfoundation.lams.tool.vote.ApplicationResources',
-'lams-tool-lavote11.jar',
-'/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml',
 NOW(),
 NOW(),
 1
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
===================================================================
diff -u -rf9356efe2fe0d2e08e10c52543c5ea80822196c9 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	(.../voteApplicationContext.xml)	(revision f9356efe2fe0d2e08e10c52543c5ea80822196c9)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	(.../voteApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -14,53 +14,38 @@
 	<bean id="lavoteMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 		<property name="basename"><value>org.lamsfoundation.lams.tool.vote.ApplicationResources</value></property>
 	</bean>
-	<bean id="lavoteMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="lavoteMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource"><ref local="lavoteMessageSource"/></property>										
 	</bean>
 	
-	<!-- Hibernate SessionFactory -->
-	<bean id="voteSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-  			  	<value>/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml</value> 
-				<value>/org/lamsfoundation/lams/tool/vote/VoteQueContent.hbm.xml</value>
-			  	<value>/org/lamsfoundation/lams/tool/vote/VoteSession.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/vote/VoteQueUsr.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/vote/VoteUsrAttempt.hbm.xml</value>
-				<value>/org/lamsfoundation/lams/tool/vote/VoteUploadedFile.hbm.xml</value>				
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 
 	<!-- tool beans -->
 
 
 	<bean id="voteContentDAO" class="org.lamsfoundation.lams.tool.vote.dao.hibernate.VoteContentDAO">
-		<property name="sessionFactory"><ref local="voteSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 
 	<bean id="voteSessionDAO" class="org.lamsfoundation.lams.tool.vote.dao.hibernate.VoteSessionDAO">
-		<property name="sessionFactory"><ref local="voteSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 	<bean id="voteUserDAO" class="org.lamsfoundation.lams.tool.vote.dao.hibernate.VoteUserDAO">
-		<property name="sessionFactory"><ref local="voteSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="voteQueContentDAO" class="org.lamsfoundation.lams.tool.vote.dao.hibernate.VoteQueContentDAO">
-		<property name="sessionFactory"><ref local="voteSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="voteUsrAttemptDAO" class="org.lamsfoundation.lams.tool.vote.dao.hibernate.VoteUsrAttemptDAO">
-		<property name="sessionFactory"><ref local="voteSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 	<bean id="voteUploadedFileDAO" class="org.lamsfoundation.lams.tool.vote.dao.hibernate.VoteUploadedFileDAO">
-		<property name="sessionFactory"><ref local="voteSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="voteToolContentHandler" class="org.lamsfoundation.lams.tool.vote.util.VoteToolContentHandler">
Index: lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/testmcApplicationContext.xml
===================================================================
diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/testmcApplicationContext.xml	(.../testmcApplicationContext.xml)	(revision 402985c35e80fbce6960c7d7598b0262292398eb)
+++ lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/testmcApplicationContext.xml	(.../testmcApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -35,33 +35,33 @@
 
 
 	<bean id="voteContentDAO" class="org.lamsfoundation.lams.tool.vote.dao.hibernate.VoteContentDAO">
-		<property name="sessionFactory"><ref local="voteSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 
 	<bean id="voteSessionDAO" class="org.lamsfoundation.lams.tool.vote.dao.hibernate.VoteSessionDAO">
-		<property name="sessionFactory"><ref local="voteSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 	<bean id="voteUserDAO" class="org.lamsfoundation.lams.tool.vote.dao.hibernate.VoteUserDAO">
-		<property name="sessionFactory"><ref local="voteSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="voteQueContentDAO" class="org.lamsfoundation.lams.tool.vote.dao.hibernate.VoteQueContentDAO">
-		<property name="sessionFactory"><ref local="voteSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="voteOptionsContentDAO" class="org.lamsfoundation.lams.tool.vote.dao.hibernate.VoteOptionsContentDAO">
-		<property name="sessionFactory"><ref local="voteSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	
 	<bean id="voteUsrAttemptDAO" class="org.lamsfoundation.lams.tool.vote.dao.hibernate.VoteUsrAttemptDAO">
-		<property name="sessionFactory"><ref local="voteSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 
 
 	<bean id="voteUploadedFileDAO" class="org.lamsfoundation.lams.tool.vote.dao.hibernate.VoteUploadedFileDAO">
-		<property name="sessionFactory"><ref local="voteSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="voteToolContentHandler" class="org.lamsfoundation.lams.tool.vote.util.VoteToolContentHandler">
Index: lams_tool_vote/web/WEB-INF/web.xml
===================================================================
diff -u -r0732f5d12802da95cf69e474b30630653924abc5 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
+++ lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -26,18 +26,18 @@
   	<param-value>org.lamsfoundation.lams.tool.vote.ApplicationResources</param-value>
 	</context-param>
 	
-	<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/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml
-			</param-value>
-	</context-param>
+<context-param> 
+	<param-name>contextConfigLocation</param-name>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml</param-value>
+</context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
     <filter>
 	    <filter-name>SystemSessionFilter</filter-name>
@@ -53,7 +53,7 @@
 	    </filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
-		    <param-value>voteSessionFactory</param-value>
+		    <param-value>coreSessionFactory</param-value>
 		</init-param>
    </filter>
 
Index: lams_tool_wiki/conf/xdoclet/filters.xml
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_wiki/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -12,7 +12,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>wikiSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
    
Index: lams_tool_wiki/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_wiki/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -7,14 +7,14 @@
 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-				classpath:/org/lamsfoundation/lams/applicationContext.xml
-	            classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-            	classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml			
-				classpath:/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.xml	
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
Index: lams_tool_wiki/db/sql/tool_insert.sql
===================================================================
diff -u -r8d32e52903d230f8018ac609041934db7f180e73 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_wiki/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 8d32e52903d230f8018ac609041934db7f180e73)
+++ lams_tool_wiki/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -26,8 +26,6 @@
 pedagogical_planner_url,
 help_url,
 language_file,
-classpath_addition,
-context_file,
 create_date_time,
 modified_date_time,
 supports_outputs
@@ -58,8 +56,6 @@
 'tool/lawiki10/pedagogicalPlanner.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lawiki10',
 'org.lamsfoundation.lams.tool.wiki.ApplicationResources',
-'lams-tool-lawiki10.jar',
-'/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml',
 NOW(),
 NOW(),
 1
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml
===================================================================
diff -u -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	(.../wikiApplicationContext.xml)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	(.../wikiApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -10,21 +10,6 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<!-- Hibernate SessionFactory -->
-	  <bean id="wikiSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="toolDataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<value>org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/wiki/model/WikiPage.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/wiki/model/WikiPageContent.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/wiki/model/WikiSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/wiki/model/WikiUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/wiki/model/WikiAttachment.hbm.xml</value> 
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="wikiService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -74,34 +59,34 @@
 	
 	<!--  DAO classes -->
 	<bean id="wikiDAO" class="org.lamsfoundation.lams.tool.wiki.dao.hibernate.WikiDAO">
-		<property name="sessionFactory"><ref local="wikiSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>  
 	
 	<bean id="wikiPageDAO" class="org.lamsfoundation.lams.tool.wiki.dao.hibernate.WikiPageDAO">
-		<property name="sessionFactory"><ref local="wikiSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean> 
 	
 	<bean id="wikiPageContentDAO" class="org.lamsfoundation.lams.tool.wiki.dao.hibernate.WikiPageContentDAO">
-		<property name="sessionFactory"><ref local="wikiSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean> 
 
 	<bean id="wikiSessionDAO" class="org.lamsfoundation.lams.tool.wiki.dao.hibernate.WikiSessionDAO">
-		<property name="sessionFactory"><ref local="wikiSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="wikiUserDAO" class="org.lamsfoundation.lams.tool.wiki.dao.hibernate.WikiUserDAO">
-		<property name="sessionFactory"><ref local="wikiSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="wikiAttachmentDAO" class="org.lamsfoundation.lams.tool.wiki.dao.hibernate.WikiAttachmentDAO">
-		<property name="sessionFactory"><ref local="wikiSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
  	<bean id="wikiToolContentHandler" class="org.lamsfoundation.lams.tool.wiki.util.WikiToolContentHandler">
  		<property name="repositoryService"><ref bean="repositoryService"/></property>
 	</bean>  
 	
-	<bean id="wikiMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="wikiMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename"><value>org.lamsfoundation.lams.tool.wiki.ApplicationResources</value></property>
Index: lams_tool_wiki/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -ra765c868e65385168275af7a88c5391097ecdf35 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_wiki/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision a765c868e65385168275af7a88c5391097ecdf35)
+++ lams_tool_wiki/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -22,6 +22,10 @@
       type="org.lamsfoundation.lams.tool.wiki.web.forms.LearningForm"
     />
     <form-bean
+      name="pedagogicalPlannerForm"
+      type="org.lamsfoundation.lams.tool.wiki.web.forms.WikiPedagogicalPlannerForm"
+    />
+    <form-bean
       name="authoringForm"
       type="org.lamsfoundation.lams.tool.wiki.web.forms.AuthoringForm"
     />
@@ -148,6 +152,21 @@
         redirect="false"
       />
     </action>
+    <action
+      path="/pedagogicalPlanner"
+      type="org.lamsfoundation.lams.tool.wiki.web.actions.PedagogicalPlannerAction"
+      name="pedagogicalPlannerForm"
+      scope="request"
+      parameter="dispatch"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="success"
+        path="/pages/authoring/pedagogicalPlannerForm.jsp"
+        redirect="false"
+      />
+    </action>
 
     <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
   </action-mappings>
Index: lams_tool_wiki/web/WEB-INF/web.xml
===================================================================
diff -u -r0732f5d12802da95cf69e474b30630653924abc5 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_tool_wiki/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
+++ lams_tool_wiki/web/WEB-INF/web.xml	(.../web.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -10,16 +10,16 @@
 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-				classpath:/org/lamsfoundation/lams/applicationContext.xml
-	            classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-            	classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml			
-				classpath:/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.xml	
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.tool</param-value>
+</context-param>
 
     <filter>
     <filter-name>SystemSessionFilter</filter-name>
@@ -34,7 +34,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>wikiSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
 	<filter>