=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml	2014-09-30 09:08:21 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <!-- ResourceTable -->
 

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/resources/META-INF/dhis/beans.xml	2014-05-04 12:21:18 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <!-- Table -->
 

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2014-11-18 12:55:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
-    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
+    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd">
 
   <context:component-scan base-package="org.hisp.dhis.schema" />
 
@@ -926,7 +926,7 @@
   <bean id="org.hisp.dhis.i18n.I18nManager" class="org.hisp.dhis.i18n.ui.DefaultI18nManager">
     <property name="resourceBundleManager" ref="org.hisp.dhis.i18n.ui.resourcebundle.ResourceBundleManager" />
     <property name="localeManager">
-      <ref local="org.hisp.dhis.i18n.locale.LocaleManager" />
+      <ref bean="org.hisp.dhis.i18n.locale.LocaleManager" />
     </property>
   </bean>
 
@@ -1046,17 +1046,17 @@
     <property name="arguments">
       <list>
         <list>
-          <ref local="org.hisp.dhis.startup.InitTableAlteror" />
-          <ref local="org.hisp.dhis.startup.TableAlteror" />
-          <ref local="org.hisp.dhis.startup.MapViewUpgrader" />
-          <ref local="org.hisp.dhis.common.IdentityPopulator" />
-          <ref local="org.hisp.dhis.period.PeriodTypePopulator" />
-          <ref local="org.hisp.dhis.startup.TableCreator" />
-          <ref local="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator" />
-          <ref local="org.hisp.dhis.dataentryform.DataEntryFormUpgrader" />
-          <ref local="org.hisp.dhis.startup.ExpressionUpgrader" />
-          <ref local="org.hisp.dhis.startup.ConfigurationPopulator" />
-          <ref local="org.hisp.dhis.startup.I18nLocalePopulator" />
+          <ref bean="org.hisp.dhis.startup.InitTableAlteror" />
+          <ref bean="org.hisp.dhis.startup.TableAlteror" />
+          <ref bean="org.hisp.dhis.startup.MapViewUpgrader" />
+          <ref bean="org.hisp.dhis.common.IdentityPopulator" />
+          <ref bean="org.hisp.dhis.period.PeriodTypePopulator" />
+          <ref bean="org.hisp.dhis.startup.TableCreator" />
+          <ref bean="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator" />
+          <ref bean="org.hisp.dhis.dataentryform.DataEntryFormUpgrader" />
+          <ref bean="org.hisp.dhis.startup.ExpressionUpgrader" />
+          <ref bean="org.hisp.dhis.startup.ConfigurationPopulator" />
+          <ref bean="org.hisp.dhis.startup.I18nLocalePopulator" />
         </list>
       </list>
     </property>
@@ -1233,43 +1233,43 @@
     <property name="arguments">
       <list>
         <list>
