Index: lams_admin/conf/xdoclet/web-settings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/web-settings.xml,v
diff -u -r1.11 -r1.11.4.1
--- lams_admin/conf/xdoclet/web-settings.xml	2 Dec 2008 23:54:24 -0000	1.11
+++ lams_admin/conf/xdoclet/web-settings.xml	17 Mar 2009 20:57:14 -0000	1.11.4.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml,v
diff -u -r1.3 -r1.3.6.1
--- lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml	7 Feb 2007 00:20:04 -0000	1.3
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml	17 Mar 2009 20:57:14 -0000	1.3.6.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.76 -r1.76.2.1
--- lams_build/build.xml	28 Feb 2009 13:46:21 -0000	1.76
+++ lams_build/build.xml	17 Mar 2009 20:56:42 -0000	1.76.2.1
@@ -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" />
@@ -496,6 +495,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
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/j2ee/lams.application.xml,v
diff -u -r1.9 -r1.9.2.1
--- lams_build/conf/j2ee/lams.application.xml	28 Feb 2009 13:46:20 -0000	1.9
+++ lams_build/conf/j2ee/lams.application.xml	17 Mar 2009 20:56:41 -0000	1.9.2.1
@@ -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>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_build/conf/unix/jboss/ejb-deployer.slim.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_build/conf/unix/jboss/jboss-service.slim.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_build/conf/unix/jboss/standardjboss.slim.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_build/conf/windows/jboss/ejb-deployer.slim.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_build/conf/windows/jboss/jboss-service.slim.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_build/conf/windows/jboss/standardjboss.slim.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/deploy-tool/lib/lams-tool-deploy.jar,v
diff -u -r1.23 -r1.23.4.1
Binary files differ
Index: lams_central/conf/xdoclet/web-settings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/web-settings.xml,v
diff -u -r1.18 -r1.18.2.1
--- lams_central/conf/xdoclet/web-settings.xml	17 Mar 2009 01:07:30 -0000	1.18
+++ lams_central/conf/xdoclet/web-settings.xml	17 Mar 2009 20:57:50 -0000	1.18.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml,v
diff -u -r1.19 -r1.19.2.1
--- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	19 Feb 2009 14:01:31 -0000	1.19
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	17 Mar 2009 20:57:50 -0000	1.19.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml,v
diff -u -r1.2 -r1.2.12.1
--- lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml	7 Sep 2006 05:55:42 -0000	1.2
+++ lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml	17 Mar 2009 20:57:50 -0000	1.2.12.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml,v
diff -u -r1.8 -r1.8.2.1
--- lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	16 Mar 2009 05:56:01 -0000	1.8
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	17 Mar 2009 20:57:50 -0000	1.8.2.1
@@ -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">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/WEB-INF/applicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_tables.sql,v
diff -u -r1.133 -r1.133.2.1
--- lams_common/db/sql/create_lams_11_tables.sql	17 Mar 2009 01:08:25 -0000	1.133
+++ lams_common/db/sql/create_lams_11_tables.sql	17 Mar 2009 20:57:44 -0000	1.133.2.1
@@ -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
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml,v
diff -u -r1.73 -r1.73.2.1
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	17 Mar 2009 01:08:26 -0000	1.73
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	17 Mar 2009 20:57:45 -0000	1.73.2.1
@@ -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>
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml,v
diff -u -r1.6 -r1.6.2.1
--- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	6 Jan 2009 03:00:15 -0000	1.6
+++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	17 Mar 2009 20:57:44 -0000	1.6.2.1
@@ -24,7 +24,7 @@
 	
 	
 	<bean id="toolContentIDGeneratorTarget" class="org.lamsfoundation.lams.tool.ToolContentIDGenerator"
-		singleton="true"
+		
 	>
 		<property name="toolContentDao"><ref local="toolContentDAO"/></property>
 	</bean>	
Index: lams_contentrepository/conf/xdoclet/web-settings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/xdoclet/web-settings.xml,v
diff -u -r1.1 -r1.1.6.1
--- lams_contentrepository/conf/xdoclet/web-settings.xml	24 Feb 2006 11:43:17 -0000	1.1
+++ lams_contentrepository/conf/xdoclet/web-settings.xml	17 Mar 2009 20:57:08 -0000	1.1.6.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml,v
diff -u -r1.10 -r1.10.6.1
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	28 May 2006 23:54:58 -0000	1.10
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	17 Mar 2009 20:57:07 -0000	1.10.6.1
@@ -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 -->
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_contentrepository/web/WEB-INF/applicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/conf/xdoclet/web-settings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/web-settings.xml,v
diff -u -r1.20 -r1.20.4.1
--- lams_learning/conf/xdoclet/web-settings.xml	22 Sep 2008 05:29:23 -0000	1.20
+++ lams_learning/conf/xdoclet/web-settings.xml	17 Mar 2009 20:57:23 -0000	1.20.4.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml,v
diff -u -r1.23 -r1.23.4.1
--- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	11 Sep 2008 02:23:10 -0000	1.23
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	17 Mar 2009 20:57:23 -0000	1.23.4.1
@@ -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>
 	
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/applicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.42 -r1.42.2.1
--- lams_learning/web/WEB-INF/struts/struts-config.xml	2 Mar 2009 02:34:50 -0000	1.42
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	17 Mar 2009 20:57:23 -0000	1.42.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/xdoclet/web-settings.xml,v
diff -u -r1.15 -r1.15.4.1
--- lams_monitoring/conf/xdoclet/web-settings.xml	3 Jan 2008 04:35:56 -0000	1.15
+++ lams_monitoring/conf/xdoclet/web-settings.xml	17 Mar 2009 20:57:33 -0000	1.15.4.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml,v
diff -u -r1.29 -r1.29.4.1
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	6 Nov 2008 00:49:31 -0000	1.29
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	17 Mar 2009 20:57:33 -0000	1.29.4.1
@@ -8,18 +8,18 @@
 	- 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 ======================== -->
 
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/applicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_monitoring/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.23 -r1.23.2.1
--- lams_monitoring/web/WEB-INF/struts/struts-config.xml	12 Mar 2009 01:06:49 -0000	1.23
+++ lams_monitoring/web/WEB-INF/struts/struts-config.xml	17 Mar 2009 20:57:33 -0000	1.23.2.1
@@ -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. -->