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.4 -r1.4.8.1
--- lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml	26 Mar 2009 10:00:26 -0000	1.4
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml	16 Aug 2014 11:20:36 -0000	1.4.8.1
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+           				   
 	<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" >
-		<property name="messageSource"><ref local="adminMessageSource"/></property>										
+		<property name="messageSource"><ref bean="adminMessageSource"/></property>										
 	</bean>
 	
 	<bean id="importService" class="org.lamsfoundation.lams.admin.service.ImportService">
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.23 -r1.23.2.1
--- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	24 Jun 2014 09:47:20 -0000	1.23
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	16 Aug 2014 11:20:49 -0000	1.23.2.1
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+
 	<!-- This bean is responsible for applying the interceptor to our classes.-->
 	<!-- The proxyTargetClass must be set to true to enforce usage of cglib,-->
 	<!-- rather than dynamic proxies. Dynamic proxies won't work with the valuestack -->
@@ -21,7 +24,7 @@
     	
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
 	
-	<bean id="ObjectExtractor" class="org.lamsfoundation.lams.authoring.ObjectExtractor" singleton="false">
+	<bean id="ObjectExtractor" class="org.lamsfoundation.lams.authoring.ObjectExtractor" scope="prototype">
 		<property name="learningDesignDAO"><ref bean="learningDesignDAO"/></property>
 		<property name="learningLibraryDAO"><ref bean="learningLibraryDAO"/></property>
 		<property name="baseDAO"><ref bean="baseDAO"/></property>
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.3 -r1.3.10.1
--- lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml	26 Mar 2009 10:00:34 -0000	1.3
+++ lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml	16 Aug 2014 11:20:50 -0000	1.3.10.1
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-    "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<beans>
-
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<bean id="centralToolContentHandler" class="org.lamsfoundation.lams.util.CentralToolContentHandler">
 	 		<property name="repositoryService"><ref bean="repositoryService"/></property>
 	</bean> 
@@ -12,7 +12,7 @@
 		<property name="basename"><value>org.lamsfoundation.lams.central.ApplicationResources</value></property>
 	</bean>
 	<bean id="centralMessageService" class="org.lamsfoundation.lams.util.MessageService" >
-		<property name="messageSource"><ref local="centralMessageSource"/></property>										
+		<property name="messageSource"><ref bean="centralMessageSource"/></property>										
 	</bean>
 	
 </beans>
\ No newline at end of file
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.10 -r1.10.4.1
--- lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	1 Jul 2009 02:46:37 -0000	1.10
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	16 Aug 2014 11:20:50 -0000	1.10.4.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 	<bean id="workspaceMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
Index: lams_central/web/WEB-INF/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/applicationContext.xml,v
diff -u -r1.3 -r1.3.10.1
--- lams_central/web/WEB-INF/applicationContext.xml	27 Mar 2009 18:29:49 -0000	1.3
+++ lams_central/web/WEB-INF/applicationContext.xml	16 Aug 2014 11:20:50 -0000	1.3.10.1
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 <beans>
 <!-- 
 	Even though this bean list is empty, this file MUST not be deleted,
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml,v
diff -u -r1.9.2.1 -r1.9.2.2
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	6 Aug 2014 15:16:12 -0000	1.9.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	16 Aug 2014 11:20:43 -0000	1.9.2.2
@@ -1,12 +1,10 @@
 <?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. Used to deploy to JBOSS.
--->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
-<beans>
-
  	<!-- Hibernate Properties. Should be used by all Hibernate session factories unless -->
   	<!--  the tool has a specific need for a different setting. 						-->			
   	<!-- If you change hibernate.treecache.objectName, you will also need to change the -->
Index: lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml,v
diff -u -r1.10.2.1 -r1.10.2.2
--- lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml	12 Aug 2014 19:19:08 -0000	1.10.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml	16 Aug 2014 11:20:44 -0000	1.10.2.2
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- This file contains bean definitions that are application contexts. Currently there is single beanRefContext.xml file,
 		 but there can be several of them in classpath. If so, they will be collected by locatorFactorySelector
 		 and put together, creating one definition of beans.
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.100 -r1.100.2.1
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	8 Jul 2014 08:39:52 -0000	1.100
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	16 Aug 2014 11:20:44 -0000	1.100.2.1
@@ -1,10 +1,9 @@
 <?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. Used to deploy to JBOSS.
--->
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
@@ -30,7 +29,7 @@
 
 	<!-- LAMS primary business object: Hibernate implementation -->
 	<bean id="userManagementServiceTarget" class="org.lamsfoundation.lams.usermanagement.service.UserManagementService"
-		singleton="false"
+		  scope="prototype"
 	>
 		<property name="baseDAO"><ref bean="baseDAO"/></property>
 		<property name="groupDAO"><ref bean="groupDAO"/></property>
@@ -43,7 +42,7 @@
 	<!-- Transactional proxy for the user management primary business object -->
 	<bean id="userManagementService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref local="userManagementServiceTarget"/></property>
+		<property name="target"><ref bean="userManagementServiceTarget"/></property>
 		<property name="proxyTargetClass"><value>true</value></property> 
 		<property name="transactionAttributes">
 			<props>
@@ -72,7 +71,7 @@
 	
 	<bean id="learningDesignService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref local="learningDesignServiceTarget"/></property>
+		<property name="target"><ref bean="learningDesignServiceTarget"/></property>
 		<property name="proxyTargetClass"><value>true</value></property> 
 		<property name="transactionAttributes">
 			<props>
@@ -83,8 +82,8 @@
 	</bean>
 	
 	<bean id="themeServiceTarget" class="org.lamsfoundation.lams.themes.service.ThemeService">
-		<property name="themeDAO"><ref local="themeDAO"/></property>
-		<property name="userManagementService"><ref local="userManagementService"/></property>
+		<property name="themeDAO"><ref bean="themeDAO"/></property>
+		<property name="userManagementService"><ref bean="userManagementService"/></property>
 		<property name="messageService"><ref bean="commonMessageService"/></property>
 	</bean>
 	
@@ -102,7 +101,7 @@
 	</bean>
 	
 	<bean id="timezoneServiceTarget" class="org.lamsfoundation.lams.timezone.service.TimezoneService">
-		<property name="timezoneDAO"><ref local="timezoneDAO"/></property>
+		<property name="timezoneDAO"><ref bean="timezoneDAO"/></property>
 	</bean>
 	
 	<bean id="timezoneService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -125,7 +124,7 @@
 
 	<bean id="signupService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager" /></property>
-		<property name="target"><ref local="signupServiceTarget" /></property>
+		<property name="target"><ref bean="signupServiceTarget" /></property>
 		<property name="proxyTargetClass"><value>true</value></property>
 		<property name="transactionAttributes">
 			<props>
@@ -168,7 +167,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" scope="prototype">
 		<property name="learningDesignService"><ref bean="learningDesignService"/></property>
 		<property name="messageService"><ref bean="commonMessageService"/></property>
 		<property name="baseDAO"><ref bean="baseDAO"/></property>
@@ -188,13 +187,13 @@
     </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" scope="prototype">
 	</bean>
 			
 	<!--  Core Notebook Service -->
 	<bean id="coreNotebookServiceTarget" class="org.lamsfoundation.lams.notebook.service.CoreNotebookService">
 		<property name="messageService"><ref bean="commonMessageService"/></property>
-		<property name="userManagementService"><ref local="userManagementService"/></property>
+		<property name="userManagementService"><ref bean="userManagementService"/></property>
 		<property name="notebookEntryDAO"><ref bean="notebookEntryDAO" /></property>
 		<property name="baseDAO"><ref bean="baseDAO" /></property>
 	</bean>
@@ -272,8 +271,8 @@
 		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
 		<property name ="target">
 			<bean class="org.lamsfoundation.lams.logevent.service.LogEventService">