-          <ref local="org.hisp.dhis.dataapproval.DataApprovalDeletionHandler" />
-          <ref local="org.hisp.dhis.dataelement.DataElementDeletionHandler" />
-          <ref local="org.hisp.dhis.dataelement.DataElementGroupDeletionHandler" />
-          <ref local="org.hisp.dhis.dataelement.DataElementCategoryOptionDeletionHandler" />
-          <ref local="org.hisp.dhis.dataelement.DataElementCategoryOptionComboDeletionHandler" />
-          <ref local="org.hisp.dhis.dataelement.DataElementCategoryComboDeletionHandler" />
-          <ref local="org.hisp.dhis.dataset.DataSetDeletionHandler" />
-          <ref local="org.hisp.dhis.dataset.CompleteDataSetRegistrationDeletionHandler" />
-          <ref local="org.hisp.dhis.dataset.SectionDeletionHandler" />
-          <ref local="org.hisp.dhis.expression.ExpressionDeletionHandler" />
-          <ref local="org.hisp.dhis.indicator.IndicatorDeletionHandler" />
-          <ref local="org.hisp.dhis.indicator.IndicatorGroupDeletionHandler" />
-          <ref local="org.hisp.dhis.indicator.IndicatorGroupSetDeletionHandler" />
-          <ref local="org.hisp.dhis.minmax.MinMaxDataElementDeletionHandler" />
-          <ref local="org.hisp.dhis.validation.ValidationRuleDeletionHandler" />
-          <ref local="org.hisp.dhis.validation.ValidationRuleGroupDeletionHandler" />
-          <ref local="org.hisp.dhis.datavalue.DataValueDeletionHandler" />
-          <ref local="org.hisp.dhis.datavalue.DataValueAuditDeletionHandler" />
-          <ref local="org.hisp.dhis.organisationunit.OrganisationUnitDeletionHandler" />
-          <ref local="org.hisp.dhis.organisationunit.OrganisationUnitGroupDeletionHandler" />
-          <ref local="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetDeletionHandler" />
-          <ref local="org.hisp.dhis.user.UserDeletionHandler" />
-          <ref local="org.hisp.dhis.user.UserGroupDeletionHandler" />
-          <ref local="org.hisp.dhis.user.UserAuthorityGroupDeletionHandler" />
-          <ref local="org.hisp.dhis.user.UserSettingDeletionHandler" />
-          <ref local="org.hisp.dhis.dataelement.DataElementCategoryDeletionHandler" />
-          <ref local="org.hisp.dhis.dataelement.DataElementGroupSetDeletionHandler" />
-          <ref local="org.hisp.dhis.dataelement.CategoryOptionGroupDeletionHandler" />
-          <ref local="org.hisp.dhis.dataelement.CategoryOptionGroupSetDeletionHandler" />
-          <ref local="org.hisp.dhis.configuration.ConfigurationDeletionHandler" />
-          <ref local="org.hisp.dhis.message.MessageConversationDeletionHandler" />
-          <ref local="org.hisp.dhis.translation.TranslationDeletionHandler" />
-          <ref local="org.hisp.dhis.attribute.AttributeValueDeletionHandler" />
-          <ref local="org.hisp.dhis.mapping.MapLegendSetDeletionHandler" />
-          <ref local="org.hisp.dhis.mapping.MapViewDeletionHandler" />
-          <ref local="org.hisp.dhis.sms.SMSCommandDeletionHandler" />
-          <ref local="org.hisp.dhis.sms.SMSCodesDeletionHandler" />
+          <ref bean="org.hisp.dhis.dataapproval.DataApprovalDeletionHandler" />
+          <ref bean="org.hisp.dhis.dataelement.DataElementDeletionHandler" />
+          <ref bean="org.hisp.dhis.dataelement.DataElementGroupDeletionHandler" />
+          <ref bean="org.hisp.dhis.dataelement.DataElementCategoryOptionDeletionHandler" />
+          <ref bean="org.hisp.dhis.dataelement.DataElementCategoryOptionComboDeletionHandler" />
+          <ref bean="org.hisp.dhis.dataelement.DataElementCategoryComboDeletionHandler" />
+          <ref bean="org.hisp.dhis.dataset.DataSetDeletionHandler" />
+          <ref bean="org.hisp.dhis.dataset.CompleteDataSetRegistrationDeletionHandler" />
+          <ref bean="org.hisp.dhis.dataset.SectionDeletionHandler" />
+          <ref bean="org.hisp.dhis.expression.ExpressionDeletionHandler" />
+          <ref bean="org.hisp.dhis.indicator.IndicatorDeletionHandler" />
+          <ref bean="org.hisp.dhis.indicator.IndicatorGroupDeletionHandler" />
+          <ref bean="org.hisp.dhis.indicator.IndicatorGroupSetDeletionHandler" />
+          <ref bean="org.hisp.dhis.minmax.MinMaxDataElementDeletionHandler" />
+          <ref bean="org.hisp.dhis.validation.ValidationRuleDeletionHandler" />
+          <ref bean="org.hisp.dhis.validation.ValidationRuleGroupDeletionHandler" />
+          <ref bean="org.hisp.dhis.datavalue.DataValueDeletionHandler" />
+          <ref bean="org.hisp.dhis.datavalue.DataValueAuditDeletionHandler" />
+          <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitDeletionHandler" />
+          <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitGroupDeletionHandler" />
+          <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetDeletionHandler" />
+          <ref bean="org.hisp.dhis.user.UserDeletionHandler" />
+          <ref bean="org.hisp.dhis.user.UserGroupDeletionHandler" />
+          <ref bean="org.hisp.dhis.user.UserAuthorityGroupDeletionHandler" />
+          <ref bean="org.hisp.dhis.user.UserSettingDeletionHandler" />
+          <ref bean="org.hisp.dhis.dataelement.DataElementCategoryDeletionHandler" />
+          <ref bean="org.hisp.dhis.dataelement.DataElementGroupSetDeletionHandler" />
+          <ref bean="org.hisp.dhis.dataelement.CategoryOptionGroupDeletionHandler" />
+          <ref bean="org.hisp.dhis.dataelement.CategoryOptionGroupSetDeletionHandler" />
+          <ref bean="org.hisp.dhis.configuration.ConfigurationDeletionHandler" />
+          <ref bean="org.hisp.dhis.message.MessageConversationDeletionHandler" />
+          <ref bean="org.hisp.dhis.translation.TranslationDeletionHandler" />
+          <ref bean="org.hisp.dhis.attribute.AttributeValueDeletionHandler" />
+          <ref bean="org.hisp.dhis.mapping.MapLegendSetDeletionHandler" />
+          <ref bean="org.hisp.dhis.mapping.MapViewDeletionHandler" />
+          <ref bean="org.hisp.dhis.sms.SMSCommandDeletionHandler" />
+          <ref bean="org.hisp.dhis.sms.SMSCodesDeletionHandler" />
         </list>
       </list>
     </property>
