Index: lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml	(.../adminApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml	(.../adminApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r8439bc40054ddba298eda9da46962adbcb954f37 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	(.../authoringApplicationContext.xml)	(revision 8439bc40054ddba298eda9da46962adbcb954f37)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	(.../authoringApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml	(.../webApplicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml	(.../webApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	(.../workspaceApplicationContext.xml)	(revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077)
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	(.../workspaceApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -rb6544cfe682554653a9590c0bf74ed52186d71ff -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_central/web/WEB-INF/applicationContext.xml	(.../applicationContext.xml)	(revision b6544cfe682554653a9590c0bf74ed52186d71ff)
+++ lams_central/web/WEB-INF/applicationContext.xml	(.../applicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r281aed83b99fe03afc3bfeda0d48753f9cf2b4c5 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision 281aed83b99fe03afc3bfeda0d48753f9cf2b4c5)
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r55d2746e20873357395af07e7f2248de6c50d31b -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml	(.../beanRefContext.xml)	(revision 55d2746e20873357395af07e7f2248de6c50d31b)
+++ lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml	(.../beanRefContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -rdb8cd59179f23576cd809e7657885236cfafa60b -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision db8cd59179f23576cd809e7657885236cfafa60b)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r2e88e16c3c927a535d8c077f06d01a8a977878d8 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml	(.../integrationContext.xml)	(revision 2e88e16c3c927a535d8c077f06d01a8a977878d8)
+++ lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml	(.../integrationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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/lesson/lessonApplicationContext.xml
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	(.../lessonApplicationContext.xml)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	(.../lessonApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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/localApplicationContext.xml
===================================================================
diff -u -r750f84843809e7143585d1ace1742c935df2898a -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_common/src/java/org/lamsfoundation/lams/localApplicationContext.xml	(.../localApplicationContext.xml)	(revision 750f84843809e7143585d1ace1742c935df2898a)
+++ lams_common/src/java/org/lamsfoundation/lams/localApplicationContext.xml	(.../localApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -re64a90c0cc74118c5b88f5cbae323065abd59cac -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_common/src/java/org/lamsfoundation/lams/localCommonContext.xml	(.../localCommonContext.xml)	(revision e64a90c0cc74118c5b88f5cbae323065abd59cac)
+++ lams_common/src/java/org/lamsfoundation/lams/localCommonContext.xml	(.../localCommonContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -rf27e4add424636db794f56d68dddea0fc4e1d7d2 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_common/src/java/org/lamsfoundation/lams/messageContext.xml	(.../messageContext.xml)	(revision f27e4add424636db794f56d68dddea0fc4e1d7d2)
+++ lams_common/src/java/org/lamsfoundation/lams/messageContext.xml	(.../messageContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -rda9d623352f3964daa5fe12f81a683b9377d286a -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	(.../toolApplicationContext.xml)	(revision da9d623352f3964daa5fe12f81a683b9377d286a)
+++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	(.../toolApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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/usermanagement/ldapContext.xml
===================================================================
diff -u -r053b3694d8631a983eb8e95e3f0374a22540b43a -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml	(.../ldapContext.xml)	(revision 053b3694d8631a983eb8e95e3f0374a22540b43a)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml	(.../ldapContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	(.../applicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	(.../applicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_contentrepository/web/WEB-INF/applicationContext.xml	(.../applicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_contentrepository/web/WEB-INF/applicationContext.xml	(.../applicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -rd9a8907ef60b47f5dbe1c024a93cb44c3e0a4174 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	(.../gradebookApplicationContext.xml)	(revision d9a8907ef60b47f5dbe1c024a93cb44c3e0a4174)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	(.../gradebookApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_gradebook/web/WEB-INF/applicationContext.xml	(.../applicationContext.xml)	(revision daf00a52f630e4b979227c958b7d1e70e0a9b466)
+++ lams_gradebook/web/WEB-INF/applicationContext.xml	(.../applicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r733eb2e21e1eb54366032ebb068168f7315c6cf5 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 733eb2e21e1eb54366032ebb068168f7315c6cf5)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_learning/web/WEB-INF/applicationContext.xml	(.../applicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_learning/web/WEB-INF/applicationContext.xml	(.../applicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r21b90f9c153c9dff39ba830281c0a818820d691c -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(.../monitoringApplicationContext.xml)	(revision 21b90f9c153c9dff39ba830281c0a818820d691c)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(.../monitoringApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_monitoring/web/WEB-INF/applicationContext.xml	(.../applicationContext.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_monitoring/web/WEB-INF/applicationContext.xml	(.../applicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -rc6e574907619b3052b4f8afd7a5c92bb761a76fb -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision c6e574907619b3052b4f8afd7a5c92bb761a76fb)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r0e8805899410bfd0e2c8ec130cc6e5dde3c652a9 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 0e8805899410bfd0e2c8ec130cc6e5dde3c652a9)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml	(.../bbbApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml	(.../bbbApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	(.../chatApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	(.../chatApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r3ff38201dcc90ccdf402ac3ba094b0c05fd32d05 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml	(.../dacoApplicationContext.xml)	(revision 3ff38201dcc90ccdf402ac3ba094b0c05fd32d05)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml	(.../dacoApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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/dbupdates/autopatchContext.xml
===================================================================
diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 7322054ababd8f5387c3424cdd38d99c3ab49e02)
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml	(.../eadventureApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml	(.../eadventureApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/autopatchContext.xml
===================================================================
diff -u -r59e4b8d442ec5f40e2e7a5bef1bda2059953b59a -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 59e4b8d442ec5f40e2e7a5bef1bda2059953b59a)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
===================================================================
diff -u -r3ff38201dcc90ccdf402ac3ba094b0c05fd32d05 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 3ff38201dcc90ccdf402ac3ba094b0c05fd32d05)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/autopatchContext.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	(.../gmapApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	(.../gmapApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/autopatchContext.xml
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml
===================================================================
diff -u -r3ff38201dcc90ccdf402ac3ba094b0c05fd32d05 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	(.../imageGalleryApplicationContext.xml)	(revision 3ff38201dcc90ccdf402ac3ba094b0c05fd32d05)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	(.../imageGalleryApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml	(.../commonCartridgeApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml	(.../commonCartridgeApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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/dbupdates/autopatchContext.xml
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml	(.../kalturaApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml	(.../kalturaApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/autopatchContext.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
diff -u -r3ff38201dcc90ccdf402ac3ba094b0c05fd32d05 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 3ff38201dcc90ccdf402ac3ba094b0c05fd32d05)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/autopatchContext.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
===================================================================
diff -u -r3ff38201dcc90ccdf402ac3ba094b0c05fd32d05 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	(.../rsrcApplicationContext.xml)	(revision 3ff38201dcc90ccdf402ac3ba094b0c05fd32d05)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	(.../rsrcApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/autopatchContext.xml
===================================================================
diff -u -r17ddd3aac11d9fecc83159a9c829e989754accfb -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 17ddd3aac11d9fecc83159a9c829e989754accfb)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml	(.../leaderselectionApplicationContext.xml)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml	(.../leaderselectionApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/autopatchContext.xml
===================================================================
diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml	(.../mindmapApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml	(.../mindmapApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	(.../nbApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	(.../nbApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/autopatchContext.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	(.../notebookApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	(.../notebookApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/autopatchContext.xml
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	(.../pixlrApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	(.../pixlrApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml
===================================================================
diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
===================================================================
diff -u -re5a3c4e8e88340e636c501f79cec1b91ab59a5cf -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	(.../scratchieApplicationContext.xml)	(revision e5a3c4e8e88340e636c501f79cec1b91ab59a5cf)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	(.../scratchieApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/autopatchContext.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	(.../scribeApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	(.../scribeApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/autopatchContext.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml	(.../spreadsheetApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml	(.../spreadsheetApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/autopatchContext.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml
===================================================================
diff -u -r3ff38201dcc90ccdf402ac3ba094b0c05fd32d05 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	(.../surveyApplicationContext.xml)	(revision 3ff38201dcc90ccdf402ac3ba094b0c05fd32d05)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	(.../surveyApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/autopatchContext.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml	(.../taskListApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml	(.../taskListApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/autopatchContext.xml
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml	(.../videoRecorderApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml	(.../videoRecorderApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	(.../voteApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	(.../voteApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.xml
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	(.../wikiApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	(.../wikiApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dbupdates/autopatchContext.xml
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dbupdates/autopatchContext.xml	(.../autopatchContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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"/> 
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r57c6309187d8c559f1b273202c6b3a99e559edae
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml	(.../wookieApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml	(.../wookieApplicationContext.xml)	(revision 57c6309187d8c559f1b273202c6b3a99e559edae)
@@ -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 ========================= -->