-				<property name="logEventDAO"><ref local="logEventDAO"/></property>
-				<property name="userManagementService"><ref local="userManagementService"/></property>
+				<property name="logEventDAO"><ref bean="logEventDAO"/></property>
+				<property name="userManagementService"><ref bean="userManagementService"/></property>
 			</bean>	
 		</property>
 		<property name="proxyTargetClass"><value>true</value></property> 
@@ -301,58 +300,58 @@
 	<!-- Learning Design related beans-->
 	
 	<bean id="activityDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<bean id="branchActivityEntryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.BranchActivityEntryDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<bean id="learningLibraryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<bean id="learningDesignDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>	
 	<bean id="transitionDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>	
 	<bean id="groupingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>	
 	<bean id="groupDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<bean id="groupUserDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupUserDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<bean id="licenseDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LicenseDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>	
 	
 	<!--User management related beans -->
 	
 	<bean id="baseDAO" class="org.lamsfoundation.lams.dao.hibernate.BaseDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<!--  Theme beans -->
 	<bean id="themeDAO" class="org.lamsfoundation.lams.themes.dao.hibernate.CSSThemeDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="roleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.RoleDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="organisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="userOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<!--  Timezone service related beans -->
 	<bean id="timezoneDAO" class="org.lamsfoundation.lams.timezone.dao.hibernate.TimezoneDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>	
 	
 	<!--  Signup service related beans -->
@@ -362,76 +361,76 @@
 	
 	<!--Event service related beans -->
 	<bean id="eventDAO" class="org.lamsfoundation.lams.events.dao.hibernate.EventDAOHibernate">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<!--  LogEvent service related beans -->
 	<bean id="logEventDAO" class="org.lamsfoundation.lams.logevent.dao.hibernate.LogEventDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>		
 	
 	<!-- Core Notebook related beans -->
 	<bean id="notebookEntryDAO" class="org.lamsfoundation.lams.notebook.dao.hibernate.NotebookEntryDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>	
 	
 	<!-- Presence Chat related beans -->
 	<bean id="presenceChatDAO" class="org.lamsfoundation.lams.presence.dao.hibernate.PresenceChatDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>	
 	
 	<!--  Configuration related beans -->
 	<bean id="configurationDAO" class="org.lamsfoundation.lams.config.dao.hibernate.ConfigurationDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<bean id="registrationDAO" class="org.lamsfoundation.lams.config.dao.hibernate.RegistrationDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<!--  Competence related beans -->
 	<bean id="competenceDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.CompetenceDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<bean id="competenceMappingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.CompetenceMappingDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<!--  Pedagogical Planner related beans -->
 	<bean id="pedagogicalPlannerDAO" class="org.lamsfoundation.lams.planner.dao.hibernate.PedagogicalPlannerDAOHibernate">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<!--  Gradebook related beans -->
 	<bean id="gradebookDAO" class="org.lamsfoundation.lams.gradebook.dao.hibernate.GradebookDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<!--  Data flow related beans -->
 	<bean id="dataFlowDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.DataFlowDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<!--  System Session bean -->
 	<bean id="SystemSession"
 	    class="org.lamsfoundation.lams.web.session.SessionManager"
 	    init-method="init"
 	    destroy-method="destroy"
-		singleton="true">
+		>
 		<property name="monitorPeriod"><value>60</value></property>
 	</bean>
 	
 	<!-- Cache Manager bean. cacheObjectName should be the same value as hibernate.treecache.objectName -->
 	<bean id="cacheManager" class="org.lamsfoundation.lams.cache.CacheManager">
 		<property name="cacheObjectName"><value>jboss.cache:service=TreeCache</value></property>
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="statisticsService" class="org.lamsfoundation.lams.statistics.service.StatisticsService">
    		<property name="baseDAO">
    			<ref bean="baseDAO"/>
    		</property>	
    		<property name="userService">
-   			<ref local="userManagementService"/>
+   			<ref bean="userManagementService"/>
    		</property>
     </bean>
 	
Index: lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml,v
diff -u -r1.1 -r1.1.24.1
--- lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml	15 Sep 2006 01:04:18 -0000	1.1
+++ lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml	16 Aug 2014 11:20:44 -0000	1.1.24.1
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+           				   
 	<bean id="integrationServiceTarget" class="org.lamsfoundation.lams.integration.service.IntegrationService">
 		<property name="service"><ref bean="userManagementService"/></property>
 	</bean>
Index: lams_common/src/java/org/lamsfoundation/lams/localApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/Attic/localApplicationContext.xml,v
diff -u -r1.3 -r1.3.24.1
--- lams_common/src/java/org/lamsfoundation/lams/localApplicationContext.xml	21 Dec 2005 05:27:08 -0000	1.3
+++ lams_common/src/java/org/lamsfoundation/lams/localApplicationContext.xml	16 Aug 2014 11:20:44 -0000	1.3.24.1
@@ -1,14 +1,15 @@
 <?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. Do not use in production.
- - This uses a local datasource and Hibernate transaction manager and
- - is designed for junit testing.
--->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+	<!--
+	 - Application context definition for LAMS. Do not use in production.
+	 - This uses a local datasource and Hibernate transaction manager and
+	 - is designed for junit testing.
+	-->
 
-<beans>
-
  	<!-- Hibernate Properties. Should be used by all Hibernate session factories unless -->
   	<!--  the tool has a specific need for a different setting. 						-->			
   	<!-- If you change hibernate.treecache.objectName, you will also need to change the -->
Index: lams_common/src/java/org/lamsfoundation/lams/localCommonContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/Attic/localCommonContext.xml,v
diff -u -r1.6 -r1.6.2.1
--- lams_common/src/java/org/lamsfoundation/lams/localCommonContext.xml	30 Oct 2012 17:46:44 -0000	1.6
+++ lams_common/src/java/org/lamsfoundation/lams/localCommonContext.xml	16 Aug 2014 11:20:44 -0000	1.6.2.1
@@ -1,10 +1,9 @@
 <?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. Used to deploy to JBOSS.
--->
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   	<bean id="hibernateProperties" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
 	  	<property name="properties">
@@ -148,7 +147,7 @@
 
 	<!-- LAMS primary business object: Hibernate implementation -->
 	<bean id="userManagementServiceTarget" class="org.lamsfoundation.lams.usermanagement.service.UserManagementService"
-		singleton="false"
+		scope="prototype"
 	>
 		<property name="baseDAO"><ref bean="baseDAO"/></property>
 		<property name="groupDAO"><ref bean="groupDAO"/></property>
@@ -161,7 +160,7 @@
 	<!-- Transactional proxy for the user management primary business object -->
 	<bean id="userManagementService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref local="userManagementServiceTarget"/></property>
+		<property name="target"><ref bean="userManagementServiceTarget"/></property>
 		<property name="proxyTargetClass"><value>true</value></property> 
 		<property name="transactionAttributes">
 			<props>
@@ -190,7 +189,7 @@
 	
 	<bean id="learningDesignService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref local="learningDesignServiceTarget"/></property>
+		<property name="target"><ref bean="learningDesignServiceTarget"/></property>
 		<property name="proxyTargetClass"><value>true</value></property> 
 		<property name="transactionAttributes">
 			<props>
@@ -201,8 +200,8 @@
 	</bean>
 	
 	<bean id="themeServiceTarget" class="org.lamsfoundation.lams.themes.service.ThemeService">
-		<property name="themeDAO"><ref local="themeDAO"/></property>
-		<property name="userManagementService"><ref local="userManagementService"/></property>
+		<property name="themeDAO"><ref bean="themeDAO"/></property>
+		<property name="userManagementService"><ref bean="userManagementService"/></property>
 		<property name="messageService"><ref bean="commonMessageService"/></property>
 	</bean>
 	
@@ -253,7 +252,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" scope="prototype">
 		<property name="learningDesignService"><ref bean="learningDesignService"/></property>
 		<property name="messageService"><ref bean="commonMessageService"/></property>
 		<property name="baseDAO"><ref bean="baseDAO"/></property>