@@ -1278,7 +1278,6 @@
   <!-- AOP definitions -->
 
   <aop:config>
-
     <aop:aspect ref="deletionInterceptor">
       <aop:before pointcut="execution( * org.hisp.dhis.dataapproval.DataApprovalLevelService.delete*(..) )" method="intercept" />
       <aop:before pointcut="execution( * org.hisp.dhis.dataelement.DataElementService.delete*(..) )" method="intercept" />

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml	2014-11-24 14:15:14 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml	2014-11-30 10:30:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <bean id="md5PasswordEncoder" class="org.springframework.security.authentication.encoding.Md5PasswordEncoder" />
 

=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/resources/META-INF/dhis/beans.xml	2013-03-04 14:44:15 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:aop="http://www.springframework.org/schema/aop"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd">
 
   <!-- DataMartEngine -->
 

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml	2014-10-23 10:07:41 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  "http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <bean id="org.hisp.dhis.dxf2.gml.GmlImportService" class="org.hisp.dhis.dxf2.gml.DefaultGmlImportService" />
 

=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF/dhis/beans.xml	2014-05-16 08:12:25 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd">
 
 	<!-- Store definitions -->
 	
@@ -113,8 +113,7 @@
 		<property name="arguments">
 			<list>
 				<list>
-					<ref
-						local="org.hisp.dhis.caseaggregation.CaseAggregationConditionDeletionHandler" />
+					<ref bean="org.hisp.dhis.caseaggregation.CaseAggregationConditionDeletionHandler" />
 				</list>
 			</list>
 		</property>

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml	2014-10-23 10:07:41 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 	<!-- ImportExportServiceManager                                    -->

=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml	2014-06-28 17:56:14 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<!-- Services -->
 

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml	2014-07-12 22:07:01 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:aop="http://www.springframework.org/schema/aop"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd">
 
   <!-- ReportTable -->
 
@@ -231,7 +231,7 @@
     <property name="arguments">
       <list>
         <list>
-          <ref local="org.hisp.dhis.common.ReportingIdentityPopulator" />
+          <ref bean="org.hisp.dhis.common.ReportingIdentityPopulator" />
         </list>
       </list>
     </property>
@@ -262,11 +262,11 @@
     <property name="arguments">
       <list>
         <list>
