=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/DefaultDataPruneService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/DefaultDataPruneService.java	2010-09-06 14:54:16 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/DefaultDataPruneService.java	2010-09-17 12:11:18 +0000
@@ -30,10 +30,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -55,9 +55,13 @@
         this.organisationUnitService = organisationUnitService;
     }
 
-    @Autowired
     private DataPruneStore dataPruneStore;
 
+    public void setDataPruneStore( DataPruneStore dataPruneStore )
+    {
+        this.dataPruneStore = dataPruneStore;
+    }
+
     // -------------------------------------------------------------------------
     // DataPruneService implementation
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java	2010-09-06 14:54:16 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java	2010-09-17 12:11:18 +0000
@@ -37,14 +37,11 @@
 import org.hisp.dhis.system.util.TextUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
 
 /**
  * @author Quang Nguyen
  * @version Apr 6, 2010 5:48:15 PM
  */
-
-@Component
 public class JdbcDataPruneStore implements DataPruneStore
 {
     private static final Log log = LogFactory.getLog( JdbcDataPruneStore.class );

=== 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	2010-09-17 03:44:03 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml	2010-09-17 12:11:18 +0000
@@ -117,6 +117,12 @@
     class="org.hisp.dhis.dataprune.DefaultDataPruneService">
     <property name="organisationUnitService"
       ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+	<property name="dataPruneStore"
+	  ref="org.hisp.dhis.dataprune.DataPruneStore"/>
+  </bean> 
+  
+  <bean id="org.hisp.dhis.dataprune.DataPruneStore"
+    class="org.hisp.dhis.dataprune.jdbc.JdbcDataPruneStore">
   </bean> 
   
   <!-- Data archive -->

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/LocManagerXSLTLocator.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/LocManagerXSLTLocator.java	2010-07-08 20:31:49 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/LocManagerXSLTLocator.java	2010-09-17 12:11:18 +0000
@@ -29,6 +29,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+
 import org.amplecode.staxwax.framework.XPathFilter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -37,7 +38,6 @@
 import org.hisp.dhis.importexport.ImportException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.stereotype.Component;
 import org.w3c.dom.Node;
 
 /**
@@ -49,7 +49,6 @@
  * @author bobj
  * @version created 30-Apr-2010
  */
-@Component( "location-manager-xslt-locator" )
 public class LocManagerXSLTLocator
     implements XSLTLocator
 {

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/XMLPreConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/XMLPreConverter.java	2010-08-11 14:58:23 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/XMLPreConverter.java	2010-09-17 12:11:18 +0000
@@ -49,14 +49,12 @@
 import org.apache.commons.logging.LogFactory;
 import org.hisp.dhis.importexport.ImportException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 /**
  * GenericXMLConvertor transforms imported foreign XML to dxf.
  * 
  * @author bobj
  */
-@Component("preConverter")
 public class XMLPreConverter
 {
     private final Log log = LogFactory.getLog( XMLPreConverter.class );

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipAnalyzer.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipAnalyzer.java	2010-07-14 13:27:39 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipAnalyzer.java	2010-09-17 12:11:18 +0000
@@ -35,12 +35,9 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import org.springframework.stereotype.Component;
-
 /**
  * @author bobj
  */
-@Component("zipAnalyzer")
 public class ZipAnalyzer
 {
     /**

=== 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	2010-09-01 07:30:48 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml	2010-09-17 12:11:18 +0000
@@ -261,9 +261,13 @@
 	<!-- XSLT based import                                                    -->
 	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+	<bean id="xsltLocator" class="org.hisp.dhis.importexport.xml.LocManagerXSLTLocator"/>
+	
+	<bean id="preConverter" class="org.hisp.dhis.importexport.xml.XMLPreConverter"/>
+
     <bean id="org.hisp.dhis.importexport.invoker.ConverterInvoker"
           class="org.hisp.dhis.importexport.invoker.DefaultConverterInvoker" />
-
+		  
 	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 	<!-- DXF Export                                                    -->
 	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

=== modified file 'dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/configuration/DefaultConfigurationManager.java'
--- dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/configuration/DefaultConfigurationManager.java	2010-05-17 20:22:43 +0000
+++ dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/configuration/DefaultConfigurationManager.java	2010-09-17 12:11:18 +0000
@@ -39,7 +39,6 @@
  * @author Lars Helge Overland
  * @version $Id$
  */
-@Component("configurationManager")
 public class DefaultConfigurationManager<T>
     implements ConfigurationManager<T>
 {

=== modified file 'dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManagerResolver.java'
--- dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManagerResolver.java	2010-05-17 21:11:03 +0000
+++ dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManagerResolver.java	2010-09-17 12:11:18 +0000
@@ -37,14 +37,11 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 /**
- * 
  * @author bobj
  * @version created 12-Feb-2010
  */
-@Component("dhisResolver")
 public class DefaultLocationManagerResolver
     implements URIResolver
 {

=== 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	2010-09-03 04:31:57 +0000
+++ dhis-2/dhis-support/dhis-support-external/src/main/resources/META-INF/dhis/beans.xml	2010-09-17 12:11:18 +0000
@@ -8,7 +8,11 @@
     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
     http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
 
-  <context:component-scan base-package="org.hisp.dhis"/>
+  <context:annotation-config/>
+
+  <bean id="configurationManager" class="org.hisp.dhis.external.configuration.DefaultConfigurationManager"/>
+  
+  <bean id="dhisResolver" class="org.hisp.dhis.external.location.DefaultLocationManagerResolver"/>
   
   <bean id="locationManager" class="org.hisp.dhis.external.location.DefaultLocationManager" init-method="init">
     <property name="environmentVariable" value="DHIS2_HOME"/> <!-- Change environment variable -->

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/cache/DefaultHibernateCacheManager.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/cache/DefaultHibernateCacheManager.java	2010-05-27 10:18:46 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/cache/DefaultHibernateCacheManager.java	2010-09-17 12:11:18 +0000
@@ -30,13 +30,11 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.stat.Statistics;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 /**
  * @author Lars Helge Overland
  * @version $Id: CrossTabDataValue.java 5514 2008-08-04 10:48:07Z larshelg $
  */
-@Component("cacheManager")
 public class DefaultHibernateCacheManager
     implements HibernateCacheManager
 {

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java	2010-05-27 10:18:46 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java	2010-09-17 12:11:18 +0000
@@ -40,7 +40,6 @@
  * @author Lars Helge Overland
  * @version $Id$
  */
-@Component("dbmsManager")
 public class HibernateDbmsManager
     implements DbmsManager
 {

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/DefaultHibernateConfigurationProvider.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/DefaultHibernateConfigurationProvider.java	2010-05-17 21:31:03 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/DefaultHibernateConfigurationProvider.java	2010-09-17 12:11:18 +0000
@@ -48,13 +48,11 @@
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
-import org.springframework.stereotype.Component;
 import org.springframework.util.ResourceUtils;
 
 /**
  * @author Torgeir Lorange Ostby
  */
-@Component("hibernateConfigurationProvider")
 public class DefaultHibernateConfigurationProvider
     implements HibernateConfigurationProvider
 {

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingDirectoryLocationsFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingDirectoryLocationsFactoryBean.java	2010-05-17 21:31:03 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingDirectoryLocationsFactoryBean.java	2010-09-17 12:11:18 +0000
@@ -30,13 +30,11 @@
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
-import org.springframework.stereotype.Component;
 
 /**
  * @author Lars Helge Overland
  * @version $Id$
  */
-@Component("hibernateMappingDirectoryLocations")
 public class HibernateMappingDirectoryLocationsFactoryBean 
     implements FactoryBean<Object[]>
 {    

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingJarLocationsFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingJarLocationsFactoryBean.java	2010-05-17 21:31:03 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingJarLocationsFactoryBean.java	2010-09-17 12:11:18 +0000
@@ -30,13 +30,11 @@
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
-import org.springframework.stereotype.Component;
 
 /**
  * @author Lars Helge Overland
  * @version $Id$
  */
-@Component("hibernateMappingJarLocations")
 public class HibernateMappingJarLocationsFactoryBean
     implements FactoryBean<Object[]>
 {

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernatePropertiesFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernatePropertiesFactoryBean.java	2010-05-17 21:31:03 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernatePropertiesFactoryBean.java	2010-09-17 12:11:18 +0000
@@ -31,13 +31,11 @@
 
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 /**
  * @author Lars Helge Overland
  * @version $Id$
  */
-@Component("hibernateProperties")
 public class HibernatePropertiesFactoryBean
     implements FactoryBean<Properties>
 {

=== 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	2010-08-25 19:53:05 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml	2010-09-17 12:11:18 +0000
@@ -19,6 +19,18 @@
 
   <!-- Configuration -->
 
+  <bean id="cacheManager" class="org.hisp.dhis.cache.DefaultHibernateCacheManager"/>
+  
+  <bean id="dbmsManager" class="org.hisp.dhis.dbms.HibernateDbmsManager"/>
+  
+  <bean id="hibernateConfigurationProvider" class="org.hisp.dhis.hibernate.DefaultHibernateConfigurationProvider"/>
+  
+  <bean id="hibernateMappingDirectoryLocations" class="org.hisp.dhis.hibernate.HibernateMappingDirectoryLocationsFactoryBean"/>
+  
+  <bean id="hibernateMappingJarLocations" class="org.hisp.dhis.hibernate.HibernateMappingJarLocationsFactoryBean"/>
+  
+  <bean id="hibernateProperties" class="org.hisp.dhis.hibernate.HibernatePropertiesFactoryBean"/>
+
   <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
     <property name="dataSource" ref="dataSource"/>
     <property name="hibernateProperties" ref="hibernateProperties"/>

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/HibernateDatabaseInfoProvider.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/HibernateDatabaseInfoProvider.java	2010-08-25 19:53:05 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/HibernateDatabaseInfoProvider.java	2010-09-17 12:11:18 +0000
@@ -38,7 +38,6 @@
  * @author Lars Helge Overland
  * @version $Id$
  */
-@Component("databaseInfoProvider")
 public class HibernateDatabaseInfoProvider
     implements DatabaseInfoProvider
 {

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DefaultDeletionManager.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DefaultDeletionManager.java	2010-05-17 22:56:52 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DefaultDeletionManager.java	2010-09-17 12:11:18 +0000
@@ -44,7 +44,6 @@
  * @author Lars Helge Overland
  * @version $Id$
  */
-@Component("deletionManager")
 public class DefaultDeletionManager
     implements DeletionManager
 {

=== 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	2010-05-18 13:42:38 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/resources/META-INF/dhis/beans.xml	2010-09-17 12:11:18 +0000
@@ -4,15 +4,14 @@
        xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
   
-  <bean id="org.hisp.dhis.system.startup.StartupRoutineExecutor"
-    class="org.hisp.dhis.system.startup.DefaultStartupRoutineExecutor"/>
+  <bean id="org.hisp.dhis.system.startup.StartupRoutineExecutor" class="org.hisp.dhis.system.startup.DefaultStartupRoutineExecutor"/>
   
-  <bean id="processCoordinator" 
-    class="org.amplecode.cave.process.SpringProcessCoordinator"
-    destroy-method="close"/>
+  <bean id="processCoordinator" class="org.amplecode.cave.process.SpringProcessCoordinator" destroy-method="close"/>
 
-  <bean id="deletionInterceptor"
-    class="org.hisp.dhis.system.deletion.DeletionInterceptor">
-  </bean>
+  <bean id="deletionInterceptor" class="org.hisp.dhis.system.deletion.DeletionInterceptor"/>
+  
+  <bean id="deletionManager" class="org.hisp.dhis.system.deletion.DefaultDeletionManager"/>
+  
+  <bean id="databaseInfoProvider" class="org.hisp.dhis.system.database.HibernateDatabaseInfoProvider"/>
     
 </beans>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/interceptor/OrganisationUnitTreeInterceptor.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/interceptor/OrganisationUnitTreeInterceptor.java	2010-09-14 09:03:41 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/interceptor/OrganisationUnitTreeInterceptor.java	2010-09-17 12:11:18 +0000
@@ -36,12 +36,11 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.hisp.dhis.interceptor.AbstractPreResultListener;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
 import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager;
 import org.hisp.dhis.ouwt.manager.TreeStateManager;
-import org.hisp.dhis.user.CurrentUserService;
-import org.hisp.dhis.interceptor.AbstractPreResultListener;
 
 import com.opensymphony.xwork2.ActionInvocation;
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupAction.java	2010-09-14 09:03:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupAction.java	2010-09-17 12:11:18 +0000
@@ -30,7 +30,6 @@
 import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
 import org.hisp.dhis.oust.manager.SelectionTreeManager;
-import org.hisp.dhis.user.CurrentUserService;
 
 import com.opensymphony.xwork2.ActionSupport;