@@ -273,13 +272,13 @@
     </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" scope="prototype">
 	</bean>
 			
 	<!--  Core Notebook Service -->
 	<bean id="coreNotebookServiceTarget" class="org.lamsfoundation.lams.notebook.service.CoreNotebookService">
 		<property name="messageService"><ref bean="commonMessageService"/></property>
-		<property name="userManagementService"><ref local="userManagementService"/></property>
+		<property name="userManagementService"><ref bean="userManagementService"/></property>
 		<property name="notebookEntryDAO"><ref bean="notebookEntryDAO" /></property>
 	</bean>
 	
@@ -360,104 +359,104 @@
 	<!-- Learning Design related beans-->
 	
 	<bean id="activityDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<bean id="branchActivityEntryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.BranchActivityEntryDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<bean id="learningLibraryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<bean id="learningDesignDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>	
 	<bean id="transitionDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>	
 	<bean id="groupingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>	
 	<bean id="groupDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<bean id="licenseDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LicenseDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>	
 	
 	<!--User management related beans -->
 	
 	<bean id="baseDAO" class="org.lamsfoundation.lams.dao.hibernate.BaseDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<!--  Theme beans -->
 	<bean id="themeDAO" class="org.lamsfoundation.lams.themes.dao.hibernate.CSSThemeDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="roleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.RoleDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="organisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<bean id="userOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<!--Event service related beans -->
 	<bean id="eventDAO" class="org.lamsfoundation.lams.events.dao.hibernate.EventDAOHibernate">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<!-- Core Notebook related beans -->
 	<bean id="notebookEntryDAO" class="org.lamsfoundation.lams.notebook.dao.hibernate.NotebookEntryDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>	
 	
 	<!-- Presence Chat related beans -->
 	<bean id="presenceChatDAO" class="org.lamsfoundation.lams.presence.dao.hibernate.PresenceChatDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>	
 	
 	<!--  Configuration related beans -->
 	<bean id="configurationDAO" class="org.lamsfoundation.lams.config.dao.hibernate.ConfigurationDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<bean id="registrationDAO" class="org.lamsfoundation.lams.config.dao.hibernate.RegistrationDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<!--  Competence related beans -->
 	<bean id="competenceDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.CompetenceDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<bean id="competenceMappingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.CompetenceMappingDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<!--  Pedagogical Planner related beans -->
 	<bean id="pedagogicalPlannerDAO" class="org.lamsfoundation.lams.planner.dao.hibernate.PedagogicalPlannerDAOHibernate">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<!--  Gradebook related beans -->
 	<bean id="gradebookDAO" class="org.lamsfoundation.lams.gradebook.dao.hibernate.GradebookDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<!--  Data flow related beans -->
 	<bean id="dataFlowDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.DataFlowDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
 	<!--  System Session bean -->
 	<bean id="SystemSession"
 	    class="org.lamsfoundation.lams.web.session.SessionManager"
 	    init-method="init"
 	    destroy-method="destroy"
-		singleton="true">
+		>
 		<property name="monitorPeriod"><value>60</value></property>
 	</bean>
 	
Index: lams_common/src/java/org/lamsfoundation/lams/messageContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/messageContext.xml,v
diff -u -r1.1 -r1.1.14.1
--- lams_common/src/java/org/lamsfoundation/lams/messageContext.xml	26 Sep 2008 07:03:42 -0000	1.1
+++ lams_common/src/java/org/lamsfoundation/lams/messageContext.xml	16 Aug 2014 11:20:44 -0000	1.1.14.1
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 <!--
   - Application context definition for LAMS. Used to deploy to JBOSS.
 -->
-<beans>
 
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
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.14 -r1.14.2.1
--- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	22 Apr 2014 19:44:46 -0000	1.14
+++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	16 Aug 2014 11:20:44 -0000	1.14.2.1
@@ -1,10 +1,9 @@
 <?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.
--->
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<bean id="toolContentDAO" class="org.lamsfoundation.lams.tool.dao.hibernate.ToolContentDAO">
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
@@ -26,20 +25,20 @@
 	<bean id="toolContentIDGeneratorTarget" class="org.lamsfoundation.lams.tool.ToolContentIDGenerator"
 		
 	>
-		<property name="toolContentDao"><ref local="toolContentDAO"/></property>
+		<property name="toolContentDao"><ref bean="toolContentDAO"/></property>
 	</bean>	
 	
 	<bean id="toolContentIDGenerator" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref local="toolContentIDGeneratorTarget"/></property>
+		<property name="target"><ref bean="toolContentIDGeneratorTarget"/></property>
 		<property name="transactionAttributes">
 			<props>
 				<prop key="getNextToolContentIDFor">PROPAGATION_REQUIRES_NEW</prop>
 			</props>
 		</property>
 	</bean>
 	
-	<bean id="lamsCoreToolServiceTarget" class="org.lamsfoundation.lams.tool.service.LamsCoreToolService" singleton="false">
+	<bean id="lamsCoreToolServiceTarget" class="org.lamsfoundation.lams.tool.service.LamsCoreToolService" scope="prototype">
 		<property name="toolContentDAO"><ref bean="toolContentDAO"/></property>
 		<property name="toolSessionDAO"><ref bean="toolSessionDAO"/></property>
 		<property name="systemToolDAO"><ref bean="systemToolDAO"/></property>
@@ -49,7 +48,7 @@
 	
 	<bean id="lamsCoreToolService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref local="lamsCoreToolServiceTarget"/></property>
+		<property name="target"><ref bean="lamsCoreToolServiceTarget"/></property>
 		<property name="transactionAttributes">
 			<props>
 				<prop key="createToolSession*">PROPAGATION_REQUIRED</prop>
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml,v
diff -u -r1.8 -r1.8.18.1
--- lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	9 May 2007 01:07:27 -0000	1.8
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	16 Aug 2014 11:20:44 -0000	1.8.18.1
@@ -1,10 +1,9 @@
 <?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.
--->
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
 	
@@ -34,7 +33,7 @@
 	
 	<bean id="lessonService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref local="lessonServiceTarget"/></property>
+		<property name="target"><ref bean="lessonServiceTarget"/></property>
 		<property name="proxyTargetClass"><value>true</value></property> 
 		<property name="transactionAttributes">
 			<props>
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml,v
diff -u -r1.2 -r1.2.14.1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml	4 Oct 2007 01:06:33 -0000	1.2
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml	16 Aug 2014 11:20:44 -0000	1.2.14.1
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+           				   
 	<bean id="ldapServiceTarget" class="org.lamsfoundation.lams.usermanagement.service.LdapService">
 		<property name="service"><ref bean="userManagementService"/></property>
 	</bean>
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.11 -r1.11.8.1
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	26 Mar 2009 10:00:35 -0000	1.11
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	16 Aug 2014 11:20:27 -0000	1.11.8.1
@@ -1,12 +1,15 @@
 <?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 content repository application context.
   - Requires lams.jar applicationContent.xml.
  -->
-<beans>
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 
 	<!--  repository (as repositoryAdminService) and ticket are the two main interfaces -->
@@ -20,7 +23,7 @@
 			<ref bean ="transactionManager"/>
 		</property>
 		<property name ="target">
-			<ref local="repositoryTarget"/>
+			<ref bean="repositoryTarget"/>
 		</property>
 		<property name="transactionAttributes">
 			<props>
@@ -47,7 +50,7 @@
 		</property>
 		<property name="preInterceptors">
 			<list>
-				<ref local="checkCredentialTicketBeforeAdvice"/>
+				<ref bean="checkCredentialTicketBeforeAdvice"/>
 			</list>
 		</property>
 	</bean>
@@ -65,8 +68,8 @@
 		<property name="nodeDAO"><ref bean="nodeDAO"/></property>
 	</bean>
 
-	<bean id="node" class="org.lamsfoundation.lams.contentrepository.service.SimpleVersionedNode"
-		singleton="false" destroy-method="destroy">
+	<bean id="node" class="org.lamsfoundation.lams.contentrepository.service.SimpleVersionedNode" scope="prototype"
+		destroy-method="destroy">
 		<property name="nodeDAO"><ref bean="nodeDAO"/></property>
 		<property name="fileDAO"><ref bean="fileDAO"/></property>
 		<property name="nodeFactory"><ref bean="nodeFactory"/></property>