-          <ref local="org.hisp.dhis.report.ReportDeletionHandler" />
-          <ref local="org.hisp.dhis.reporttable.ReportTableDeletionHandler" />
-          <ref local="org.hisp.dhis.chart.ChartDeletionHandler" />
-          <ref local="org.hisp.dhis.interpretation.InterpretationDeletionHandler" />
-          <ref local="org.hisp.dhis.dashboard.impl.DashboardItemDeletionHandler" />
+          <ref bean="org.hisp.dhis.report.ReportDeletionHandler" />
+          <ref bean="org.hisp.dhis.reporttable.ReportTableDeletionHandler" />
+          <ref bean="org.hisp.dhis.chart.ChartDeletionHandler" />
+          <ref bean="org.hisp.dhis.interpretation.InterpretationDeletionHandler" />
+          <ref bean="org.hisp.dhis.dashboard.impl.DashboardItemDeletionHandler" />
         </list>
       </list>
     </property>

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/META-INF/dhis/beans.xml	2014-07-15 03:46:13 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd">
 
 	<!-- Store definitions -->
 
@@ -399,8 +399,8 @@
 		<property name="arguments">
 			<list>
 				<list>
-					<ref local="org.hisp.dhis.trackedentity.startup.TableAlteror" />
-					<ref local="org.hisp.dhis.common.TrackerIdentityPopulator" />
+					<ref bean="org.hisp.dhis.trackedentity.startup.TableAlteror" />
+					<ref bean="org.hisp.dhis.common.TrackerIdentityPopulator" />
 				</list>
 			</list>
 		</property>
@@ -517,27 +517,23 @@
 		<property name="arguments">
 			<list>
 				<list>
-					<ref
-						local="org.hisp.dhis.trackedentity.TrackedEntityInstanceDeletionHandler" />
-					<ref
-						local="org.hisp.dhis.trackedentityattributevalue.TrackedEntityAttributeValueDeletionHandler" />
-					<ref local="org.hisp.dhis.relationship.RelationshipDeletionHandler" />
-					<ref
-						local="org.hisp.dhis.trackedentity.TrackedEntityAuditDeletionHandler" />
-					<ref
-						local="org.hisp.dhis.trackedentitydatavalue.TrackedEntityDataValueDeletionHandler" />
-					<ref local="org.hisp.dhis.program.ProgramDeletionHandler" />
-					<ref local="org.hisp.dhis.program.ProgramStageDeletionHandler" />
-					<ref local="org.hisp.dhis.program.ProgramStageSectionDeletionHandler" />
-					<ref local="org.hisp.dhis.program.ProgramInstanceDeletionHandler" />
-					<ref local="org.hisp.dhis.program.ProgramStageInstanceDeletionHandler" />
-					<ref local="org.hisp.dhis.program.ProgramStageDataElementDeletionHandler" />
-					<ref local="org.hisp.dhis.program.ProgramValidationDeletionHandler" />
-					<ref local="org.hisp.dhis.program.ProgramDataEntryFormDeletionHandler" />
-					<ref local="org.hisp.dhis.program.ProgramIndicatorDeletionHandler" />
-					<ref local="org.hisp.dhis.trackedentity.TrackedEntityFormDeletionHandler" />
-					<ref local="org.hisp.dhis.eventchart.EventChartDeletionHandler" />
-					<ref local="org.hisp.dhis.eventreport.EventReportDeletionHandler" />
+					<ref bean="org.hisp.dhis.trackedentity.TrackedEntityInstanceDeletionHandler" />
+					<ref bean="org.hisp.dhis.trackedentityattributevalue.TrackedEntityAttributeValueDeletionHandler" />
+					<ref bean="org.hisp.dhis.relationship.RelationshipDeletionHandler" />
+					<ref bean="org.hisp.dhis.trackedentity.TrackedEntityAuditDeletionHandler" />
+					<ref bean="org.hisp.dhis.trackedentitydatavalue.TrackedEntityDataValueDeletionHandler" />
+					<ref bean="org.hisp.dhis.program.ProgramDeletionHandler" />
+					<ref bean="org.hisp.dhis.program.ProgramStageDeletionHandler" />
+					<ref bean="org.hisp.dhis.program.ProgramStageSectionDeletionHandler" />
+					<ref bean="org.hisp.dhis.program.ProgramInstanceDeletionHandler" />
+					<ref bean="org.hisp.dhis.program.ProgramStageInstanceDeletionHandler" />
+					<ref bean="org.hisp.dhis.program.ProgramStageDataElementDeletionHandler" />
+					<ref bean="org.hisp.dhis.program.ProgramValidationDeletionHandler" />
+					<ref bean="org.hisp.dhis.program.ProgramDataEntryFormDeletionHandler" />
+					<ref bean="org.hisp.dhis.program.ProgramIndicatorDeletionHandler" />
+					<ref bean="org.hisp.dhis.trackedentity.TrackedEntityFormDeletionHandler" />
+					<ref bean="org.hisp.dhis.eventchart.EventChartDeletionHandler" />
+					<ref bean="org.hisp.dhis.eventreport.EventReportDeletionHandler" />
 				</list>
 			</list>
 		</property>

=== modified file 'dhis-2/dhis-support/dhis-support-external/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-support/dhis-support-external/src/main/resources/META-INF/dhis/beans.xml	2014-10-11 11:23:15 +0000
+++ dhis-2/dhis-support/dhis-support-external/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
   xmlns:task="http://www.springframework.org/schema/task"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
-    http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
+    http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.0.xsd">
 
   <context:annotation-config />
 

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml	2014-07-08 14:52:55 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:tx="http://www.springframework.org/schema/tx"
   xsi:schemaLocation="
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd">
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd">
 
   <!-- Transactions -->
 

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/resources/META-INF/dhis/beans.xml	2012-12-14 13:46:47 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -2,7 +2,7 @@
 <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-3.2.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
   
   <!-- StatementManager -->
     

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-support/dhis-support-system/src/main/resources/META-INF/dhis/beans.xml	2014-08-26 08:46:50 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <bean id="org.hisp.dhis.system.startup.StartupRoutineExecutor" class="org.hisp.dhis.system.startup.DefaultStartupRoutineExecutor" />
 

=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/beans.xml	2014-07-07 06:29:46 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<!-- Root Context: defines shared resources visible to all other web components -->
 

=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml	2014-08-05 03:49:39 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml	2014-11-30 10:30:06 +0000
@@ -2,8 +2,8 @@
 <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:context="http://www.springframework.org/schema/context"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd">
 
   <context:component-scan base-package="org.hisp.dhis.api.mobile" />
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementOperandController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementOperandController.java	2014-10-04 02:30:53 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementOperandController.java	2014-11-30 10:30:06 +0000
@@ -35,6 +35,7 @@
 import org.hisp.dhis.dataelement.DataElementCategoryService;
 import org.hisp.dhis.dataelement.DataElementGroup;
 import org.hisp.dhis.dataelement.DataElementOperand;
+import org.hisp.dhis.dataelement.DataElementOperandService;
 import org.hisp.dhis.schema.descriptors.DataElementOperandSchemaDescriptor;
 import org.hisp.dhis.webapi.controller.AbstractCrudController;
 import org.hisp.dhis.webapi.webdomain.WebMetaData;
@@ -55,7 +56,7 @@
 public class DataElementOperandController extends AbstractCrudController<DataElementOperand>
 {
     @Autowired
-    private DataElementCategoryService categoryService;
+    private DataElementCategoryService dataElementCategoryService;
 
     @Override
     protected List<DataElementOperand> getEntityList( WebMetaData metaData, WebOptions options, List<String> filters )
@@ -86,12 +87,12 @@
             if ( deGroup != null )
             {
                 DataElementGroup dataElementGroup = manager.get( DataElementGroup.class, deGroup );
-                dataElementOperands = new ArrayList<>( categoryService.getFullOperands( dataElementGroup.getMembers() ) );
+                dataElementOperands = new ArrayList<>( dataElementCategoryService.getFullOperands( dataElementGroup.getMembers() ) );
             }
             else
             {
                 List<DataElement> dataElements = new ArrayList<>( manager.getAllSorted( DataElement.class ) );
-                dataElementOperands = new ArrayList<>( categoryService.getFullOperands( dataElements ) );
+                dataElementOperands = new ArrayList<>( dataElementCategoryService.getFullOperands( dataElements ) );
             }
         }
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.xml	2014-07-07 10:06:36 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	
   <bean id="contextUtils" class="org.hisp.dhis.webapi.utils.ContextUtils"/>
   <bean id="inputUtils" class="org.hisp.dhis.webapi.utils.InputUtils" />

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml	2014-11-17 07:37:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml	2014-11-30 10:30:06 +0000
@@ -4,10 +4,10 @@
   xmlns:context="http://www.springframework.org/schema/context"
   xmlns:mvc="http://www.springframework.org/schema/mvc"
   xmlns:sec="http://www.springframework.org/schema/security"