Index: lams_contentrepository/web/WEB-INF/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/web/WEB-INF/applicationContext.xml,v
diff -u -r1.2 -r1.2.8.1
--- lams_contentrepository/web/WEB-INF/applicationContext.xml	26 Mar 2009 10:00:35 -0000	1.2
+++ lams_contentrepository/web/WEB-INF/applicationContext.xml	16 Aug 2014 11:20:27 -0000	1.2.8.1
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-</beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+           				   
+</beans>
\ No newline at end of file
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml,v
diff -u -r1.4 -r1.4.2.1
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	6 Sep 2012 16:03:19 -0000	1.4
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	16 Aug 2014 11:20:37 -0000	1.4.2.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	
 	<bean id="gradebookMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
Index: lams_gradebook/web/WEB-INF/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/applicationContext.xml,v
diff -u -r1.2 -r1.2.2.1
--- lams_gradebook/web/WEB-INF/applicationContext.xml	2 Jul 2009 09:54:54 -0000	1.2
+++ lams_gradebook/web/WEB-INF/applicationContext.xml	16 Aug 2014 11:20:37 -0000	1.2.2.1
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-</beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+</beans>
\ No newline at end of file
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.32 -r1.32.2.1
--- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	12 Dec 2013 12:15:39 -0000	1.32
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	16 Aug 2014 11:20:53 -0000	1.32.2.1
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<!--
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+	<!--
   - Application context definition for lams survey business layer.
 	- Contains bean references to the transaction manager and to the DAOs in
 	- dataAccessContext.xml (see web.xml's "contextConfigLocation").
 	-->
-<beans>
 
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 	<bean id="learningMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
Index: lams_learning/web/WEB-INF/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/applicationContext.xml,v
diff -u -r1.2 -r1.2.8.1
--- lams_learning/web/WEB-INF/applicationContext.xml	26 Mar 2009 10:00:35 -0000	1.2
+++ lams_learning/web/WEB-INF/applicationContext.xml	16 Aug 2014 11:20:54 -0000	1.2.8.1
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-</beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+</beans>
\ No newline at end of file
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.36 -r1.36.2.1
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	5 Sep 2013 09:29:52 -0000	1.36
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	16 Aug 2014 11:20:24 -0000	1.36.2.1
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 <!--
   - Application context definition for lams survey business layer.
 	- Contains bean references to the transaction manager and to the DAOs in
 	- 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>
@@ -28,7 +29,7 @@
 		- 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" scope="prototype">
 		<property name="baseDAO"><ref bean="baseDAO"/></property>
 		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
 		<property name="groupDAO"><ref bean="groupDAO"/></property>
@@ -52,7 +53,7 @@
 	
 	<bean id="monitoringService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref local="monitoringServiceTarget"/></property>
+		<property name="target"><ref bean="monitoringServiceTarget"/></property>
 		<property name="transactionAttributes">
 			<props>
 				<prop key="initializeLesson*">PROPAGATION_REQUIRED</prop>
@@ -74,28 +75,28 @@
 		</property>
 	</bean>    
 
-    <bean id="openScheduleGateJob" class="org.springframework.scheduling.quartz.JobDetailBean" singleton="false">
+    <bean id="openScheduleGateJob" class="org.springframework.scheduling.quartz.JobDetailBean" scope="prototype">
         <property name="jobClass">
             <value>org.lamsfoundation.lams.monitoring.quartz.job.OpenScheduleGateJob</value>
         </property>
     </bean>
 
-    <bean id="closeScheduleGateJob" class="org.springframework.scheduling.quartz.JobDetailBean" singleton="false">
+    <bean id="closeScheduleGateJob" class="org.springframework.scheduling.quartz.JobDetailBean" scope="prototype">
         <property name="jobClass">
             <value>org.lamsfoundation.lams.monitoring.quartz.job.CloseScheduleGateJob</value>
         </property>
     </bean>
-    <bean id="startScheduleLessonJob" class="org.springframework.scheduling.quartz.JobDetailBean" singleton="false">
+    <bean id="startScheduleLessonJob" class="org.springframework.scheduling.quartz.JobDetailBean" scope="prototype">
         <property name="jobClass">
             <value>org.lamsfoundation.lams.monitoring.quartz.job.StartScheduleLessonJob</value>
         </property>
     </bean>
-    <bean id="finishScheduleLessonJob" class="org.springframework.scheduling.quartz.JobDetailBean" singleton="false">
+    <bean id="finishScheduleLessonJob" class="org.springframework.scheduling.quartz.JobDetailBean" scope="prototype">
         <property name="jobClass">
             <value>org.lamsfoundation.lams.monitoring.quartz.job.FinishScheduleLessonJob</value>
         </property>
     </bean>
-    <bean id="emailScheduleMessageJob" class="org.springframework.scheduling.quartz.JobDetailBean" singleton="false">
+    <bean id="emailScheduleMessageJob" class="org.springframework.scheduling.quartz.JobDetailBean" scope="prototype">
     	<property name="jobClass">
     		<value>org.lamsfoundation.lams.monitoring.quartz.job.EmailScheduleMessageJob</value>
     	</property>
Index: lams_monitoring/web/WEB-INF/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/applicationContext.xml,v
diff -u -r1.2 -r1.2.8.1
--- lams_monitoring/web/WEB-INF/applicationContext.xml	26 Mar 2009 10:00:36 -0000	1.2
+++ lams_monitoring/web/WEB-INF/applicationContext.xml	16 Aug 2014 11:20:23 -0000	1.2.8.1
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-</beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+</beans>
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml,v
diff -u -r1.16 -r1.16.2.1
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	28 Jul 2014 17:54:04 -0000	1.16
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	16 Aug 2014 11:20:22 -0000	1.16.2.1
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-    "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<bean id="laasseMessageService" class="org.lamsfoundation.lams.util.MessageService">
 		<property name="messageSource">
@@ -59,25 +60,25 @@
 	
     <bean id="laasseAssessmentManagerTarget" class="org.lamsfoundation.lams.tool.assessment.service.AssessmentServiceImpl">
         <property name="assessmentDao">
-            <ref local="laasseAssessmentDao"/>
+            <ref bean="laasseAssessmentDao"/>
         </property>
         <property name="assessmentQuestionDao">
-            <ref local="laasseAssessmentQuestionDao"/>
+            <ref bean="laasseAssessmentQuestionDao"/>
         </property>
         <property name="assessmentQuestionResultDao">
-            <ref local="laasseAssessmentQuestionResultDao"/>
+            <ref bean="laasseAssessmentQuestionResultDao"/>
         </property>
         <property name="assessmentResultDao">
-            <ref local="laasseAssessmentResultDao"/>
+            <ref bean="laasseAssessmentResultDao"/>
         </property>
         <property name="assessmentUserDao">
-            <ref local="laasseAssessmentUserDao"/>
+            <ref bean="laasseAssessmentUserDao"/>
         </property>
         <property name="assessmentSessionDao">
-            <ref local="laasseAssessmentSessionDao"/>
+            <ref bean="laasseAssessmentSessionDao"/>
         </property>
         <property name="assessmentToolContentHandler">
-            <ref local="laasseAssessmentToolContentHandler"/>
+            <ref bean="laasseAssessmentToolContentHandler"/>
         </property>
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
@@ -124,7 +125,7 @@
     <bean id="laasseAssessmentService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
         <property name="target">
-            <ref local="laasseAssessmentManagerTarget"/>
+            <ref bean="laasseAssessmentManagerTarget"/>
         </property>
         <property name="proxyTargetClass">
             <value>false</value>
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.8.1
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.xml	26 Mar 2009 19:07:06 -0000	1.1
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:22 -0000	1.1.8.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="laasse10"/> 
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml,v
diff -u -r1.3 -r1.3.2.1
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml	6 Jun 2014 16:41:49 -0000	1.3
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml	16 Aug 2014 11:20:54 -0000	1.3.2.1
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
- 
-	<!--  $Id$ -->
- 	<!--
- 	- Application context definition for Bbb tool business layer.
-	-->
-<beans>
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.4.1
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dbupdates/autopatchContext.xml	4 May 2011 02:23:40 -0000	1.1
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:55 -0000	1.1.4.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="labbb10"/> 
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml,v
diff -u -r1.13 -r1.13.2.1
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	6 Jun 2014 16:41:04 -0000	1.13
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	16 Aug 2014 11:20:18 -0000	1.13.2.1
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
- 
-	<!--  $Id$ -->
- 	<!--
- 	- Application context definition for Chat tool business layer.
-	-->
-<beans>
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/autopatchContext.xml	23 Sep 2008 04:21:24 -0000	1.1
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:18 -0000	1.1.12.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lachat11"/> 
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml,v
diff -u -r1.10 -r1.10.2.1
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml	28 Jul 2014 19:43:46 -0000	1.10
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml	16 Aug 2014 11:20:40 -0000	1.10.2.1
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-    "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<bean id="dacoMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
@@ -52,22 +53,22 @@
 	
     <bean id="dacoManagerTarget" class="org.lamsfoundation.lams.tool.daco.service.DacoServiceImpl">
         <property name="dacoDao">
-            <ref local="dacoDao"/>
+            <ref bean="dacoDao"/>
         </property>
         <property name="dacoQuestionDao">
-            <ref local="dacoQuestionDao"/>
+            <ref bean="dacoQuestionDao"/>
         </property>
         <property name="dacoAnswerDao">
-            <ref local="dacoAnswerDao"/>
+            <ref bean="dacoAnswerDao"/>
         </property>
         <property name="dacoUserDao">
-            <ref local="dacoUserDao"/>
+            <ref bean="dacoUserDao"/>
         </property>
         <property name="dacoSessionDao">
-            <ref local="dacoSessionDao"/>
+            <ref bean="dacoSessionDao"/>
         </property>
         <property name="dacoToolContentHandler">
-            <ref local="dacoToolContentHandler"/>
+            <ref bean="dacoToolContentHandler"/>
         </property>
         <property name="repositoryService">
             <ref bean="repositoryService"/>
@@ -99,7 +100,7 @@
     <bean id="dacoService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
         <property name="target">
-            <ref local="dacoManagerTarget"/>
+            <ref bean="dacoManagerTarget"/>
         </property>
         <property name="proxyTargetClass">
             <value>false</value>
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/autopatchContext.xml	23 Sep 2008 04:21:20 -0000	1.1
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:40 -0000	1.1.12.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="ladaco10"/> 
Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml,v
diff -u -r1.6 -r1.6.2.1
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml	6 Jun 2014 16:41:12 -0000	1.6
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml	16 Aug 2014 11:20:51 -0000	1.6.2.1
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-    "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<bean id="eadventureMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
@@ -72,31 +73,31 @@
 	
     <bean id="eadventureManagerTarget" class="org.eucm.lams.tool.eadventure.service.EadventureServiceImpl">
         <property name="eadventureDao">
-            <ref local="eadventureDao"/>
+            <ref bean="eadventureDao"/>
         </property>
         <property name="eadventureUserDao">
-            <ref local="eadventureUserDao"/>
+            <ref bean="eadventureUserDao"/>
         </property>
         <property name="eadventureSessionDao">
-            <ref local="eadventureSessionDao"/>
+            <ref bean="eadventureSessionDao"/>
         </property>
          <property name="eadventureItemVisitDao">
-            <ref local="eadventureItemVisitDao"/>
+            <ref bean="eadventureItemVisitDao"/>
         </property>
          <property name="eadventureVarsDao">
-            <ref local="eadventureVarsDao"/>
+            <ref bean="eadventureVarsDao"/>
         </property>
         <property name="eadventureParamDao">
-            <ref local="eadventureParamDao"/>
+            <ref bean="eadventureParamDao"/>
         </property>
          <property name="eadventureConditionDao">
-            <ref local="eadventureConditionDao"/>
+            <ref bean="eadventureConditionDao"/>
         </property>
          <property name="eadventureExpressionDao">
-            <ref local="eadventureExpressionDao"/>
+            <ref bean="eadventureExpressionDao"/>
         </property>
         <property name="eadventureToolContentHandler">
-            <ref local="eadventureToolContentHandler"/>
+            <ref bean="eadventureToolContentHandler"/>
         </property>
         <property name="repositoryService">
             <ref bean="repositoryService"/>
@@ -133,7 +134,7 @@
     <bean id="eadventureService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
         <property name="target">
-            <ref local="eadventureManagerTarget"/>
+            <ref bean="eadventureManagerTarget"/>
         </property>
         <property name="proxyTargetClass">
             <value>false</value>
Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dbupdates/autopatchContext.xml,v
diff -u -r1.3 -r1.3.2.1
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dbupdates/autopatchContext.xml	11 Dec 2011 21:30:29 -0000	1.3
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:51 -0000	1.3.2.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="eueadv10"/> 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml,v
diff -u -r1.29 -r1.29.2.1
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	28 Jul 2014 19:43:55 -0000	1.29
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	16 Aug 2014 11:20:39 -0000	1.29.2.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<bean id="forumMessageService" class="org.lamsfoundation.lams.util.MessageService"
 		>
 		<property name="messageSource">
@@ -83,31 +86,31 @@
 
 	<bean id="forumManagerTarget" class="org.lamsfoundation.lams.tool.forum.service.ForumService">
 		<property name="forumDao">
-			<ref local="forumDao" />
+			<ref bean="forumDao" />
 		</property>
 		<property name="forumUserDao">
-			<ref local="forumUserDao" />
+			<ref bean="forumUserDao" />
 		</property>
 		<property name="attachmentDao">
-			<ref local="attachmentDao" />
+			<ref bean="attachmentDao" />
 		</property>
 		<property name="messageDao">
-			<ref local="messageDao" />
+			<ref bean="messageDao" />
 		</property>
 		<property name="messageSeqDao">
-			<ref local="messageSeqDao" />
+			<ref bean="messageSeqDao" />
 		</property>
 		<property name="messageRatingDao">
-			<ref local="messageRatingDao" />
+			<ref bean="messageRatingDao" />
 		</property>	
 		<property name="timestampDao">
-			<ref local="timestampDao" />
+			<ref bean="timestampDao" />
 		</property>
 		<property name="forumToolSessionDao">
-			<ref local="forumToolSessionDao" />
+			<ref bean="forumToolSessionDao" />
 		</property>
 		<property name="forumToolContentHandler">
-			<ref local="forumToolContentHandler" />
+			<ref bean="forumToolContentHandler" />
 		</property>
 		<property name="repositoryService">
 			<ref bean="repositoryService" />
@@ -134,7 +137,7 @@
 			<ref bean="coreNotebookService" />
 		</property>
 		<property name="forumOutputFactory">
-			<ref local="forumOutputFactory" />
+			<ref bean="forumOutputFactory" />
 		</property>
 		<property name="eventNotificationService">
 			<ref bean="eventNotificationService" />
@@ -156,7 +159,7 @@
 			<ref bean="transactionManager" />
 		</property>
 		<property name="target">
-			<ref local="forumManagerTarget" />
+			<ref bean="forumManagerTarget" />
 		</property>
 		<property name="proxyTargetClass">
 			<value>false</value>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/autopatchContext.xml,v
diff -u -r1.2 -r1.2.10.1
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/autopatchContext.xml	2 Feb 2009 03:21:24 -0000	1.2
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:39 -0000	1.2.10.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch"
 		class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml,v
diff -u -r1.7 -r1.7.2.1
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	6 Jun 2014 16:42:57 -0000	1.7
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	16 Aug 2014 11:20:20 -0000	1.7.2.1
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
- 
-	<!--  $Id$ -->
- 	<!--
- 	- Application context definition for Gmap tool business layer.
-	-->
-<beans>
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/autopatchContext.xml	23 Sep 2008 04:21:18 -0000	1.1
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:19 -0000	1.1.12.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lagmap10"/> 
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml,v
diff -u -r1.12 -r1.12.2.1
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	28 Jul 2014 19:43:45 -0000	1.12
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	16 Aug 2014 11:20:52 -0000	1.12.2.1
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-    "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<beans>
-
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+           				   
 	<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" >
-		<property name="messageSource"><ref local="laimagMessageSource"/></property>										
+		<property name="messageSource"><ref bean="laimagMessageSource"/></property>										
 	</bean>
     
     <!-- OutputFactory -->
@@ -74,34 +75,34 @@
 	
     <bean id="laimagImageGalleryManagerTarget" class="org.lamsfoundation.lams.tool.imageGallery.service.ImageGalleryServiceImpl">
         <property name="imageGalleryDao">
-            <ref local="laimagImageGalleryDao"/>
+            <ref bean="laimagImageGalleryDao"/>
         </property>
         <property name="imageGalleryItemDao">
-            <ref local="laimagImageGalleryItemDao"/>
+            <ref bean="laimagImageGalleryItemDao"/>
         </property>
         <property name="imageCommentDao">
-            <ref local="laimagImageCommentDao"/>
+            <ref bean="laimagImageCommentDao"/>
         </property>
         <property name="imageRatingDao">
-            <ref local="laimagImageRatingDao"/>
+            <ref bean="laimagImageRatingDao"/>
         </property>       
         <property name="imageVoteDao">
-            <ref local="laimagImageVoteDao"/>
+            <ref bean="laimagImageVoteDao"/>
         </property>          
         <property name="imageGalleryItemVisitDao">
-            <ref local="laimagImageGalleryItemVisitDao"/>
+            <ref bean="laimagImageGalleryItemVisitDao"/>
         </property>
         <property name="imageGalleryUserDao">
-            <ref local="laimagImageGalleryUserDao"/>
+            <ref bean="laimagImageGalleryUserDao"/>
         </property>
         <property name="imageGallerySessionDao">
-            <ref local="laimagImageGallerySessionDao"/>
+            <ref bean="laimagImageGallerySessionDao"/>
         </property>
         <property name="imageGalleryConfigItemDAO">
-            <ref local="laimagImageGalleryConfigItemDAO"/>
+            <ref bean="laimagImageGalleryConfigItemDAO"/>
         </property>
         <property name="imageGalleryToolContentHandler">
-            <ref local="laimagImageGalleryToolContentHandler"/>
+            <ref bean="laimagImageGalleryToolContentHandler"/>
         </property>
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
@@ -130,7 +131,7 @@
     <bean id="laimagImageGalleryService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
         <property name="target">
-            <ref local="laimagImageGalleryManagerTarget"/>
+            <ref bean="laimagImageGalleryManagerTarget"/>
         </property>
         <property name="proxyTargetClass">
             <value>false</value>
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/autopatchContext.xml	11 Oct 2008 12:04:14 -0000	1.1
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:52 -0000	1.1.12.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="laimag10"/> 
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml,v
diff -u -r1.3 -r1.3.2.1
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml	6 Jun 2014 16:41:06 -0000	1.3
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml	16 Aug 2014 11:20:57 -0000	1.3.2.1
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-    "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<bean id="commonCartridgeMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
@@ -53,25 +54,25 @@
 	
     <bean id="commonCartridgeManagerTarget" class="org.lamsfoundation.lams.tool.commonCartridge.service.CommonCartridgeServiceImpl">
         <property name="commonCartridgeDao">
-            <ref local="commonCartridgeDao"/>
+            <ref bean="commonCartridgeDao"/>
         </property>
         <property name="commonCartridgeItemDao">
-            <ref local="commonCartridgeItemDao"/>
+            <ref bean="commonCartridgeItemDao"/>
         </property>
         <property name="commonCartridgeItemVisitDao">
-            <ref local="commonCartridgeItemVisitDao"/>
+            <ref bean="commonCartridgeItemVisitDao"/>
         </property>
         <property name="commonCartridgeConfigItemDao">
-            <ref local="commonCartridgeConfigItemDao"/>
+            <ref bean="commonCartridgeConfigItemDao"/>
         </property>
         <property name="commonCartridgeUserDao">
-            <ref local="commonCartridgeUserDao"/>
+            <ref bean="commonCartridgeUserDao"/>
         </property>
         <property name="commonCartridgeSessionDao">
-            <ref local="commonCartridgeSessionDao"/>
+            <ref bean="commonCartridgeSessionDao"/>
         </property>
         <property name="commonCartridgeToolContentHandler">
-            <ref local="commonCartridgeToolContentHandler"/>
+            <ref bean="commonCartridgeToolContentHandler"/>
         </property>
         <property name="repositoryService">
             <ref bean="repositoryService"/>
@@ -105,7 +106,7 @@
     <bean id="commonCartridgeService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
         <property name="target">
-            <ref local="commonCartridgeManagerTarget"/>
+            <ref bean="commonCartridgeManagerTarget"/>
         </property>
         <property name="proxyTargetClass">
             <value>false</value>
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/autopatchContext.xml	28 May 2011 18:03:51 -0000	1.1
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:57 -0000	1.1.2.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="laimsc11"/> 
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml,v
diff -u -r1.5 -r1.5.2.1
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml	6 Jun 2014 16:42:37 -0000	1.5
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml	16 Aug 2014 11:20:19 -0000	1.5.2.1
@@ -1,11 +1,10 @@
 <?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 Kaltura tool business layer.
--->
-<beans>
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/autopatchContext.xml	15 Nov 2012 14:39:33 -0000	1.1
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:19 -0000	1.1.2.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lakalt11"/> 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml,v
diff -u -r1.23 -r1.23.2.1
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	6 Jun 2014 16:41:24 -0000	1.23
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	16 Aug 2014 11:20:29 -0000	1.23.2.1
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 <!--
   - Application context definition for lams survey business layer.
 	- Contains bean references to the transaction manager and to the DAOs in
 	- dataAccessContext.xml (see web.xml's "contextConfigLocation").
 	-->
-<beans>
 
 <!-- ========================= GENERAL DEFINITIONS ========================= -->
 
@@ -53,7 +55,7 @@
 	</bean>
 	
 	<bean id="lamcMessageService" class="org.lamsfoundation.lams.util.MessageService" >
-		<property name="messageSource"><ref local="lamcMessageSource"/></property>										
+		<property name="messageSource"><ref bean="lamcMessageSource"/></property>										
 	</bean>
 
 	<bean id="mcOutputFactory" class="org.lamsfoundation.lams.tool.mc.service.MCOutputFactory">
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.xml	23 Sep 2008 04:21:20 -0000	1.1
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:29 -0000	1.1.12.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lamc11"/> 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml,v
diff -u -r1.31 -r1.31.2.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	28 Jul 2014 19:43:53 -0000	1.31
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	16 Aug 2014 11:20:45 -0000	1.31.2.1
@@ -1,12 +1,9 @@
 <?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 survey business layer.
-	- Contains bean references to the transaction manager and to the DAOs in
-	- dataAccessContext.xml (see web.xml's "contextConfigLocation").
-	-->
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 <!-- ========================= GENERAL DEFINITIONS ========================= -->
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/autopatchContext.xml	23 Sep 2008 04:21:22 -0000	1.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:45 -0000	1.1.12.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="laqa11"/> 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml,v
diff -u -r1.22 -r1.22.2.1
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	28 Jul 2014 19:43:51 -0000	1.22
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	16 Aug 2014 11:20:30 -0000	1.22.2.1
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-    "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<bean id="resourceMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
@@ -52,22 +53,22 @@
 	
     <bean id="resourceManagerTarget" class="org.lamsfoundation.lams.tool.rsrc.service.ResourceServiceImpl">
         <property name="resourceDao">
-            <ref local="resourceDao"/>
+            <ref bean="resourceDao"/>
         </property>
         <property name="resourceItemDao">
-            <ref local="resourceItemDao"/>
+            <ref bean="resourceItemDao"/>
         </property>
         <property name="resourceItemVisitDao">
-            <ref local="resourceItemVisitDao"/>
+            <ref bean="resourceItemVisitDao"/>
         </property>
         <property name="resourceUserDao">
-            <ref local="resourceUserDao"/>
+            <ref bean="resourceUserDao"/>
         </property>
         <property name="resourceSessionDao">
-            <ref local="resourceSessionDao"/>
+            <ref bean="resourceSessionDao"/>
         </property>
         <property name="resourceToolContentHandler">
-            <ref local="resourceToolContentHandler"/>
+            <ref bean="resourceToolContentHandler"/>
         </property>
         <property name="repositoryService">
             <ref bean="repositoryService"/>
@@ -98,7 +99,7 @@
     <bean id="resourceService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
         <property name="target">
-            <ref local="resourceManagerTarget"/>
+            <ref bean="resourceManagerTarget"/>
         </property>
         <property name="proxyTargetClass">
             <value>false</value>
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.14.1
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/autopatchContext.xml	23 Sep 2008 04:21:21 -0000	1.1
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:30 -0000	1.1.14.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="larsrc11"/> 
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml	17 Jan 2014 22:06:30 -0000	1.2
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml	16 Aug 2014 11:20:33 -0000	1.2.2.1
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
- 
-	<!--  $Id$ -->
- 	<!--
- 	- Application context definition for Leaderselection tool business layer.
-	-->
-<beans>
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/autopatchContext.xml	8 Jan 2014 20:13:51 -0000	1.1
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:33 -0000	1.1.2.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lalead11"/> 
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml,v
diff -u -r1.3 -r1.3.2.1
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml	6 Jun 2014 16:42:44 -0000	1.3
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml	16 Aug 2014 11:20:21 -0000	1.3.2.1
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
- 
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!--  $Id$ -->
  	<!-- Application context definition for Mindmap tool business layer. -->
-<beans>
 
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<bean id="mindmapMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="mindmapMessageService" 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.mindmap.ApplicationResources</value></property>
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.8.1
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/autopatchContext.xml	3 Apr 2009 00:00:30 -0000	1.1
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:21 -0000	1.1.8.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lamind10"/> 
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml,v
diff -u -r1.4 -r1.4.2.1
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	6 Jun 2014 16:42:54 -0000	1.4
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	16 Aug 2014 11:20:16 -0000	1.4.2.1
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
  	<!--
  	- Application context definition for lams noticeboard business layer.
 	-->
-<beans>
 
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml	23 Sep 2008 04:21:19 -0000	1.1
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:16 -0000	1.1.12.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lanb11"/> 
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml,v
diff -u -r1.9 -r1.9.2.1
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	6 Jun 2014 16:42:39 -0000	1.9
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	16 Aug 2014 11:20:42 -0000	1.9.2.1
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
- 
-	<!--  $Id$ -->
- 	<!--
- 	- Application context definition for Notebook tool business layer.
-	-->
-<beans>
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/autopatchContext.xml	23 Sep 2008 04:21:22 -0000	1.1
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:41 -0000	1.1.12.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lantbk11"/> 
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml,v
diff -u -r1.6 -r1.6.2.1
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	6 Jun 2014 16:41:09 -0000	1.6
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	16 Aug 2014 11:20:32 -0000	1.6.2.1
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
- 
-	<!--  $Id$ -->
- 	<!--
- 	- Application context definition for Pixlr tool business layer.
-	-->
-<beans>
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.10.1
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/autopatchContext.xml	7 Jan 2009 22:37:48 -0000	1.1
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:32 -0000	1.1.10.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lapixl10"/> 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml,v
diff -u -r1.28 -r1.28.2.1
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	6 Jun 2014 16:41:51 -0000	1.28
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	16 Aug 2014 11:20:58 -0000	1.28.2.1
@@ -1,9 +1,10 @@
 <?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 Submit Files Tool -->
-
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+           				   
 	<bean id="sbmtMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.xml	23 Sep 2008 04:21:23 -0000	1.1
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:58 -0000	1.1.12.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lasbmt11"/> 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml,v
diff -u -r1.16 -r1.16.2.1
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	13 Jun 2014 18:50:12 -0000	1.16
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	16 Aug 2014 11:20:17 -0000	1.16.2.1
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-    "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<bean id="scratchieMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
@@ -57,25 +58,25 @@
 	
     <bean id="scratchieManagerTarget" class="org.lamsfoundation.lams.tool.scratchie.service.ScratchieServiceImpl">
         <property name="scratchieDao">
-            <ref local="scratchieDao"/>
+            <ref bean="scratchieDao"/>
         </property>
         <property name="scratchieItemDao">
-            <ref local="scratchieItemDao"/>
+            <ref bean="scratchieItemDao"/>
         </property>
         <property name="scratchieAnswerVisitDao">
-            <ref local="scratchieAnswerVisitDao"/>
+            <ref bean="scratchieAnswerVisitDao"/>
         </property>
         <property name="scratchieUserDao">
-            <ref local="scratchieUserDao"/>
+            <ref bean="scratchieUserDao"/>
         </property>
         <property name="scratchieSessionDao">
-            <ref local="scratchieSessionDao"/>
+            <ref bean="scratchieSessionDao"/>
         </property>
         <property name="scratchieConfigItemDao">
-            <ref local="scratchieConfigItemDao"/>
+            <ref bean="scratchieConfigItemDao"/>
         </property>
         <property name="scratchieToolContentHandler">
-            <ref local="scratchieToolContentHandler"/>
+            <ref bean="scratchieToolContentHandler"/>
         </property>
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
@@ -102,7 +103,7 @@
     <bean id="scratchieService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
         <property name="target">
-            <ref local="scratchieManagerTarget"/>
+            <ref bean="scratchieManagerTarget"/>
         </property>
         <property name="proxyTargetClass">
             <value>false</value>
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.4.1
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml	19 Jul 2012 19:20:14 -0000	1.1
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:17 -0000	1.1.4.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lascrt11"/> 
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml,v
diff -u -r1.8 -r1.8.2.1
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	6 Jun 2014 16:43:02 -0000	1.8
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	16 Aug 2014 11:20:31 -0000	1.8.2.1
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
- 
-	<!--  $Id$ -->
- 	<!--
- 	- Application context definition for Scribe tool business layer.
-	-->
-<beans>
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/autopatchContext.xml	23 Sep 2008 04:21:21 -0000	1.1
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:31 -0000	1.1.12.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lascrb11"/> 
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml,v
diff -u -r1.5 -r1.5.2.1
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml	6 Jun 2014 16:43:06 -0000	1.5
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml	16 Aug 2014 11:20:48 -0000	1.5.2.1
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-    "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<bean id="spreadsheetMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
@@ -52,22 +53,22 @@
 	
     <bean id="spreadsheetManagerTarget" class="org.lamsfoundation.lams.tool.spreadsheet.service.SpreadsheetServiceImpl">
         <property name="spreadsheetDao">
-            <ref local="spreadsheetDao"/>
+            <ref bean="spreadsheetDao"/>
         </property>
         <property name="userModifiedSpreadsheetDao">
-            <ref local="userModifiedSpreadsheetDao"/>
+            <ref bean="userModifiedSpreadsheetDao"/>
         </property>
         <property name="spreadsheetMarkDao">
-            <ref local="spreadsheetMarkDao"/>
+            <ref bean="spreadsheetMarkDao"/>
         </property>
         <property name="spreadsheetUserDao">
-            <ref local="spreadsheetUserDao"/>
+            <ref bean="spreadsheetUserDao"/>
         </property>
         <property name="spreadsheetSessionDao">
-            <ref local="spreadsheetSessionDao"/>
+            <ref bean="spreadsheetSessionDao"/>
         </property>
         <property name="spreadsheetToolContentHandler">
-            <ref local="spreadsheetToolContentHandler"/>
+            <ref bean="spreadsheetToolContentHandler"/>
         </property>
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
@@ -88,7 +89,7 @@
     <bean id="spreadsheetService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
         <property name="target">
-            <ref local="spreadsheetManagerTarget"/>
+            <ref bean="spreadsheetManagerTarget"/>
         </property>
         <property name="proxyTargetClass">
             <value>false</value>
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/autopatchContext.xml	23 Sep 2008 04:21:24 -0000	1.1
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:48 -0000	1.1.12.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lasprd10"/> 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml,v
diff -u -r1.11 -r1.11.2.1
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	28 Jul 2014 19:43:48 -0000	1.11
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	16 Aug 2014 11:20:43 -0000	1.11.2.1
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-    "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<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" >
-		<property name="messageSource"><ref local="lasurvMessageSource"/></property>										
+		<property name="messageSource"><ref bean="lasurvMessageSource"/></property>										
 	</bean>
 
     <!-- OutputFactory -->
@@ -52,22 +53,22 @@
 	
     <bean id="lasurvSurveyManagerTarget" class="org.lamsfoundation.lams.tool.survey.service.SurveyServiceImpl">
         <property name="surveyDao">
-            <ref local="lasurvSurveyDao"/>
+            <ref bean="lasurvSurveyDao"/>
         </property>
         <property name="surveyQuestionDao">
-            <ref local="lasurvSurveyQuestionDao"/>
+            <ref bean="lasurvSurveyQuestionDao"/>
         </property>
         <property name="surveyAnswerDao">
-            <ref local="lasurvSurveyAnswerDao"/>
+            <ref bean="lasurvSurveyAnswerDao"/>
         </property>
         <property name="surveyUserDao">
-            <ref local="lasurvSurveyUserDao"/>
+            <ref bean="lasurvSurveyUserDao"/>
         </property>
         <property name="surveySessionDao">
-            <ref local="lasurvSurveySessionDao"/>
+            <ref bean="lasurvSurveySessionDao"/>
         </property>
         <property name="surveyToolContentHandler">
-            <ref local="lasurvSurveyToolContentHandler"/>
+            <ref bean="lasurvSurveyToolContentHandler"/>
         </property>
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
@@ -92,7 +93,7 @@
     <bean id="lasurvSurveyService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
         <property name="target">
-            <ref local="lasurvSurveyManagerTarget"/>
+            <ref bean="lasurvSurveyManagerTarget"/>
         </property>
         <property name="proxyTargetClass">
             <value>false</value>
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/autopatchContext.xml	23 Sep 2008 04:21:20 -0000	1.1
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:42 -0000	1.1.12.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lasurv11"/> 
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml,v
diff -u -r1.9 -r1.9.2.1
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml	6 Jun 2014 16:42:51 -0000	1.9
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml	16 Aug 2014 11:20:38 -0000	1.9.2.1
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-    "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<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" >
-		<property name="messageSource"><ref local="lataskMessageSource"/></property>										
+		<property name="messageSource"><ref bean="lataskMessageSource"/></property>										
 	</bean>
 
 	<!-- OutputFactory -->
@@ -59,25 +60,25 @@
 	
     <bean id="lataskTaskListManagerTarget" class="org.lamsfoundation.lams.tool.taskList.service.TaskListServiceImpl">
         <property name="taskListDao">
-            <ref local="lataskTaskListDao"/>
+            <ref bean="lataskTaskListDao"/>
         </property>
         <property name="taskListItemDao">
-            <ref local="lataskTaskListItemDao"/>
+            <ref bean="lataskTaskListItemDao"/>
         </property>
         <property name="taskListItemVisitDao">
-            <ref local="lataskTaskListItemVisitDao"/>
+            <ref bean="lataskTaskListItemVisitDao"/>
         </property>
         <property name="taskListConditionDao">
-            <ref local="lataskTaskListConditionDao"/>
+            <ref bean="lataskTaskListConditionDao"/>
         </property>
         <property name="taskListUserDao">
-            <ref local="lataskTaskListUserDao"/>
+            <ref bean="lataskTaskListUserDao"/>
         </property>
         <property name="taskListSessionDao">
-            <ref local="lataskTaskListSessionDao"/>
+            <ref bean="lataskTaskListSessionDao"/>
         </property>
         <property name="taskListToolContentHandler">
-            <ref local="lataskTaskListToolContentHandler"/>
+            <ref bean="lataskTaskListToolContentHandler"/>
         </property>
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
@@ -99,7 +100,7 @@
     <bean id="lataskTaskListService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
         <property name="target">
-            <ref local="lataskTaskListManagerTarget"/>
+            <ref bean="lataskTaskListManagerTarget"/>
         </property>
         <property name="proxyTargetClass">
             <value>false</value>
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/autopatchContext.xml	23 Sep 2008 04:21:25 -0000	1.1
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:38 -0000	1.1.12.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="latask10"/> 
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml,v
diff -u -r1.8 -r1.8.2.1
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml	6 Jun 2014 16:41:54 -0000	1.8
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml	16 Aug 2014 11:20:23 -0000	1.8.2.1
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
- 
-	<!--  $Id$ -->
- 	<!--
- 	- Application context definition for VideoRecorder tool business layer.
-	-->
-<beans>
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.6.1
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/autopatchContext.xml	18 Dec 2008 02:20:35 -0000	1.1
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:23 -0000	1.1.6.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lavidr10"/> 
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml,v
diff -u -r1.15 -r1.15.2.1
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	6 Jun 2014 16:41:58 -0000	1.15
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	16 Aug 2014 11:20:55 -0000	1.15.2.1
@@ -1,12 +1,9 @@
 <?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 survey business layer.
-	- Contains bean references to the transaction manager and to the DAOs in
-	- dataAccessContext.xml (see web.xml's "contextConfigLocation").
-	-->
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 <!-- ========================= GENERAL DEFINITIONS ========================= -->
 
@@ -15,7 +12,7 @@
 		<property name="basename"><value>org.lamsfoundation.lams.tool.vote.ApplicationResources</value></property>
 	</bean>
 	<bean id="lavoteMessageService" class="org.lamsfoundation.lams.util.MessageService" >
-		<property name="messageSource"><ref local="lavoteMessageSource"/></property>										
+		<property name="messageSource"><ref bean="lavoteMessageSource"/></property>										
 	</bean>
 	
 
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml	23 Sep 2008 04:21:27 -0000	1.1
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:55 -0000	1.1.12.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lavote11"/> 
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml,v
diff -u -r1.6 -r1.6.2.1
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	6 Jun 2014 16:41:17 -0000	1.6
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	16 Aug 2014 11:20:46 -0000	1.6.2.1
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
- 
-	<!--  $Id$ -->
- 	<!--
- 	- Application context definition for Wiki tool business layer.
-	-->
-<beans>
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.xml	8 Oct 2008 05:33:01 -0000	1.1
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:46 -0000	1.1.12.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lawiki10"/> 
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml,v
diff -u -r1.5 -r1.5.2.1
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml	6 Jun 2014 16:41:36 -0000	1.5
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml	16 Aug 2014 11:20:47 -0000	1.5.2.1
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
- 
-	<!--  $Id$ -->
- 	<!--
- 	- Application context definition for Wookie tool business layer.
-	-->
-<beans>
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dbupdates/autopatchContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dbupdates/autopatchContext.xml,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dbupdates/autopatchContext.xml	28 Jul 2009 05:30:25 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dbupdates/autopatchContext.xml	16 Aug 2014 11:20:47 -0000	1.1.2.1
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<!-- Autopatch service -->
 	<bean id="autopatchService" init-method="patch" class="com.tacitknowledge.util.migration.jdbc.AutoPatchService">
 		<property name="systemName" value="lawook10"/>