-  xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
     http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd">
 
   <sec:global-method-security pre-post-annotations="enabled" />
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2014-09-09 07:13:50 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<!-- Data Entry -->
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2014-11-26 15:32:32 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+		http://www.springframework.org/schema/beans	http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <!-- Web Portal -->
 
@@ -48,7 +48,7 @@
 
   <bean id="org.hisp.dhis.webportal.module.CurrentModuleDetectorFilter" class="org.hisp.dhis.webportal.module.CurrentModuleDetectorFilter">
     <property name="moduleManager">
-      <ref local="org.hisp.dhis.webportal.module.ModuleManager" />
+      <ref bean="org.hisp.dhis.webportal.module.ModuleManager" />
     </property>
   </bean>
 
@@ -73,7 +73,7 @@
   <bean id="org.hisp.dhis.webportal.interceptor.XWorkPortalModuleInterceptor"
     class="org.hisp.dhis.webportal.interceptor.XWorkPortalModuleInterceptor">
     <property name="moduleManager">
-      <ref local="org.hisp.dhis.webportal.module.ModuleManager" />
+      <ref bean="org.hisp.dhis.webportal.module.ModuleManager" />
     </property>
   </bean>
 
@@ -86,7 +86,7 @@
   <bean id="org.hisp.dhis.webportal.interceptor.XWorkPortalMenuInterceptor"
     class="org.hisp.dhis.webportal.interceptor.XWorkPortalMenuInterceptor">
     <property name="menuStateManager">
-      <ref local="org.hisp.dhis.webportal.menu.MenuStateManager" />
+      <ref bean="org.hisp.dhis.webportal.menu.MenuStateManager" />
     </property>
   </bean>
 
@@ -116,10 +116,10 @@
   <bean id="org.hisp.dhis.ouwt.interceptor.OrganisationUnitTreeInterceptor"
     class="org.hisp.dhis.ouwt.interceptor.OrganisationUnitTreeInterceptor">
     <property name="selectionManager">
-      <ref local="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
+      <ref bean="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
     </property>
     <property name="treeStateManager">
-      <ref local="org.hisp.dhis.ouwt.manager.TreeStateManager" />
+      <ref bean="org.hisp.dhis.ouwt.manager.TreeStateManager" />
     </property>
   </bean>
 
@@ -127,7 +127,7 @@
     scope="prototype">
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
     <property name="treeStateManager">
-      <ref local="org.hisp.dhis.ouwt.manager.TreeStateManager" />
+      <ref bean="org.hisp.dhis.ouwt.manager.TreeStateManager" />
     </property>
   </bean>
 
@@ -135,17 +135,17 @@
     scope="prototype">
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
     <property name="treeStateManager">
-      <ref local="org.hisp.dhis.ouwt.manager.TreeStateManager" />
+      <ref bean="org.hisp.dhis.ouwt.manager.TreeStateManager" />
     </property>
   </bean>
 
   <bean id="org.hisp.dhis.ouwt.action.GetExpandedTreeAction" class="org.hisp.dhis.ouwt.action.GetExpandedTreeAction"
     scope="prototype">
     <property name="selectionManager">
-      <ref local="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
+      <ref bean="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
     </property>
     <property name="treeStateManager">
-      <ref local="org.hisp.dhis.ouwt.manager.TreeStateManager" />
+      <ref bean="org.hisp.dhis.ouwt.manager.TreeStateManager" />
     </property>
   </bean>
 
@@ -159,7 +159,7 @@
     scope="prototype">
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
     <property name="selectionManager">
-      <ref local="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
+      <ref bean="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
     </property>
   </bean>
 
@@ -173,7 +173,7 @@
     scope="prototype">
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
     <property name="selectionManager">
-      <ref local="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
+      <ref bean="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
     </property>
   </bean>
 
@@ -182,7 +182,7 @@
     scope="prototype">
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
     <property name="selectionManager">
-      <ref local="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
+      <ref bean="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
     </property>
   </bean>
 
@@ -205,7 +205,7 @@
   <bean id="org.hisp.dhis.oust.action.GetExpandedTreeAction" class="org.hisp.dhis.oust.action.GetExpandedTreeAction"
     scope="prototype">
     <property name="selectionTreeManager">
-      <ref local="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+      <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
     </property>
   </bean>
 
@@ -213,7 +213,7 @@
     scope="prototype">
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
     <property name="selectionTreeManager">
-      <ref local="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+      <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
     </property>
   </bean>
 
@@ -222,7 +222,7 @@
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
     <property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
     <property name="selectionTreeManager">
-      <ref local="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+      <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
     </property>
   </bean>
 
@@ -232,7 +232,7 @@
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
     <property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
     <property name="selectionTreeManager">
-      <ref local="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+      <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
     </property>
   </bean>
 
@@ -240,7 +240,7 @@
     scope="prototype">
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
     <property name="selectionTreeManager">
-      <ref local="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+      <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
     </property>
   </bean>
 
@@ -248,7 +248,7 @@
     class="org.hisp.dhis.oust.action.ClearSelectedOrganisationUnitsAction"
     scope="prototype">
     <property name="selectionTreeManager">
-      <ref local="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+      <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
     </property>
   </bean>
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml	2014-11-03 12:28:28 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml	2014-11-30 10:30:06 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:sec="http://www.springframework.org/schema/security"
   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-3.2.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
     http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd">
 
   <bean id="mappedRedirectStrategy" class="org.hisp.dhis.security.MappedRedirectStrategy">
@@ -136,10 +136,10 @@
   <bean id="accessDecisionManager" class="org.hisp.dhis.security.vote.LogicalOrAccessDecisionManager">
     <property name="accessDecisionManagers">
       <list>
-        <ref local="adminAccessDecisionVoting" />
-        <ref local="regularAccessDecisionVoting" />
-        <ref local="webAccessDecisionVoting" />
-        <ref local="externalAccessDecisionVoting" />
+        <ref bean="adminAccessDecisionVoting" />
+        <ref bean="regularAccessDecisionVoting" />
+        <ref bean="webAccessDecisionVoting" />
+        <ref bean="externalAccessDecisionVoting" />
       </list>
     </property>
   </bean>
@@ -147,7 +147,7 @@
   <bean id="adminAccessDecisionVoting" class="org.springframework.security.access.vote.UnanimousBased">
     <constructor-arg name="decisionVoters">
       <list>
-        <ref local="adminAccessVoter" />
+        <ref bean="adminAccessVoter" />
       </list>
     </constructor-arg>
   </bean>
@@ -159,7 +159,7 @@
   <bean id="webAccessDecisionVoting" class="org.springframework.security.access.vote.UnanimousBased">
     <constructor-arg name="decisionVoters">
       <list>
-        <ref local="webExpressionVoter" />
+        <ref bean="webExpressionVoter" />
       </list>
     </constructor-arg>
   </bean>
@@ -167,7 +167,7 @@
   <bean id="externalAccessDecisionVoting" class="org.springframework.security.access.vote.UnanimousBased">
     <constructor-arg name="decisionVoters">
       <list>
-        <ref local="externalAccessVoter" />
+        <ref bean="externalAccessVoter" />
       </list>
     </constructor-arg>
   </bean>
@@ -175,9 +175,9 @@
   <bean id="regularAccessDecisionVoting" class="org.springframework.security.access.vote.UnanimousBased">
     <constructor-arg name="decisionVoters">
       <list>
-        <ref local="actionAccessVoter" />
-        <ref local="moduleAccessVoter" />
-        <ref local="authenticatedVoter" />
+        <ref bean="actionAccessVoter" />
+        <ref bean="moduleAccessVoter" />
+        <ref bean="authenticatedVoter" />
       </list>
     </constructor-arg>
   </bean>

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/META-INF/dhis/beans.xml	2014-11-26 15:32:32 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <!-- Dashboard -->
 

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml	2014-11-17 17:24:22 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <!-- Actions -->
 

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml	2014-10-15 04:17:05 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <!-- Data value import -->
 

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml	2014-07-08 03:47:02 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -2,7 +2,7 @@
 <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-3.2.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<!-- Utils / services -->
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/META-INF/dhis/beans.xml	2013-09-03 15:24:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <bean id="org.hisp.dhis.appmanager.action.NoAction" class="org.hisp.dhis.appmanager.action.NoAction" scope="prototype" />
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml	2014-08-03 07:05:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <!-- Maintenance -->
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml	2014-10-15 04:17:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <!-- Data Element -->
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml	2014-09-16 16:40:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 		
 	<!-- Section -->
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/META-INF/dhis/beans.xml	2014-10-23 16:38:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<bean id="org.hisp.dhis.mobile.action.incoming.ReimportSMSAction"
 		class="org.hisp.dhis.mobile.action.incoming.ReimportSMSAction"

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/META-INF/dhis/beans.xml	2014-09-29 18:29:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <bean id="org.hisp.dhis.oum.action.NoAction" class="org.hisp.dhis.oum.action.NoAction" scope="prototype" />
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml	2014-10-06 10:11:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<!-- RelationshipType -->
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml	2014-11-14 11:34:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <!-- System settings -->
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/META-INF/dhis/beans.xml	2014-11-26 15:32:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <bean id="org.hisp.dhis.user.action.NoAction" class="org.hisp.dhis.user.action.NoAction" scope="prototype" />
 

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/resources/META-INF/dhis/beans.xml	2012-12-14 13:46:47 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 </beans>

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/resources/META-INF/dhis/mobile.xml'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/resources/META-INF/dhis/mobile.xml	2013-07-01 10:38:59 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/resources/META-INF/dhis/mobile.xml	2014-11-30 10:30:06 +0000
@@ -3,9 +3,9 @@
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:context="http://www.springframework.org/schema/context"
   xmlns:mvc="http://www.springframework.org/schema/mvc"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
-    http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
+    http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
     ">
 
   <context:component-scan base-package="org.hisp.dhis.web.mobile" />

=== modified file 'dhis-2/dhis-web/dhis-web-ohie/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-ohie/src/main/resources/META-INF/dhis/beans.xml	2014-01-15 13:02:27 +0000
+++ dhis-2/dhis-web/dhis-web-ohie/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -2,6 +2,6 @@
 <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-3.2.xsd">
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 </beans>

=== modified file 'dhis-2/dhis-web/dhis-web-ohie/src/main/resources/META-INF/dhis/webapi-ohie.xml'
--- dhis-2/dhis-web/dhis-web-ohie/src/main/resources/META-INF/dhis/webapi-ohie.xml	2014-04-23 10:19:42 +0000
+++ dhis-2/dhis-web/dhis-web-ohie/src/main/resources/META-INF/dhis/webapi-ohie.xml	2014-11-30 10:30:06 +0000
@@ -5,10 +5,10 @@
   xmlns:sec="http://www.springframework.org/schema/security"
   xmlns:mvc="http://www.springframework.org/schema/mvc"
   xsi:schemaLocation="
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
     http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-    http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
+    http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd">
 
   <sec:global-method-security pre-post-annotations="enabled" />
 

=== modified file 'dhis-2/dhis-web/dhis-web-portal/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-portal/src/main/resources/META-INF/dhis/beans.xml	2012-12-14 13:46:47 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     <property name="targetClass" value="java.lang.System" />

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml	2014-10-23 20:45:00 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <bean id="org.hisp.dhis.reporting.action.NoAction" class="org.hisp.dhis.reporting.action.NoAction" />
 

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-sms/src/main/resources/META-INF/dhis/beans.xml	2014-05-15 03:44:47 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <bean id="org.hisp.dhis.sms.input.SMSInputAction" 
     class="org.hisp.dhis.sms.input.SMSInputAction" 

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/META-INF/dhis/beans.xml	2014-10-13 16:03:06 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/META-INF/dhis/beans.xml	2014-11-30 10:30:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-3.2.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
   <bean id="org.hisp.dhis.validationrule.action.NoAction" class="org.hisp.dhis.validationrule.action.NoAction">
   </bean>