Merge lp:~dhis2-devs-core/dhis2/spring-hibernate-struts-upgrade into lp:dhis2

[Jo Størset]

Bumped all frameworks to newest version, seems to survive cursory testing.

=== modified file 'dhis-2/dhis-api/pom.xml'
--- dhis-2/dhis-api/pom.xml	2010-04-08 16:55:35 +0000
+++ dhis-2/dhis-api/pom.xml	2010-05-07 11:16:36 +0000
@@ -1,26 +1,26 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  
-  <parent>
-    <groupId>org.hisp.dhis</groupId>
-    <artifactId>dhis</artifactId>
-    <version>2.0.5-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>dhis-api</artifactId>
-  <packaging>jar</packaging>
-  <name>DHIS API</name>
-  
-  <dependencies>    
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-  </dependencies>
-  
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+    <groupId>org.hisp.dhis</groupId>
+    <artifactId>dhis</artifactId>
+    <version>2.0.5-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>dhis-api</artifactId>
+  <packaging>jar</packaging>
+  <name>DHIS API</name>
+  
+  <dependencies>    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+  </dependencies>
+  
   <properties>
     <rootDir>../</rootDir>
   </properties>
-</project>
+</project>

=== modified file 'dhis-2/dhis-services/dhis-service-core/pom.xml'
--- dhis-2/dhis-services/dhis-service-core/pom.xml	2010-04-22 14:06:28 +0000
+++ dhis-2/dhis-services/dhis-service-core/pom.xml	2010-05-07 11:16:36 +0000
@@ -1,87 +1,83 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.hisp.dhis</groupId>
-    <artifactId>dhis-services</artifactId>
-    <version>2.0.5-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>dhis-service-core</artifactId>
-  <packaging>jar</packaging>
-  <name>DHIS Core API Implementations</name>
-
-  <dependencies>
-
-    <!-- DHIS -->
-
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-support-hibernate</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-support-test</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-support-system</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-support-external</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-support-jdbc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-support-i18n</artifactId>
-    </dependency>
-
-    <!-- Spring Security -->
-    
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-core-tiger</artifactId>
-    </dependency>
-    
-    <!-- Other -->
-
-    <dependency>
-      <groupId>jep</groupId>
-      <artifactId>jep</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-    </dependency>
-      
-  </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.hisp.dhis</groupId>
+    <artifactId>dhis-services</artifactId>
+    <version>2.0.5-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>dhis-service-core</artifactId>
+  <packaging>jar</packaging>
+  <name>DHIS Core API Implementations</name>
+
+  <dependencies>
+
+    <!-- DHIS -->
+
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-support-hibernate</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-support-test</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-support-system</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-support-external</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-support-jdbc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-support-i18n</artifactId>
+    </dependency>
+
+    <!-- Spring Security -->
+    
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+    </dependency>
+    
+    <!-- Other -->
+
+    <dependency>
+      <groupId>jep</groupId>
+      <artifactId>jep</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+    </dependency>
+      
+  </dependencies>
   <properties>
     <rootDir>../../</rootDir>
   </properties>
-</project>
+</project>

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2010-05-04 06:47:28 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2010-05-07 11:16:36 +0000
@@ -27,10 +27,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 import static org.hisp.dhis.i18n.I18nUtils.i18n;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -51,7 +53,6 @@
 import org.hisp.dhis.system.util.UUIdUtils;
 import org.springframework.transaction.annotation.Transactional;
 
-import edu.emory.mathcs.backport.java.util.Collections;
 
 /**
  * @author Kristian Nordal

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUsernameSaltSource.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUsernameSaltSource.java	2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUsernameSaltSource.java	2010-05-07 11:16:36 +0000
@@ -27,7 +27,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import  org.springframework.security.userdetails.UserDetails;
+import  org.springframework.security.core.userdetails.UserDetails;
 
 /**
  * @author Torgeir Lorange Ostby

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/UsernameSaltSource.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/UsernameSaltSource.java	2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/UsernameSaltSource.java	2010-05-07 11:16:36 +0000
@@ -27,7 +27,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import  org.springframework.security.providers.dao.SaltSource;
+import  org.springframework.security.authentication.dao.SaltSource;
 
 /**
  * This interface adds a method for getting a salt based on a username. The

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/hibernate/HibernateUserDetailsService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/hibernate/HibernateUserDetailsService.java	2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/hibernate/HibernateUserDetailsService.java	2010-05-07 11:16:36 +0000
@@ -30,11 +30,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import  org.springframework.security.GrantedAuthority;
-import  org.springframework.security.GrantedAuthorityImpl;
-import  org.springframework.security.userdetails.UserDetails;
-import  org.springframework.security.userdetails.UserDetailsService;
-import  org.springframework.security.userdetails.UsernameNotFoundException;
 import org.hibernate.Criteria;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
@@ -42,6 +37,12 @@
 import org.hisp.dhis.user.UserAuthorityGroup;
 import org.hisp.dhis.user.UserCredentials;
 import org.springframework.dao.DataAccessException;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -80,7 +81,7 @@
 
         GrantedAuthority[] authorities = getGrantedAuthorities( credentials );
 
-        return new  org.springframework.security.userdetails.User( credentials.getUsername(), credentials.getPassword(), true,
+        return new User( credentials.getUsername(), credentials.getPassword(), true,
             true, true, true, authorities );
     }
 

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/AbstractSpringSecurityCurrentUserService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/AbstractSpringSecurityCurrentUserService.java	2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/AbstractSpringSecurityCurrentUserService.java	2010-05-07 11:16:36 +0000
@@ -28,9 +28,9 @@
  */
 
 import org.hisp.dhis.user.CurrentUserService;
-import org.springframework.security.Authentication;
-import org.springframework.security.context.SecurityContextHolder;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
 
 /**
  * @author Torgeir Lorange Ostby

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/SpringSecurityPasswordManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/SpringSecurityPasswordManager.java	2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/SpringSecurityPasswordManager.java	2010-05-07 11:16:36 +0000
@@ -29,7 +29,7 @@
 
 import org.hisp.dhis.security.PasswordManager;
 import org.hisp.dhis.security.UsernameSaltSource;
-import org.springframework.security.providers.encoding.PasswordEncoder;
+import org.springframework.security.authentication.encoding.PasswordEncoder;
 
 /**
  * @author Torgeir Lorange Ostby

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/vote/AllRequiredRoleVoter.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/vote/AllRequiredRoleVoter.java	2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/vote/AllRequiredRoleVoter.java	2010-05-07 11:16:36 +0000
@@ -29,18 +29,18 @@
 
 import java.util.Collection;
 
-import org.springframework.security.Authentication;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.ConfigAttributeDefinition;
-import org.springframework.security.vote.RoleVoter;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.vote.RoleVoter;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
 
 /**
- * RoleVoter which requires all  org.springframework.security.ConfigAttributes to be granted
- * authorities, given that the ConfigAttributes have the specified prefix
- * ("ROLE_" by default). If there are no supported ConfigAttributes it abstains
- * from voting.
+ * RoleVoter which requires all org.springframework.security.ConfigAttributes to
+ * be granted authorities, given that the ConfigAttributes have the specified
+ * prefix ("ROLE_" by default). If there are no supported ConfigAttributes it
+ * abstains from voting.
  * 
- * @see  org.springframework.security.vote.RoleVoter
+ * @see org.springframework.security.access.vote.RoleVoter
  * 
  * @author Torgeir Lorange Ostby
  * @version $Id: AllRequiredRoleVoter.java 6070 2008-10-28 17:49:23Z larshelg $
@@ -48,13 +48,10 @@
 public class AllRequiredRoleVoter
     extends RoleVoter
 {
-    public int vote( Authentication authentication, Object object, ConfigAttributeDefinition config )
+    public int vote( Authentication authentication, Object object, Collection<ConfigAttribute> attributes )
     {
         int supported = 0;
 
-        @SuppressWarnings( "unchecked" )
-        Collection<ConfigAttribute> attributes = config.getConfigAttributes();
-
         for ( ConfigAttribute attribute : attributes )
         {
             if ( this.supports( attribute ) )
@@ -62,9 +59,9 @@
                 ++supported;
                 boolean found = false;
 
-                for ( int i = 0; i < authentication.getAuthorities().length; i++ )
+                for ( GrantedAuthority authority : authentication.getAuthorities() )
                 {
-                    if ( attribute.getAttribute().equals( authentication.getAuthorities()[i].getAuthority() ) )
+                    if ( attribute.getAttribute().equals( authority ) )
                     {
                         found = true;
                         break;

=== 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	2010-05-04 06:47:28 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2010-05-07 11:16:36 +0000
@@ -1,837 +1,837 @@
-<?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-2.0.xsd
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
-  
-  <!-- Store definitions -->
-  
-  <bean id="org.hisp.dhis.dataentryform.DataEntryFormAssociationStore"
-    class="org.hisp.dhis.dataentryform.hibernate.HibernateDataEntryFormAssociationStore">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-  
-   <bean id="org.hisp.dhis.dataentryform.DataEntryFormStore"
-    class="org.hisp.dhis.dataentryform.hibernate.HibernateDataEntryFormStore">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-
-  <bean id="org.hisp.dhis.customvalue.CustomValueStore"
-    class="org.hisp.dhis.customvalue.hibernate.HibernateCustomValueStore">
-    <property name="clazz" value="org.hisp.dhis.customvalue.CustomValue"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-
-  <bean id="org.hisp.dhis.dataelement.DataElementStore"
-    class="org.hisp.dhis.dataelement.hibernate.HibernateDataElementStore">
-    <property name="sessionFactory" ref="sessionFactory"/>
-	<property name="statementManager" ref="statementManager"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataelement.DataElementGroupStore"
-    class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementGroup"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataelement.DataElementGroupSetStore"
-    class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementGroupSet"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.datadictionary.DataDictionaryStore"
-    class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.datadictionary.DataDictionary"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.datavalue.DataValueStore"
-    class="org.hisp.dhis.datavalue.hibernate.HibernateDataValueStore">
-    <property name="sessionFactory" ref="sessionFactory"/>
-    <property name="statementManager" ref="statementManager"/>
-    <property name="periodStore" ref="org.hisp.dhis.period.PeriodStore"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.indicator.IndicatorStore"
-    class="org.hisp.dhis.indicator.hibernate.HibernateIndicatorStore">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-	
-  <bean id="org.hisp.dhis.indicator.IndicatorTypeStore"
-    class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.indicator.IndicatorType"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-    
-  <bean id="org.hisp.dhis.indicator.IndicatorGroupStore"
-    class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.indicator.IndicatorGroup"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-    
-  <bean id="org.hisp.dhis.indicator.IndicatorGroupSetStore"
-    class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.indicator.IndicatorGroupSet"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-    
-  <bean id="org.hisp.dhis.period.PeriodStore"
-    class="org.hisp.dhis.period.hibernate.HibernatePeriodStore">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.source.SourceStore"
-    class="org.hisp.dhis.source.hibernate.HibernateSourceStore">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataset.DataSetStore"
-    class="org.hisp.dhis.dataset.hibernate.HibernateDataSetStore">
-    <property name="sessionFactory" ref="sessionFactory"/>
-    <property name="periodStore"
-      ref="org.hisp.dhis.period.PeriodStore"/>
-  </bean>
-
-  <bean id="org.hisp.dhis.dataset.CompleteDataSetRegistrationStore"
-    class="org.hisp.dhis.dataset.hibernate.HibernateCompleteDataSetRegistrationStore"> 
-    <property name="sessionFactory" ref="sessionFactory"/>
-    <property name="periodService"
-      ref="org.hisp.dhis.period.PeriodService"/>
-  </bean>
-  
- <bean id="org.hisp.dhis.minmax.MinMaxDataElementStore"
-    class="org.hisp.dhis.minmax.hibernate.HibernateMinMaxDataElementStore">
-    <property name="clazz" value="org.hisp.dhis.minmax.MinMaxDataElement"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.expression.ExpressionStore"
-    class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.expression.Expression"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.validation.ValidationRuleStore"
-    class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.validation.ValidationRule"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.validation.ValidationRuleGroupStore"
-    class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.validation.ValidationRuleGroup"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-	
-  <bean id="org.hisp.dhis.dataelement.DataElementCategoryStore"
-    class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementCategory"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>  
-  
-  <bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionStore"
-    class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementCategoryOption"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-	
-  <bean id="org.hisp.dhis.dataelement.DataElementCategoryComboStore"
-    class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementCategoryCombo"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-	
-  <bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionComboStore"
-    class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataset.SectionStore"
-    class="org.hisp.dhis.dataset.hibernate.HibernateSectionStore">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitStore"
-    class="org.hisp.dhis.organisationunit.hibernate.HibernateOrganisationUnitStore">
-    <property name="sessionFactory" ref="sessionFactory"/>
-    <property name="statementManager" ref="statementManager"/>
-    <property name="jdbcTemplate" ref="jdbcTemplate"/>
-  </bean>
-
-  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupStore"
-    class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.organisationunit.OrganisationUnitGroup"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetStore"
-    class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.organisationunit.OrganisationUnitGroupSet"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"
-    class="org.hisp.dhis.dataanalysis.jdbc.JdbcDataAnalysisStore">
-    <property name="statementManager" ref="statementManager"/>
-    <property name="statementBuilder" ref="statementBuilder"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.datavalue.DataValueAuditStore"
-    class="org.hisp.dhis.datavalue.hibernate.HibernateDataValueAuditStore">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.user.UserStore" 
-    class="org.hisp.dhis.user.hibernate.HibernateUserStore">
-    <property name="sessionFactory" ref="sessionFactory"/>
-     <property name="currentUserService"
-      ref="org.hisp.dhis.user.CurrentUserService"/>
-  </bean>
-    
-  <!-- Service definitions -->
-
-  <bean id="org.hisp.dhis.customvalue.CustomValueService"
-    class="org.hisp.dhis.customvalue.DefaultCustomValueService">
-    <property name="customValueStore"
-      ref="org.hisp.dhis.customvalue.CustomValueStore"/>
-  </bean>
-
-  <bean id="org.hisp.dhis.datavalue.DataValueService"
-    class="org.hisp.dhis.datavalue.DefaultDataValueService">
-    <property name="dataValueStore"
-      ref="org.hisp.dhis.datavalue.DataValueStore"/>
-	<property name="dataValueAuditService" ref="org.hisp.dhis.datavalue.DataValueAuditService"/>
-  </bean>
-
-  <bean id="org.hisp.dhis.datavalue.DataValueAuditService"
-    class="org.hisp.dhis.datavalue.DefaultDataValueAuditService">
-    <property name="dataValueAuditStore"
-      ref="org.hisp.dhis.datavalue.DataValueAuditStore"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataelement.DataElementService"
-    class="org.hisp.dhis.dataelement.DefaultDataElementService">
-    <property name="dataElementStore"
-      ref="org.hisp.dhis.dataelement.DataElementStore"/>
-	<property name="dataElementGroupStore"
-	  ref="org.hisp.dhis.dataelement.DataElementGroupStore"/>
-    <property name="dataElementGroupSetStore"
-      ref="org.hisp.dhis.dataelement.DataElementGroupSetStore"/>	
-    <property name="i18nService"
-      ref="org.hisp.dhis.i18n.I18nService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.minmax.MinMaxDataElementService"
-    class="org.hisp.dhis.minmax.DefaultMinMaxDataElementService">
-    <property name="minMaxDataElementStore"
-      ref="org.hisp.dhis.minmax.MinMaxDataElementStore"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.datadictionary.DataDictionaryService"
-    class="org.hisp.dhis.datadictionary.DefaultDataDictionaryService">
-    <property name="dataDictionaryStore"
-      ref="org.hisp.dhis.datadictionary.DataDictionaryStore"/>
-    <property name="i18nService"
-      ref="org.hisp.dhis.i18n.I18nService"/>
-  </bean>
- 
-  <bean id="org.hisp.dhis.indicator.IndicatorService"
-	class="org.hisp.dhis.indicator.DefaultIndicatorService">
-   <property name="indicatorStore"
-     ref="org.hisp.dhis.indicator.IndicatorStore"/>
-   <property name="indicatorTypeStore"
-	 ref="org.hisp.dhis.indicator.IndicatorTypeStore"/>
-   <property name="indicatorGroupStore"
-	 ref="org.hisp.dhis.indicator.IndicatorGroupStore"/>
-   <property name="indicatorGroupSetStore"
-	 ref="org.hisp.dhis.indicator.IndicatorGroupSetStore"/>
-   <property name="i18nService"
-     ref="org.hisp.dhis.i18n.I18nService"/>
-  </bean>
-
-  <bean id="org.hisp.dhis.period.PeriodService"
-    class="org.hisp.dhis.period.DefaultPeriodService">
-    <property name="periodStore"
-      ref="org.hisp.dhis.period.PeriodStore"/>
-  </bean>
-	
-  <bean id="org.hisp.dhis.dataset.DataSetService"
-    class="org.hisp.dhis.dataset.DefaultDataSetService">
-    <property name="dataSetStore"
-      ref="org.hisp.dhis.dataset.DataSetStore"/>
-    <property name="dataEntryFormService"
-      ref="org.hisp.dhis.dataentryform.DataEntryFormService"/>
-    <property name="i18nService"
-      ref="org.hisp.dhis.i18n.I18nService"/>
-     <property name="currentUserService"
-      ref="org.hisp.dhis.user.CurrentUserService"/>
-  </bean>
-
-  <bean id="org.hisp.dhis.dataset.CompleteDataSetRegistrationService"
-    class="org.hisp.dhis.dataset.DefaultCompleteDataSetRegistrationService">    
-    <property name="completeDataSetRegistrationStore"
-      ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationStore"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataset.SectionService"
-    class="org.hisp.dhis.dataset.DefaultSectionService">
-    <property name="sectionStore"
-      ref="org.hisp.dhis.dataset.SectionStore"/>
-  </bean>
-  
-   <bean id="org.hisp.dhis.dataentryform.DataEntryFormService"
-    class="org.hisp.dhis.dataentryform.DefaultDataEntryFormService">
-    <property name="dataEntryFormStore"
-      ref="org.hisp.dhis.dataentryform.DataEntryFormStore"/>
-    <property name="dataEntryFormAssociationService"
-      ref="org.hisp.dhis.dataentryform.DataEntryFormAssociationService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataentryform.DataEntryFormAssociationService"
-    class="org.hisp.dhis.dataentryform.DefaultDataEntryFormAssociationService">
-    <property name="dataEntryFormAssociationStore"
-      ref="org.hisp.dhis.dataentryform.DataEntryFormAssociationStore"/>
-  </bean>
-    
- <bean id="org.hisp.dhis.expression.ExpressionService"
-    class="org.hisp.dhis.expression.DefaultExpressionService">
-    <property name="expressionStore"
-      ref="org.hisp.dhis.expression.ExpressionStore"/>
-    <property name="dataElementService"
-      ref="org.hisp.dhis.dataelement.DataElementService"/>
-    <property name="dataValueService"
-      ref="org.hisp.dhis.datavalue.DataValueService"/>
-    <property name="categoryService"
-      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
-  </bean>
-
-  <bean id="org.hisp.dhis.validation.ValidationRuleService"
-    class="org.hisp.dhis.validation.DefaultValidationRuleService">
-    <property name="validationRuleStore"
-      ref="org.hisp.dhis.validation.ValidationRuleStore"/>
-    <property name="validationRuleGroupStore"
-      ref="org.hisp.dhis.validation.ValidationRuleGroupStore"/>
-    <property name="expressionService"
-      ref="org.hisp.dhis.expression.ExpressionService"/>
-    <property name="periodService"
-      ref="org.hisp.dhis.period.PeriodService"/>
-  </bean>
-	
-  <bean id="org.hisp.dhis.dataelement.DataElementCategoryService"
-    class="org.hisp.dhis.dataelement.DefaultDataElementCategoryService">
-    <property name="dataElementCategoryStore"
-      ref="org.hisp.dhis.dataelement.DataElementCategoryStore"/>
-    <property name="dataElementCategoryOptionStore"
-      ref="org.hisp.dhis.dataelement.DataElementCategoryOptionStore"/>
-    <property name="dataElementCategoryComboStore"
-      ref="org.hisp.dhis.dataelement.DataElementCategoryComboStore"/>
-    <property name="dataElementCategoryOptionComboStore"
-      ref="org.hisp.dhis.dataelement.DataElementCategoryOptionComboStore"/>  
-    <property name="dataElementService"
-      ref="org.hisp.dhis.dataelement.DataElementService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dimension.DimensionService"
-	class="org.hisp.dhis.dimension.DefaultDimensionService">
-    <property name="dataElementService"
-      ref="org.hisp.dhis.dataelement.DataElementService"/>
-	<property name="categoryService"
-      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
-  </bean>
-    
-  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitService"
-    class="org.hisp.dhis.organisationunit.DefaultOrganisationUnitService">
-    <property name="sourceStore"
-      ref="org.hisp.dhis.source.SourceStore"/>
-    <property name="organisationUnitStore"
-      ref="org.hisp.dhis.organisationunit.OrganisationUnitStore"/>
-    <property name="currentUserService"
-      ref="org.hisp.dhis.user.CurrentUserService"/>
-  </bean>
-
-  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"
-    class="org.hisp.dhis.organisationunit.DefaultOrganisationUnitGroupService">
-    <property name="organisationUnitGroupStore"
-      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupStore"/>
-    <property name="organisationUnitGroupSetStore"
-      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetStore"/>
-  </bean>
-   
-  <bean id="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService" 
-    class="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService">
-    <property name="organisationUnitService"
-      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
-    <property name="dataAnalysisStore"
-      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>
-  </bean>
-
-  <bean id="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService"
-    class="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService">
-    <property name="organisationUnitService"
-      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
-    <property name="minMaxDataElementService"
-      ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
-    <property name="dataAnalysisStore"
-      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>  
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataanalysis.GapAnalysisService"
-    class="org.hisp.dhis.dataanalysis.GapAnalysisService">
-    <property name="organisationUnitService"
-      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
-    <property name="dataAnalysisStore"
-      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>  
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataanalysis.FollowupAnalysisService"
-    class="org.hisp.dhis.dataanalysis.FollowupAnalysisService">
-    <property name="dataAnalysisStore"
-      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>  
-  </bean>
-  
-  <bean id="dataAnalysisServiceProvider"
-	class="org.hisp.dhis.common.ServiceProvider">
-	<property name="services">
-		<map>
-			<entry>
-				<key><value>stddevoutlier</value></key>
-				<ref bean="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService"/>
-			</entry>
-            <entry>
-                <key><value>minmaxoutlier</value></key>
-                <ref bean="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService"/>
-            </entry>
-            <entry>
-                <key><value>gap</value></key>
-                <ref bean="org.hisp.dhis.dataanalysis.GapAnalysisService"/>
-            </entry>
-            <entry>
-                <key><value>followup</value></key>
-                <ref bean="org.hisp.dhis.dataanalysis.FollowupAnalysisService"/>
-            </entry>
+<?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-2.0.xsd
+http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+  
+  <!-- Store definitions -->
+  
+  <bean id="org.hisp.dhis.dataentryform.DataEntryFormAssociationStore"
+    class="org.hisp.dhis.dataentryform.hibernate.HibernateDataEntryFormAssociationStore">
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+  
+   <bean id="org.hisp.dhis.dataentryform.DataEntryFormStore"
+    class="org.hisp.dhis.dataentryform.hibernate.HibernateDataEntryFormStore">
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+
+  <bean id="org.hisp.dhis.customvalue.CustomValueStore"
+    class="org.hisp.dhis.customvalue.hibernate.HibernateCustomValueStore">
+    <property name="clazz" value="org.hisp.dhis.customvalue.CustomValue"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+
+  <bean id="org.hisp.dhis.dataelement.DataElementStore"
+    class="org.hisp.dhis.dataelement.hibernate.HibernateDataElementStore">
+    <property name="sessionFactory" ref="sessionFactory"/>
+	<property name="statementManager" ref="statementManager"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataelement.DataElementGroupStore"
+    class="org.hisp.dhis.hibernate.HibernateGenericStore">
+    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementGroup"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataelement.DataElementGroupSetStore"
+    class="org.hisp.dhis.hibernate.HibernateGenericStore">
+    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementGroupSet"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.datadictionary.DataDictionaryStore"
+    class="org.hisp.dhis.hibernate.HibernateGenericStore">
+    <property name="clazz" value="org.hisp.dhis.datadictionary.DataDictionary"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.datavalue.DataValueStore"
+    class="org.hisp.dhis.datavalue.hibernate.HibernateDataValueStore">
+    <property name="sessionFactory" ref="sessionFactory"/>
+    <property name="statementManager" ref="statementManager"/>
+    <property name="periodStore" ref="org.hisp.dhis.period.PeriodStore"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.indicator.IndicatorStore"
+    class="org.hisp.dhis.indicator.hibernate.HibernateIndicatorStore">
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+	
+  <bean id="org.hisp.dhis.indicator.IndicatorTypeStore"
+    class="org.hisp.dhis.hibernate.HibernateGenericStore">
+    <property name="clazz" value="org.hisp.dhis.indicator.IndicatorType"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+    
+  <bean id="org.hisp.dhis.indicator.IndicatorGroupStore"
+    class="org.hisp.dhis.hibernate.HibernateGenericStore">
+    <property name="clazz" value="org.hisp.dhis.indicator.IndicatorGroup"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+    
+  <bean id="org.hisp.dhis.indicator.IndicatorGroupSetStore"
+    class="org.hisp.dhis.hibernate.HibernateGenericStore">
+    <property name="clazz" value="org.hisp.dhis.indicator.IndicatorGroupSet"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+    
+  <bean id="org.hisp.dhis.period.PeriodStore"
+    class="org.hisp.dhis.period.hibernate.HibernatePeriodStore">
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.source.SourceStore"
+    class="org.hisp.dhis.source.hibernate.HibernateSourceStore">
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataset.DataSetStore"
+    class="org.hisp.dhis.dataset.hibernate.HibernateDataSetStore">
+    <property name="sessionFactory" ref="sessionFactory"/>
+    <property name="periodStore"
+      ref="org.hisp.dhis.period.PeriodStore"/>
+  </bean>
+
+  <bean id="org.hisp.dhis.dataset.CompleteDataSetRegistrationStore"
+    class="org.hisp.dhis.dataset.hibernate.HibernateCompleteDataSetRegistrationStore"> 
+    <property name="sessionFactory" ref="sessionFactory"/>
+    <property name="periodService"
+      ref="org.hisp.dhis.period.PeriodService"/>
+  </bean>
+  
+ <bean id="org.hisp.dhis.minmax.MinMaxDataElementStore"
+    class="org.hisp.dhis.minmax.hibernate.HibernateMinMaxDataElementStore">
+    <property name="clazz" value="org.hisp.dhis.minmax.MinMaxDataElement"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.expression.ExpressionStore"
+    class="org.hisp.dhis.hibernate.HibernateGenericStore">
+    <property name="clazz" value="org.hisp.dhis.expression.Expression"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.validation.ValidationRuleStore"
+    class="org.hisp.dhis.hibernate.HibernateGenericStore">
+    <property name="clazz" value="org.hisp.dhis.validation.ValidationRule"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.validation.ValidationRuleGroupStore"
+    class="org.hisp.dhis.hibernate.HibernateGenericStore">
+    <property name="clazz" value="org.hisp.dhis.validation.ValidationRuleGroup"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+	
+  <bean id="org.hisp.dhis.dataelement.DataElementCategoryStore"
+    class="org.hisp.dhis.hibernate.HibernateGenericStore">
+    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementCategory"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>  
+  
+  <bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionStore"
+    class="org.hisp.dhis.hibernate.HibernateGenericStore">
+    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementCategoryOption"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+	
+  <bean id="org.hisp.dhis.dataelement.DataElementCategoryComboStore"
+    class="org.hisp.dhis.hibernate.HibernateGenericStore">
+    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementCategoryCombo"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+	
+  <bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionComboStore"
+    class="org.hisp.dhis.hibernate.HibernateGenericStore">
+    <property name="clazz" value="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataset.SectionStore"
+    class="org.hisp.dhis.dataset.hibernate.HibernateSectionStore">
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitStore"
+    class="org.hisp.dhis.organisationunit.hibernate.HibernateOrganisationUnitStore">
+    <property name="sessionFactory" ref="sessionFactory"/>
+    <property name="statementManager" ref="statementManager"/>
+    <property name="jdbcTemplate" ref="jdbcTemplate"/>
+  </bean>
+
+  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupStore"
+    class="org.hisp.dhis.hibernate.HibernateGenericStore">
+    <property name="clazz" value="org.hisp.dhis.organisationunit.OrganisationUnitGroup"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetStore"
+    class="org.hisp.dhis.hibernate.HibernateGenericStore">
+    <property name="clazz" value="org.hisp.dhis.organisationunit.OrganisationUnitGroupSet"/>
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"
+    class="org.hisp.dhis.dataanalysis.jdbc.JdbcDataAnalysisStore">
+    <property name="statementManager" ref="statementManager"/>
+    <property name="statementBuilder" ref="statementBuilder"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.datavalue.DataValueAuditStore"
+    class="org.hisp.dhis.datavalue.hibernate.HibernateDataValueAuditStore">
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.user.UserStore" 
+    class="org.hisp.dhis.user.hibernate.HibernateUserStore">
+    <property name="sessionFactory" ref="sessionFactory"/>
+     <property name="currentUserService"
+      ref="org.hisp.dhis.user.CurrentUserService"/>
+  </bean>
+    
+  <!-- Service definitions -->
+
+  <bean id="org.hisp.dhis.customvalue.CustomValueService"
+    class="org.hisp.dhis.customvalue.DefaultCustomValueService">
+    <property name="customValueStore"
+      ref="org.hisp.dhis.customvalue.CustomValueStore"/>
+  </bean>
+
+  <bean id="org.hisp.dhis.datavalue.DataValueService"
+    class="org.hisp.dhis.datavalue.DefaultDataValueService">
+    <property name="dataValueStore"
+      ref="org.hisp.dhis.datavalue.DataValueStore"/>
+	<property name="dataValueAuditService" ref="org.hisp.dhis.datavalue.DataValueAuditService"/>
+  </bean>
+
+  <bean id="org.hisp.dhis.datavalue.DataValueAuditService"
+    class="org.hisp.dhis.datavalue.DefaultDataValueAuditService">
+    <property name="dataValueAuditStore"
+      ref="org.hisp.dhis.datavalue.DataValueAuditStore"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataelement.DataElementService"
+    class="org.hisp.dhis.dataelement.DefaultDataElementService">
+    <property name="dataElementStore"
+      ref="org.hisp.dhis.dataelement.DataElementStore"/>
+	<property name="dataElementGroupStore"
+	  ref="org.hisp.dhis.dataelement.DataElementGroupStore"/>
+    <property name="dataElementGroupSetStore"
+      ref="org.hisp.dhis.dataelement.DataElementGroupSetStore"/>	
+    <property name="i18nService"
+      ref="org.hisp.dhis.i18n.I18nService"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.minmax.MinMaxDataElementService"
+    class="org.hisp.dhis.minmax.DefaultMinMaxDataElementService">
+    <property name="minMaxDataElementStore"
+      ref="org.hisp.dhis.minmax.MinMaxDataElementStore"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.datadictionary.DataDictionaryService"
+    class="org.hisp.dhis.datadictionary.DefaultDataDictionaryService">
+    <property name="dataDictionaryStore"
+      ref="org.hisp.dhis.datadictionary.DataDictionaryStore"/>
+    <property name="i18nService"
+      ref="org.hisp.dhis.i18n.I18nService"/>
+  </bean>
+ 
+  <bean id="org.hisp.dhis.indicator.IndicatorService"
+	class="org.hisp.dhis.indicator.DefaultIndicatorService">
+   <property name="indicatorStore"
+     ref="org.hisp.dhis.indicator.IndicatorStore"/>
+   <property name="indicatorTypeStore"
+	 ref="org.hisp.dhis.indicator.IndicatorTypeStore"/>
+   <property name="indicatorGroupStore"
+	 ref="org.hisp.dhis.indicator.IndicatorGroupStore"/>
+   <property name="indicatorGroupSetStore"
+	 ref="org.hisp.dhis.indicator.IndicatorGroupSetStore"/>
+   <property name="i18nService"
+     ref="org.hisp.dhis.i18n.I18nService"/>
+  </bean>
+
+  <bean id="org.hisp.dhis.period.PeriodService"
+    class="org.hisp.dhis.period.DefaultPeriodService">
+    <property name="periodStore"
+      ref="org.hisp.dhis.period.PeriodStore"/>
+  </bean>
+	
+  <bean id="org.hisp.dhis.dataset.DataSetService"
+    class="org.hisp.dhis.dataset.DefaultDataSetService">
+    <property name="dataSetStore"
+      ref="org.hisp.dhis.dataset.DataSetStore"/>
+    <property name="dataEntryFormService"
+      ref="org.hisp.dhis.dataentryform.DataEntryFormService"/>
+    <property name="i18nService"
+      ref="org.hisp.dhis.i18n.I18nService"/>
+     <property name="currentUserService"
+      ref="org.hisp.dhis.user.CurrentUserService"/>
+  </bean>
+
+  <bean id="org.hisp.dhis.dataset.CompleteDataSetRegistrationService"
+    class="org.hisp.dhis.dataset.DefaultCompleteDataSetRegistrationService">    
+    <property name="completeDataSetRegistrationStore"
+      ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationStore"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataset.SectionService"
+    class="org.hisp.dhis.dataset.DefaultSectionService">
+    <property name="sectionStore"
+      ref="org.hisp.dhis.dataset.SectionStore"/>
+  </bean>
+  
+   <bean id="org.hisp.dhis.dataentryform.DataEntryFormService"
+    class="org.hisp.dhis.dataentryform.DefaultDataEntryFormService">
+    <property name="dataEntryFormStore"
+      ref="org.hisp.dhis.dataentryform.DataEntryFormStore"/>
+    <property name="dataEntryFormAssociationService"
+      ref="org.hisp.dhis.dataentryform.DataEntryFormAssociationService"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataentryform.DataEntryFormAssociationService"
+    class="org.hisp.dhis.dataentryform.DefaultDataEntryFormAssociationService">
+    <property name="dataEntryFormAssociationStore"
+      ref="org.hisp.dhis.dataentryform.DataEntryFormAssociationStore"/>
+  </bean>
+    
+ <bean id="org.hisp.dhis.expression.ExpressionService"
+    class="org.hisp.dhis.expression.DefaultExpressionService">
+    <property name="expressionStore"
+      ref="org.hisp.dhis.expression.ExpressionStore"/>
+    <property name="dataElementService"
+      ref="org.hisp.dhis.dataelement.DataElementService"/>
+    <property name="dataValueService"
+      ref="org.hisp.dhis.datavalue.DataValueService"/>
+    <property name="categoryService"
+      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
+  </bean>
+
+  <bean id="org.hisp.dhis.validation.ValidationRuleService"
+    class="org.hisp.dhis.validation.DefaultValidationRuleService">
+    <property name="validationRuleStore"
+      ref="org.hisp.dhis.validation.ValidationRuleStore"/>
+    <property name="validationRuleGroupStore"
+      ref="org.hisp.dhis.validation.ValidationRuleGroupStore"/>
+    <property name="expressionService"
+      ref="org.hisp.dhis.expression.ExpressionService"/>
+    <property name="periodService"
+      ref="org.hisp.dhis.period.PeriodService"/>
+  </bean>
+	
+  <bean id="org.hisp.dhis.dataelement.DataElementCategoryService"
+    class="org.hisp.dhis.dataelement.DefaultDataElementCategoryService">
+    <property name="dataElementCategoryStore"
+      ref="org.hisp.dhis.dataelement.DataElementCategoryStore"/>
+    <property name="dataElementCategoryOptionStore"
+      ref="org.hisp.dhis.dataelement.DataElementCategoryOptionStore"/>
+    <property name="dataElementCategoryComboStore"
+      ref="org.hisp.dhis.dataelement.DataElementCategoryComboStore"/>
+    <property name="dataElementCategoryOptionComboStore"
+      ref="org.hisp.dhis.dataelement.DataElementCategoryOptionComboStore"/>  
+    <property name="dataElementService"
+      ref="org.hisp.dhis.dataelement.DataElementService"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dimension.DimensionService"
+	class="org.hisp.dhis.dimension.DefaultDimensionService">
+    <property name="dataElementService"
+      ref="org.hisp.dhis.dataelement.DataElementService"/>
+	<property name="categoryService"
+      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
+  </bean>
+    
+  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitService"
+    class="org.hisp.dhis.organisationunit.DefaultOrganisationUnitService">
+    <property name="sourceStore"
+      ref="org.hisp.dhis.source.SourceStore"/>
+    <property name="organisationUnitStore"
+      ref="org.hisp.dhis.organisationunit.OrganisationUnitStore"/>
+    <property name="currentUserService"
+      ref="org.hisp.dhis.user.CurrentUserService"/>
+  </bean>
+
+  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"
+    class="org.hisp.dhis.organisationunit.DefaultOrganisationUnitGroupService">
+    <property name="organisationUnitGroupStore"
+      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupStore"/>
+    <property name="organisationUnitGroupSetStore"
+      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetStore"/>
+  </bean>
+   
+  <bean id="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService" 
+    class="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService">
+    <property name="organisationUnitService"
+      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+    <property name="dataAnalysisStore"
+      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>
+  </bean>
+
+  <bean id="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService"
+    class="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService">
+    <property name="organisationUnitService"
+      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+    <property name="minMaxDataElementService"
+      ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
+    <property name="dataAnalysisStore"
+      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>  
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataanalysis.GapAnalysisService"
+    class="org.hisp.dhis.dataanalysis.GapAnalysisService">
+    <property name="organisationUnitService"
+      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+    <property name="dataAnalysisStore"
+      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>  
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataanalysis.FollowupAnalysisService"
+    class="org.hisp.dhis.dataanalysis.FollowupAnalysisService">
+    <property name="dataAnalysisStore"
+      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>  
+  </bean>
+  
+  <bean id="dataAnalysisServiceProvider"
+	class="org.hisp.dhis.common.ServiceProvider">
+	<property name="services">
+		<map>
+			<entry>
+				<key><value>stddevoutlier</value></key>
+				<ref bean="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService"/>
+			</entry>
+            <entry>
+                <key><value>minmaxoutlier</value></key>
+                <ref bean="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService"/>
+            </entry>
+            <entry>
+                <key><value>gap</value></key>
+                <ref bean="org.hisp.dhis.dataanalysis.GapAnalysisService"/>
+            </entry>
+            <entry>
+                <key><value>followup</value></key>
+                <ref bean="org.hisp.dhis.dataanalysis.FollowupAnalysisService"/>
+            </entry>
 		</map>		
-	</property>
-  </bean>
-  
-  <bean id="org.hisp.dhis.user.CurrentUserService"
-    class="org.hisp.dhis.user.DefaultCurrentUserService">
-    <property name="userStore" ref="org.hisp.dhis.user.UserStore"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.user.UserSettingService"
-    class="org.hisp.dhis.user.DefaultUserSettingService">
-    <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService"/>
-    <property name="userStore" ref="org.hisp.dhis.user.UserStore"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.user.UserService"
-    class="org.hisp.dhis.user.DefaultUserService">
-    <property name="userStore" ref="org.hisp.dhis.user.UserStore"/>
-  </bean>
-  
-  <!-- Startup routine definitions -->
-	
-  <bean id="org.hisp.dhis.dataentryform.DataEntryFormPopulator"
-    class="org.hisp.dhis.dataentryform.DataEntryFormPopulator">
-  	<property name="jdbcTemplate" ref="jdbcTemplate"/>
-  	<property name="statementBuilder" ref="statementBuilder"/>
-    <property name="runlevel" value="1"/>
-  </bean>
-	
-  <bean id="org.hisp.dhis.period.PeriodTypePopulator"
-    class="org.hisp.dhis.period.PeriodTypePopulator">
-    <property name="periodStore"
-      ref="org.hisp.dhis.period.PeriodStore"/>
-    <property name="runlevel" value="1"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator"
-    class="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator">
-    <property name="dataElementService"
-      ref="org.hisp.dhis.dataelement.DataElementService"/>
-    <property name="categoryService"
-      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
-    <property name="runlevel" value="2"/>
-  </bean>
-	  
-  <bean id="org.hisp.dhis.dataelement.OptionsCategoriesDefaultSortOrderPopulator"
-    class="org.hisp.dhis.dataelement.OptionsCategoriesDefaultSortOrderPopulator">
-    <property name="statementManager" ref="statementManager"/>
-    <property name="runlevel" value="1"/>
-	<property name="skipInTests" value="true"/>
-  </bean>
-	
-  <bean id="org.hisp.dhis.expression.MultiDimensionExpressionUpgrader"
-    class="org.hisp.dhis.expression.MultiDimensionExpressionUpgrader">
-    <property name="expressionService"
-      ref="org.hisp.dhis.expression.ExpressionService"/>
-    <property name="indicatorService"
-      ref="org.hisp.dhis.indicator.IndicatorService"/>
-    <property name="categoryService"
-      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/> 
-    <property name="runlevel" value="2"/>
-    <property name="skipInTests" value="true"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataset.DataSetShortNamePopulator"
-    class="org.hisp.dhis.dataset.DataSetShortNamePopulator">
-    <property name="dataSetService"
-      ref="org.hisp.dhis.dataset.DataSetService"/>    
-    <property name="skipInTests" value="true"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataelement.UuidPopulator"
-    class="org.hisp.dhis.dataelement.UuidPopulator">
-    <property name="categoryService"
-      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
-    <property name="dataElementService"
-      ref="org.hisp.dhis.dataelement.DataElementService"/>
-    <property name="skipInTests" value="true"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitHierarchyVerifier"
-    class="org.hisp.dhis.organisationunit.OrganisationUnitHierarchyVerifier">
-    <property name="organisationUnitService"
-      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetPopulator"
-    class="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetPopulator">
-    <property name="organisationUnitGroupService"
-      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"/>
-    <property name="skipInTests" value="true"/>
-  </bean>
-    
-  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-    <property name="targetObject"
-      ref="org.hisp.dhis.system.startup.StartupRoutineExecutor"/>
-    <property name="targetMethod" value="addStartupRoutines"/>
-    <property name="arguments">
-      <list>
-        <list>
-          <ref local="org.hisp.dhis.dataelement.OptionsCategoriesDefaultSortOrderPopulator"/>
-          <ref local="org.hisp.dhis.period.PeriodTypePopulator"/>
-          <ref local="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator"/>
-          <ref local="org.hisp.dhis.expression.MultiDimensionExpressionUpgrader"/>
-          <ref local="org.hisp.dhis.dataset.DataSetShortNamePopulator"/>
-          <ref local="org.hisp.dhis.dataelement.UuidPopulator"/>
-		  <ref local="org.hisp.dhis.organisationunit.OrganisationUnitHierarchyVerifier"/>
-          <ref local="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetPopulator"/>
-          <ref local="org.hisp.dhis.dataentryform.DataEntryFormPopulator"/>
-        </list>
-      </list>
-    </property>
-  </bean>
-
-  <!-- DeletionHandlers -->
-  
-  <bean id="org.hisp.dhis.dataentryform.DataEntryFormDeletionHandler"
-    class="org.hisp.dhis.dataentryform.DataEntryFormDeletionHandler">
-    <property name="dataEntryFormService"
-      ref="org.hisp.dhis.dataentryform.DataEntryFormService"/>
-    <property name="deletionManager"
-      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
-    <property name="dataEntryFormAssociationService"
-      ref="org.hisp.dhis.dataentryform.DataEntryFormAssociationService"/>
-  </bean>
-    
-  <bean id="org.hisp.dhis.datadictionary.DataDictionaryDeletionHandler"
-    class="org.hisp.dhis.datadictionary.DataDictionaryDeletionHandler">
-    <property name="dataDictionaryService"
-      ref="org.hisp.dhis.datadictionary.DataDictionaryService"/>
-  </bean>
-	
-  <bean id="org.hisp.dhis.dataelement.DataElementDeletionHandler"
-    class="org.hisp.dhis.dataelement.DataElementDeletionHandler">
-    <property name="dataElementService"
-      ref="org.hisp.dhis.dataelement.DataElementService"/>
-    <property name="categoryService"
-      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
-  </bean>
-	
-  <bean id="org.hisp.dhis.dataelement.DataElementGroupDeletionHandler"
-    class="org.hisp.dhis.dataelement.DataElementGroupDeletionHandler">
-    <property name="dataElementService"
-      ref="org.hisp.dhis.dataelement.DataElementService"/>
-  </bean>  
-  
-  <bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionDeletionHandler"
-    class="org.hisp.dhis.dataelement.DataElementCategoryOptionDeletionHandler">
-    <property name="categoryService"
-      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionComboDeletionHandler"
-    class="org.hisp.dhis.dataelement.DataElementCategoryOptionComboDeletionHandler">
-    <property name="categoryService"
-      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataelement.DataElementCategoryComboDeletionHandler"
-    class="org.hisp.dhis.dataelement.DataElementCategoryComboDeletionHandler">
-    <property name="categoryService"
-      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataset.DataSetDeletionHandler"
-    class="org.hisp.dhis.dataset.DataSetDeletionHandler">
-    <property name="dataSetService"
-      ref="org.hisp.dhis.dataset.DataSetService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataset.CompleteDataSetRegistrationDeletionHandler"
-    class="org.hisp.dhis.dataset.CompleteDataSetRegistrationDeletionHandler">
-    <property name="completeDataSetRegistrationService"
-      ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService"/>
-    <property name="jdbcTemplate" ref="jdbcTemplate"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataset.SectionDeletionHandler"
-    class="org.hisp.dhis.dataset.SectionDeletionHandler">
-    <property name="sectionService"
-      ref="org.hisp.dhis.dataset.SectionService"/>
-    <property name="deletionManager"
-      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.dataset.FrequencyOverrideAssociationDeletionHandler"
-    class="org.hisp.dhis.dataset.FrequencyOverrideAssociationDeletionHandler">
-    <property name="dataSetService"
-      ref="org.hisp.dhis.dataset.DataSetService"/>
-    <property name="deletionManager"
-      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.expression.ExpressionDeletionHandler"
-    class="org.hisp.dhis.expression.ExpressionDeletionHandler">
-    <property name="expressionService"
-      ref="org.hisp.dhis.expression.ExpressionService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.indicator.IndicatorDeletionHandler"
-    class="org.hisp.dhis.indicator.IndicatorDeletionHandler">
-    <property name="indicatorService"
-      ref="org.hisp.dhis.indicator.IndicatorService"/>
-    <property name="deletionManager"
-      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.indicator.IndicatorGroupDeletionHandler"
-    class="org.hisp.dhis.indicator.IndicatorGroupDeletionHandler">
-    <property name="indicatorService"
-      ref="org.hisp.dhis.indicator.IndicatorService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.minmax.MinMaxDataElementDeletionHandler"
-    class="org.hisp.dhis.minmax.MinMaxDataElementDeletionHandler">
-    <property name="minMaxDataElementService"
-      ref="org.hisp.dhis.minmax.MinMaxDataElementService"/>
-    <property name="deletionManager"
-      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.validation.ValidationRuleDeletionHandler"
-    class="org.hisp.dhis.validation.ValidationRuleDeletionHandler">
-    <property name="validationRuleService"
-      ref="org.hisp.dhis.validation.ValidationRuleService"/>
-    <property name="deletionManager"
-      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.validation.ValidationRuleGroupDeletionHandler"
-    class="org.hisp.dhis.validation.ValidationRuleGroupDeletionHandler">
-    <property name="validationRuleService"
-      ref="org.hisp.dhis.validation.ValidationRuleService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.datavalue.DataValueDeletionHandler"
-    class="org.hisp.dhis.datavalue.DataValueDeletionHandler">
-    <property name="jdbcTemplate" ref="jdbcTemplate"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupDeletionHandler"
-    class="org.hisp.dhis.organisationunit.OrganisationUnitGroupDeletionHandler">
-    <property name="organisationUnitGroupService"
-      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetDeletionHandler"
-    class="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetDeletionHandler">
-    <property name="organisationUnitGroupService"
-      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.datavalue.DataValueAuditDeletionHandler"
-    class="org.hisp.dhis.datavalue.DataValueAuditDeletionHandler">
-    <property name="dataValueAuditService"
-      ref="org.hisp.dhis.datavalue.DataValueAuditService"/>
-  </bean>
-
-  <bean id="org.hisp.dhis.user.UserDeletionHandler"
-    class="org.hisp.dhis.user.UserDeletionHandler">
-    <property name="userStore"
-      ref="org.hisp.dhis.user.UserStore"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.user.UserAuthorityGroupDeletionHandler"
-    class="org.hisp.dhis.user.UserAuthorityGroupDeletionHandler">
-    <property name="userStore"
-      ref="org.hisp.dhis.user.UserStore"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.user.UserCredentialsDeletionHandler"
-    class="org.hisp.dhis.user.UserCredentialsDeletionHandler">
-    <property name="userStore"
-      ref="org.hisp.dhis.user.UserStore"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.user.UserSettingDeletionHandler"
-    class="org.hisp.dhis.user.UserSettingDeletionHandler">
-    <property name="userSettingService"
-      ref="org.hisp.dhis.user.UserSettingService"/>
-  </bean>
-  
-  <!-- Security -->
-  
-  <bean id="org.hisp.dhis.security.PasswordManager"
-    class="org.hisp.dhis.security.spring.SpringSecurityPasswordManager">
-    <property name="passwordEncoder" ref="passwordEncoder"/>
-    <property name="usernameSaltSource" ref="usernameSaltSource"/>
-  </bean>
-  
-  <bean id="authenticationManager"
-    class="org.springframework.security.providers.ProviderManager">
-    <property name="providers">
-      <list>
-        <ref local="daoAuthenticationProvider"/>
-      </list>
-    </property>
-  </bean>
-  
-  <bean id="daoAuthenticationProvider"
-    class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
-    <property name="userDetailsService" ref="userDetailsService"/>
-    <property name="passwordEncoder" ref="passwordEncoder"/>
-    <property name="saltSource" ref="usernameSaltSource"/>
-  </bean>
-  
-  <bean id="userDetailsService"
-    class="org.hisp.dhis.security.hibernate.HibernateUserDetailsService">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-  
-  <bean id="passwordEncoder"
-    class="org.springframework.security.providers.encoding.Md5PasswordEncoder"/>
-  
-  <bean id="usernameSaltSource"
-    class="org.hisp.dhis.security.DefaultUsernameSaltSource"/>
-
-  <!-- DeletionManager -->
-  
-  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-    <property name="targetObject" ref="org.hisp.dhis.system.deletion.DeletionManager"/>
-    <property name="targetMethod" value="addDeletionHandlers"/>
-    <property name="arguments">
-	  <list>
-        <list>
-          <ref local="org.hisp.dhis.datadictionary.DataDictionaryDeletionHandler"/>
-          <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.dataentryform.DataEntryFormDeletionHandler"/>
-          <ref local="org.hisp.dhis.dataset.FrequencyOverrideAssociationDeletionHandler"/>
-          <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.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.OrganisationUnitGroupDeletionHandler"/>
-          <ref local="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetDeletionHandler"/>
-		  <ref local="org.hisp.dhis.user.UserDeletionHandler"/>
-          <ref local="org.hisp.dhis.user.UserAuthorityGroupDeletionHandler"/>
-          <ref local="org.hisp.dhis.user.UserCredentialsDeletionHandler"/>
-          <ref local="org.hisp.dhis.user.UserSettingDeletionHandler"/>
-        </list>
-      </list>
-    </property>
-  </bean>
-  
-  <!-- Startup -->
-  
-  <bean id="org.hisp.dhis.startup.TableCreator"
-    class="org.hisp.dhis.startup.TableCreator">
-    <property name="runlevel" value="3"/>
-    <property name="jdbcTemplate" ref="jdbcTemplate"/>
-    <property name="statementBuilder" ref="statementBuilder"/>
-  </bean>
-    
-  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-    <property name="targetObject"
-      ref="org.hisp.dhis.system.startup.StartupRoutineExecutor"/>
-    <property name="targetMethod" value="addStartupRoutines"/>
-    <property name="arguments">
-      <list>
-        <ref local="org.hisp.dhis.startup.TableCreator"/>
-      </list>
-    </property>
-  </bean>
-  
-  <!-- Min/Max validation -->
-  
- <bean id="org.hisp.dhis.minmax.validation.MinMaxValuesGenerationService"
-    class="org.hisp.dhis.minmax.validation.DefaultMinMaxValuesGenerationService">
-    <property name="dataAnalysisStore"
-      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>
-  </bean>
-  
-  <!-- AOP definitions -->
-  
-  <aop:config>
-  
-    <aop:aspect ref="deletionInterceptor">      
-      <aop:before pointcut="execution( * org.hisp.dhis.datadictionary.DataDictionaryService.delete*(..) )" method="intercept"/>
-      <aop:before pointcut="execution( * org.hisp.dhis.dataelement.DataElementService.delete*(..) )" method="intercept"/>
-      <aop:before pointcut="execution( * org.hisp.dhis.dataelement.DataElementCategoryService.delete*(..) )" method="intercept"/>
-      <aop:before pointcut="execution( * org.hisp.dhis.dataset.DataSetService.delete*(..) )" method="intercept"/>
-      <aop:before pointcut="execution( * org.hisp.dhis.indicator.IndicatorService.delete*(..) )" method="intercept"/>
-      <aop:before pointcut="execution( * org.hisp.dhis.expression.ExpressionService.delete*(..) )" method="intercept"/>
-      <aop:before pointcut="execution( * org.hisp.dhis.minmax.MinMaxDataElementService.delete*(..) )" method="intercept"/>
-      <aop:before pointcut="execution( * org.hisp.dhis.validation.ValidationRuleService.delete*(..) )" method="intercept"/>
-      <aop:before pointcut="execution( * org.hisp.dhis.period.PeriodService.delete*(..) )" method="intercept"/>
-	  <aop:before pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitService.delete*(..) )" method="intercept"/>
-      <aop:before pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitGroupService.delete*(..) )" method="intercept"/>
-	  <aop:before pointcut="execution( * org.hisp.dhis.user.UserStore.delete*(..) )" method="intercept"/>
-    </aop:aspect>
-      
-    <aop:aspect ref="statementInterceptor">
-      <aop:around pointcut="execution( * org.hisp.dhis.validation.ValidationRuleService.validate(..) )" method="intercept"/>
-	  <aop:around pointcut="execution( * org.hisp.dhis.dataanalysis.DataAnalysisService.analyse(..) )" method="intercept"/>
-    </aop:aspect>
-    
-	<!--
-    <aop:aspect ref="i18nTranslationInterceptor">
-      <aop:after-returning pointcut="execution( * org.hisp.dhis.dataelement.DataElementService.get*(..) )" method="intercept" returning="object"/>
-      <aop:after-returning pointcut="execution( * org.hisp.dhis.dataelement.DataElementCategoryService.get*(..) )" method="intercept" returning="object"/>
-      <aop:after-returning pointcut="execution( * org.hisp.dhis.indicator.IndicatorService.get*(..) )" method="intercept" returning="object"/>
-      <aop:after-returning pointcut="execution( * org.hisp.dhis.datadictionary.DataDictionaryService.get*(..) )" method="intercept" returning="object"/>
-      <aop:after-returning pointcut="execution( * org.hisp.dhis.dataset.DataSetService.get*(..) )" method="intercept" returning="object"/>
-      <aop:after-returning pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitService.get*(..) )" method="intercept" returning="object"/>
-      <aop:after-returning pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitGroupService.get*(..) )" method="intercept" returning="object"/>
-    </aop:aspect>
-	-->
-	
-  </aop:config>
-  
-</beans>
+	</property>
+  </bean>
+  
+  <bean id="org.hisp.dhis.user.CurrentUserService"
+    class="org.hisp.dhis.user.DefaultCurrentUserService">
+    <property name="userStore" ref="org.hisp.dhis.user.UserStore"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.user.UserSettingService"
+    class="org.hisp.dhis.user.DefaultUserSettingService">
+    <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService"/>
+    <property name="userStore" ref="org.hisp.dhis.user.UserStore"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.user.UserService"
+    class="org.hisp.dhis.user.DefaultUserService">
+    <property name="userStore" ref="org.hisp.dhis.user.UserStore"/>
+  </bean>
+  
+  <!-- Startup routine definitions -->
+	
+  <bean id="org.hisp.dhis.dataentryform.DataEntryFormPopulator"
+    class="org.hisp.dhis.dataentryform.DataEntryFormPopulator">
+  	<property name="jdbcTemplate" ref="jdbcTemplate"/>
+  	<property name="statementBuilder" ref="statementBuilder"/>
+    <property name="runlevel" value="1"/>
+  </bean>
+	
+  <bean id="org.hisp.dhis.period.PeriodTypePopulator"
+    class="org.hisp.dhis.period.PeriodTypePopulator">
+    <property name="periodStore"
+      ref="org.hisp.dhis.period.PeriodStore"/>
+    <property name="runlevel" value="1"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator"
+    class="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator">
+    <property name="dataElementService"
+      ref="org.hisp.dhis.dataelement.DataElementService"/>
+    <property name="categoryService"
+      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
+    <property name="runlevel" value="2"/>
+  </bean>
+	  
+  <bean id="org.hisp.dhis.dataelement.OptionsCategoriesDefaultSortOrderPopulator"
+    class="org.hisp.dhis.dataelement.OptionsCategoriesDefaultSortOrderPopulator">
+    <property name="statementManager" ref="statementManager"/>
+    <property name="runlevel" value="1"/>
+	<property name="skipInTests" value="true"/>
+  </bean>
+	
+  <bean id="org.hisp.dhis.expression.MultiDimensionExpressionUpgrader"
+    class="org.hisp.dhis.expression.MultiDimensionExpressionUpgrader">
+    <property name="expressionService"
+      ref="org.hisp.dhis.expression.ExpressionService"/>
+    <property name="indicatorService"
+      ref="org.hisp.dhis.indicator.IndicatorService"/>
+    <property name="categoryService"
+      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/> 
+    <property name="runlevel" value="2"/>
+    <property name="skipInTests" value="true"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataset.DataSetShortNamePopulator"
+    class="org.hisp.dhis.dataset.DataSetShortNamePopulator">
+    <property name="dataSetService"
+      ref="org.hisp.dhis.dataset.DataSetService"/>    
+    <property name="skipInTests" value="true"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataelement.UuidPopulator"
+    class="org.hisp.dhis.dataelement.UuidPopulator">
+    <property name="categoryService"
+      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
+    <property name="dataElementService"
+      ref="org.hisp.dhis.dataelement.DataElementService"/>
+    <property name="skipInTests" value="true"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitHierarchyVerifier"
+    class="org.hisp.dhis.organisationunit.OrganisationUnitHierarchyVerifier">
+    <property name="organisationUnitService"
+      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetPopulator"
+    class="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetPopulator">
+    <property name="organisationUnitGroupService"
+      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"/>
+    <property name="skipInTests" value="true"/>
+  </bean>
+    
+  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+    <property name="targetObject"
+      ref="org.hisp.dhis.system.startup.StartupRoutineExecutor"/>
+    <property name="targetMethod" value="addStartupRoutines"/>
+    <property name="arguments">
+      <list>
+        <list>
+          <ref local="org.hisp.dhis.dataelement.OptionsCategoriesDefaultSortOrderPopulator"/>
+          <ref local="org.hisp.dhis.period.PeriodTypePopulator"/>
+          <ref local="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator"/>
+          <ref local="org.hisp.dhis.expression.MultiDimensionExpressionUpgrader"/>
+          <ref local="org.hisp.dhis.dataset.DataSetShortNamePopulator"/>
+          <ref local="org.hisp.dhis.dataelement.UuidPopulator"/>
+		  <ref local="org.hisp.dhis.organisationunit.OrganisationUnitHierarchyVerifier"/>
+          <ref local="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetPopulator"/>
+          <ref local="org.hisp.dhis.dataentryform.DataEntryFormPopulator"/>
+        </list>
+      </list>
+    </property>
+  </bean>
+
+  <!-- DeletionHandlers -->
+  
+  <bean id="org.hisp.dhis.dataentryform.DataEntryFormDeletionHandler"
+    class="org.hisp.dhis.dataentryform.DataEntryFormDeletionHandler">
+    <property name="dataEntryFormService"
+      ref="org.hisp.dhis.dataentryform.DataEntryFormService"/>
+    <property name="deletionManager"
+      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
+    <property name="dataEntryFormAssociationService"
+      ref="org.hisp.dhis.dataentryform.DataEntryFormAssociationService"/>
+  </bean>
+    
+  <bean id="org.hisp.dhis.datadictionary.DataDictionaryDeletionHandler"
+    class="org.hisp.dhis.datadictionary.DataDictionaryDeletionHandler">
+    <property name="dataDictionaryService"
+      ref="org.hisp.dhis.datadictionary.DataDictionaryService"/>
+  </bean>
+	
+  <bean id="org.hisp.dhis.dataelement.DataElementDeletionHandler"
+    class="org.hisp.dhis.dataelement.DataElementDeletionHandler">
+    <property name="dataElementService"
+      ref="org.hisp.dhis.dataelement.DataElementService"/>
+    <property name="categoryService"
+      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
+  </bean>
+	
+  <bean id="org.hisp.dhis.dataelement.DataElementGroupDeletionHandler"
+    class="org.hisp.dhis.dataelement.DataElementGroupDeletionHandler">
+    <property name="dataElementService"
+      ref="org.hisp.dhis.dataelement.DataElementService"/>
+  </bean>  
+  
+  <bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionDeletionHandler"
+    class="org.hisp.dhis.dataelement.DataElementCategoryOptionDeletionHandler">
+    <property name="categoryService"
+      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionComboDeletionHandler"
+    class="org.hisp.dhis.dataelement.DataElementCategoryOptionComboDeletionHandler">
+    <property name="categoryService"
+      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataelement.DataElementCategoryComboDeletionHandler"
+    class="org.hisp.dhis.dataelement.DataElementCategoryComboDeletionHandler">
+    <property name="categoryService"
+      ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataset.DataSetDeletionHandler"
+    class="org.hisp.dhis.dataset.DataSetDeletionHandler">
+    <property name="dataSetService"
+      ref="org.hisp.dhis.dataset.DataSetService"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataset.CompleteDataSetRegistrationDeletionHandler"
+    class="org.hisp.dhis.dataset.CompleteDataSetRegistrationDeletionHandler">
+    <property name="completeDataSetRegistrationService"
+      ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService"/>
+    <property name="jdbcTemplate" ref="jdbcTemplate"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataset.SectionDeletionHandler"
+    class="org.hisp.dhis.dataset.SectionDeletionHandler">
+    <property name="sectionService"
+      ref="org.hisp.dhis.dataset.SectionService"/>
+    <property name="deletionManager"
+      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.dataset.FrequencyOverrideAssociationDeletionHandler"
+    class="org.hisp.dhis.dataset.FrequencyOverrideAssociationDeletionHandler">
+    <property name="dataSetService"
+      ref="org.hisp.dhis.dataset.DataSetService"/>
+    <property name="deletionManager"
+      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.expression.ExpressionDeletionHandler"
+    class="org.hisp.dhis.expression.ExpressionDeletionHandler">
+    <property name="expressionService"
+      ref="org.hisp.dhis.expression.ExpressionService"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.indicator.IndicatorDeletionHandler"
+    class="org.hisp.dhis.indicator.IndicatorDeletionHandler">
+    <property name="indicatorService"
+      ref="org.hisp.dhis.indicator.IndicatorService"/>
+    <property name="deletionManager"
+      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.indicator.IndicatorGroupDeletionHandler"
+    class="org.hisp.dhis.indicator.IndicatorGroupDeletionHandler">
+    <property name="indicatorService"
+      ref="org.hisp.dhis.indicator.IndicatorService"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.minmax.MinMaxDataElementDeletionHandler"
+    class="org.hisp.dhis.minmax.MinMaxDataElementDeletionHandler">
+    <property name="minMaxDataElementService"
+      ref="org.hisp.dhis.minmax.MinMaxDataElementService"/>
+    <property name="deletionManager"
+      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.validation.ValidationRuleDeletionHandler"
+    class="org.hisp.dhis.validation.ValidationRuleDeletionHandler">
+    <property name="validationRuleService"
+      ref="org.hisp.dhis.validation.ValidationRuleService"/>
+    <property name="deletionManager"
+      ref="org.hisp.dhis.system.deletion.DeletionManager"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.validation.ValidationRuleGroupDeletionHandler"
+    class="org.hisp.dhis.validation.ValidationRuleGroupDeletionHandler">
+    <property name="validationRuleService"
+      ref="org.hisp.dhis.validation.ValidationRuleService"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.datavalue.DataValueDeletionHandler"
+    class="org.hisp.dhis.datavalue.DataValueDeletionHandler">
+    <property name="jdbcTemplate" ref="jdbcTemplate"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupDeletionHandler"
+    class="org.hisp.dhis.organisationunit.OrganisationUnitGroupDeletionHandler">
+    <property name="organisationUnitGroupService"
+      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetDeletionHandler"
+    class="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetDeletionHandler">
+    <property name="organisationUnitGroupService"
+      ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.datavalue.DataValueAuditDeletionHandler"
+    class="org.hisp.dhis.datavalue.DataValueAuditDeletionHandler">
+    <property name="dataValueAuditService"
+      ref="org.hisp.dhis.datavalue.DataValueAuditService"/>
+  </bean>
+
+  <bean id="org.hisp.dhis.user.UserDeletionHandler"
+    class="org.hisp.dhis.user.UserDeletionHandler">
+    <property name="userStore"
+      ref="org.hisp.dhis.user.UserStore"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.user.UserAuthorityGroupDeletionHandler"
+    class="org.hisp.dhis.user.UserAuthorityGroupDeletionHandler">
+    <property name="userStore"
+      ref="org.hisp.dhis.user.UserStore"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.user.UserCredentialsDeletionHandler"
+    class="org.hisp.dhis.user.UserCredentialsDeletionHandler">
+    <property name="userStore"
+      ref="org.hisp.dhis.user.UserStore"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.user.UserSettingDeletionHandler"
+    class="org.hisp.dhis.user.UserSettingDeletionHandler">
+    <property name="userSettingService"
+      ref="org.hisp.dhis.user.UserSettingService"/>
+  </bean>
+  
+  <!-- Security -->
+  
+  <bean id="org.hisp.dhis.security.PasswordManager"
+    class="org.hisp.dhis.security.spring.SpringSecurityPasswordManager">
+    <property name="passwordEncoder" ref="passwordEncoder"/>
+    <property name="usernameSaltSource" ref="usernameSaltSource"/>
+  </bean>
+  
+  <bean id="authenticationManager"
+    class="org.springframework.security.authentication.ProviderManager">
+    <property name="providers">
+      <list>
+        <ref local="daoAuthenticationProvider"/>
+      </list>
+    </property>
+  </bean>
+  
+  <bean id="daoAuthenticationProvider"
+    class="org.springframework.security.authentication.dao.DaoAuthenticationProvider">
+    <property name="userDetailsService" ref="userDetailsService"/>
+    <property name="passwordEncoder" ref="passwordEncoder"/>
+    <property name="saltSource" ref="usernameSaltSource"/>
+  </bean>
+  
+  <bean id="userDetailsService"
+    class="org.hisp.dhis.security.hibernate.HibernateUserDetailsService">
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+  
+  <bean id="passwordEncoder"
+    class="org.springframework.security.authentication.encoding.Md5PasswordEncoder"/>
+  
+  <bean id="usernameSaltSource"
+    class="org.hisp.dhis.security.DefaultUsernameSaltSource"/>
+
+  <!-- DeletionManager -->
+  
+  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+    <property name="targetObject" ref="org.hisp.dhis.system.deletion.DeletionManager"/>
+    <property name="targetMethod" value="addDeletionHandlers"/>
+    <property name="arguments">
+	  <list>
+        <list>
+          <ref local="org.hisp.dhis.datadictionary.DataDictionaryDeletionHandler"/>
+          <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.dataentryform.DataEntryFormDeletionHandler"/>
+          <ref local="org.hisp.dhis.dataset.FrequencyOverrideAssociationDeletionHandler"/>
+          <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.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.OrganisationUnitGroupDeletionHandler"/>
+          <ref local="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetDeletionHandler"/>
+		  <ref local="org.hisp.dhis.user.UserDeletionHandler"/>
+          <ref local="org.hisp.dhis.user.UserAuthorityGroupDeletionHandler"/>
+          <ref local="org.hisp.dhis.user.UserCredentialsDeletionHandler"/>
+          <ref local="org.hisp.dhis.user.UserSettingDeletionHandler"/>
+        </list>
+      </list>
+    </property>
+  </bean>
+  
+  <!-- Startup -->
+  
+  <bean id="org.hisp.dhis.startup.TableCreator"
+    class="org.hisp.dhis.startup.TableCreator">
+    <property name="runlevel" value="3"/>
+    <property name="jdbcTemplate" ref="jdbcTemplate"/>
+    <property name="statementBuilder" ref="statementBuilder"/>
+  </bean>
+    
+  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+    <property name="targetObject"
+      ref="org.hisp.dhis.system.startup.StartupRoutineExecutor"/>
+    <property name="targetMethod" value="addStartupRoutines"/>
+    <property name="arguments">
+      <list>
+        <ref local="org.hisp.dhis.startup.TableCreator"/>
+      </list>
+    </property>
+  </bean>
+  
+  <!-- Min/Max validation -->
+  
+ <bean id="org.hisp.dhis.minmax.validation.MinMaxValuesGenerationService"
+    class="org.hisp.dhis.minmax.validation.DefaultMinMaxValuesGenerationService">
+    <property name="dataAnalysisStore"
+      ref="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"/>
+  </bean>
+  
+  <!-- AOP definitions -->
+  
+  <aop:config>
+  
+    <aop:aspect ref="deletionInterceptor">      
+      <aop:before pointcut="execution( * org.hisp.dhis.datadictionary.DataDictionaryService.delete*(..) )" method="intercept"/>
+      <aop:before pointcut="execution( * org.hisp.dhis.dataelement.DataElementService.delete*(..) )" method="intercept"/>
+      <aop:before pointcut="execution( * org.hisp.dhis.dataelement.DataElementCategoryService.delete*(..) )" method="intercept"/>
+      <aop:before pointcut="execution( * org.hisp.dhis.dataset.DataSetService.delete*(..) )" method="intercept"/>
+      <aop:before pointcut="execution( * org.hisp.dhis.indicator.IndicatorService.delete*(..) )" method="intercept"/>
+      <aop:before pointcut="execution( * org.hisp.dhis.expression.ExpressionService.delete*(..) )" method="intercept"/>
+      <aop:before pointcut="execution( * org.hisp.dhis.minmax.MinMaxDataElementService.delete*(..) )" method="intercept"/>
+      <aop:before pointcut="execution( * org.hisp.dhis.validation.ValidationRuleService.delete*(..) )" method="intercept"/>
+      <aop:before pointcut="execution( * org.hisp.dhis.period.PeriodService.delete*(..) )" method="intercept"/>
+	  <aop:before pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitService.delete*(..) )" method="intercept"/>
+      <aop:before pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitGroupService.delete*(..) )" method="intercept"/>
+	  <aop:before pointcut="execution( * org.hisp.dhis.user.UserStore.delete*(..) )" method="intercept"/>
+    </aop:aspect>
+      
+    <aop:aspect ref="statementInterceptor">
+      <aop:around pointcut="execution( * org.hisp.dhis.validation.ValidationRuleService.validate(..) )" method="intercept"/>
+	  <aop:around pointcut="execution( * org.hisp.dhis.dataanalysis.DataAnalysisService.analyse(..) )" method="intercept"/>
+    </aop:aspect>
+    
+	<!--
+    <aop:aspect ref="i18nTranslationInterceptor">
+      <aop:after-returning pointcut="execution( * org.hisp.dhis.dataelement.DataElementService.get*(..) )" method="intercept" returning="object"/>
+      <aop:after-returning pointcut="execution( * org.hisp.dhis.dataelement.DataElementCategoryService.get*(..) )" method="intercept" returning="object"/>
+      <aop:after-returning pointcut="execution( * org.hisp.dhis.indicator.IndicatorService.get*(..) )" method="intercept" returning="object"/>
+      <aop:after-returning pointcut="execution( * org.hisp.dhis.datadictionary.DataDictionaryService.get*(..) )" method="intercept" returning="object"/>
+      <aop:after-returning pointcut="execution( * org.hisp.dhis.dataset.DataSetService.get*(..) )" method="intercept" returning="object"/>
+      <aop:after-returning pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitService.get*(..) )" method="intercept" returning="object"/>
+      <aop:after-returning pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitGroupService.get*(..) )" method="intercept" returning="object"/>
+    </aop:aspect>
+	-->
+	
+  </aop:config>
+  
+</beans>

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/User.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/User.hbm.xml	2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/User.hbm.xml	2010-05-07 11:16:36 +0000
@@ -4,7 +4,7 @@
   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
-  <class name="org.hisp.dhis.user.User" table="userinfo">
+  <class name="org.hisp.dhis.user.User" lazy="false" table="userinfo">
 
     <cache usage="read-write"/>
 

=== modified file 'dhis-2/dhis-services/dhis-service-i18n/pom.xml'
--- dhis-2/dhis-services/dhis-service-i18n/pom.xml	2010-04-22 14:06:28 +0000
+++ dhis-2/dhis-services/dhis-service-i18n/pom.xml	2010-05-07 11:16:36 +0000
@@ -1,36 +1,36 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  
-  <parent>
-    <groupId>org.hisp.dhis</groupId>
-    <artifactId>dhis-services</artifactId>
-    <version>2.0.5-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>dhis-service-i18n</artifactId>
-  <packaging>jar</packaging>
-  <name>DHIS I18n Static</name>
-  
-  <dependencies>
-    
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-	
-  </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+    <groupId>org.hisp.dhis</groupId>
+    <artifactId>dhis-services</artifactId>
+    <version>2.0.5-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>dhis-service-i18n</artifactId>
+  <packaging>jar</packaging>
+  <name>DHIS I18n Static</name>
+  
+  <dependencies>
+    
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-service-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+	
+  </dependencies>
   <properties>
     <rootDir>../../</rootDir>
   </properties>
-</project>
-
+</project>
+

=== modified file 'dhis-2/dhis-services/dhis-service-patient/pom.xml'
--- dhis-2/dhis-services/dhis-service-patient/pom.xml	2010-04-27 15:04:10 +0000
+++ dhis-2/dhis-services/dhis-service-patient/pom.xml	2010-05-07 11:16:36 +0000
@@ -1,33 +1,33 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.hisp.dhis</groupId>
-    <artifactId>dhis-services</artifactId>
-    <version>2.0.5-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>dhis-service-patient</artifactId>
-  <packaging>jar</packaging>
-  <name>DHIS Patient API Implementations</name>
-
-  <dependencies>
-    
-    <!-- DHIS -->
-    
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-core</artifactId>
-    </dependency>
-    
-  </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.hisp.dhis</groupId>
+    <artifactId>dhis-services</artifactId>
+    <version>2.0.5-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>dhis-service-patient</artifactId>
+  <packaging>jar</packaging>
+  <name>DHIS Patient API Implementations</name>
+
+  <dependencies>
+    
+    <!-- DHIS -->
+    
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-service-core</artifactId>
+    </dependency>
+    
+  </dependencies>
   <properties>
     <rootDir>../../</rootDir>
   </properties>
-</project>
+</project>

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierService.java	2010-04-05 12:41:21 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierService.java	2010-05-07 11:16:36 +0000
@@ -27,14 +27,15 @@
 
 package org.hisp.dhis.patient;
 
+
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.springframework.transaction.annotation.Transactional;
 
-import edu.emory.mathcs.backport.java.util.Collections;
 
 /**
  * @author Abyot Asalefew Gizaw

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientService.java	2010-04-19 09:54:45 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientService.java	2010-05-07 11:16:36 +0000
@@ -36,7 +36,6 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.apache.log4j.Logger;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.patientattributevalue.PatientAttributeValue;
 import org.hisp.dhis.patientattributevalue.PatientAttributeValueService;
@@ -44,7 +43,6 @@
 import org.hisp.dhis.relationship.RelationshipService;
 import org.hisp.dhis.relationship.RelationshipType;
 import org.hisp.dhis.relationship.RelationshipTypeService;
-import org.hisp.dhis.system.util.AuditLogLevel;
 import org.hisp.dhis.user.CurrentUserService;
 import org.springframework.transaction.annotation.Transactional;
 

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/pom.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/pom.xml	2010-04-08 16:55:35 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/pom.xml	2010-05-07 11:16:36 +0000
@@ -1,86 +1,104 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  
-  <parent>
-    <groupId>org.hisp.dhis</groupId>
-    <artifactId>dhis-support</artifactId>
-    <version>2.0.5-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>dhis-support-hibernate</artifactId>
-  <packaging>jar</packaging>
-  <name>DHIS Hibernate Support</name>
-  
-  <dependencies>
-    
-    <!-- DHIS -->
-    
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-support-external</artifactId>
-    </dependency>
-    
-    <!-- Hibernate -->
-    
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
-    </dependency>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+    <groupId>org.hisp.dhis</groupId>
+    <artifactId>dhis-support</artifactId>
+    <version>2.0.5-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>dhis-support-hibernate</artifactId>
+  <packaging>jar</packaging>
+  <name>DHIS Hibernate Support</name>
+  
+  <dependencies>
+    
+    <!-- DHIS -->
+    
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-support-external</artifactId>
+    </dependency>
+    
+    <!-- Hibernate -->
+    
+
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-ehcache</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-entitymanager</artifactId>
+    </dependency>
+
+    <!--dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate</artifactId>
+    </dependency-->
     <dependency>
       <groupId>geronimo-spec</groupId>
       <artifactId>geronimo-spec-jta</artifactId>
     </dependency>
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>c3p0</groupId>
-      <artifactId>c3p0</artifactId>
-    </dependency>
-    
-    <!-- Database connectors -->
-    
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-    </dependency>
-    <dependency>
-	  <groupId>postgresql</groupId>
-	  <artifactId>postgresql</artifactId>
-	</dependency>
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-    </dependency>
-    
-    <!-- Other -->
-    
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency> 
-    
-    <!-- Monitoring -->
-    <!--
-    <dependency>
-      <groupId>com.elvyx</groupId>
-      <artifactId>elvyx</artifactId>
-      <version>1.0.24</version>
-    </dependency> -->
-    
-  </dependencies>
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache-terracotta</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>c3p0</groupId>
+      <artifactId>c3p0</artifactId>
+    </dependency>
+    
+    <!-- Database connectors -->
+    
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+    </dependency>
+    <dependency>
+	  <groupId>postgresql</groupId>
+	  <artifactId>postgresql</artifactId>
+	</dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+    </dependency>
+    
+    <!-- Other -->
+    
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-orm</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency> 
+    
+    <!-- Monitoring -->
+    <!--
+    <dependency>
+      <groupId>com.elvyx</groupId>
+      <artifactId>elvyx</artifactId>
+      <version>1.0.24</version>
+    </dependency> -->
+    
+  </dependencies>
   <properties>
     <rootDir>../../</rootDir>
   </properties>
-</project>
+</project>

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties	2009-06-10 22:25:07 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties	2010-05-07 11:16:36 +0000
@@ -26,7 +26,8 @@
 
 # Caching
 
-hibernate.cache.provider_class = org.hibernate.cache.EhCacheProvider
+hibernate.cache.region.factory_class = net.sf.ehcache.hibernate.EhCacheRegionFactory
+#hibernate.cache.provider_class = org.hibernate.cache.EhCacheProvider
 hibernate.cache.use_second_level_cache = true
 hibernate.cache.use_query_cache = true
 

=== modified file 'dhis-2/dhis-support/dhis-support-system/pom.xml'
--- dhis-2/dhis-support/dhis-support-system/pom.xml	2010-04-08 16:55:35 +0000
+++ dhis-2/dhis-support/dhis-support-system/pom.xml	2010-05-07 11:16:36 +0000
@@ -1,95 +1,99 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  
-  <parent>
-    <groupId>org.hisp.dhis</groupId>
-    <artifactId>dhis-support</artifactId>
-    <version>2.0.5-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>dhis-support-system</artifactId>
-  <packaging>jar</packaging>
-  <name>DHIS System Support</name>
-  
-  <dependencies>
-    
-    <!-- DHIS -->
-        
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-support-hibernate</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-support-test</artifactId>
-    </dependency>
-    
-    <!-- Other -->
-    
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjweaver</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.lowagie</groupId>
-      <artifactId>itext</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-math</groupId>
-      <artifactId>commons-math</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-validator</groupId>
-      <artifactId>commons-validator</artifactId>
-    </dependency> 
-    <dependency>
-      <groupId>jep</groupId>
-      <artifactId>jep</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-    </dependency> 
-    <dependency>
-      <groupId>org.amplecode</groupId>
-      <artifactId>cave-process</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.amplecode</groupId>
-      <artifactId>quick</artifactId>
-    </dependency>
-  </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+    <groupId>org.hisp.dhis</groupId>
+    <artifactId>dhis-support</artifactId>
+    <version>2.0.5-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>dhis-support-system</artifactId>
+  <packaging>jar</packaging>
+  <name>DHIS System Support</name>
+  
+  <dependencies>
+    
+    <!-- DHIS -->
+        
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-support-hibernate</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-support-test</artifactId>
+    </dependency>
+    
+    <!-- Other -->
+    
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjweaver</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.lowagie</groupId>
+      <artifactId>itext</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-math</groupId>
+      <artifactId>commons-math</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-validator</groupId>
+      <artifactId>commons-validator</artifactId>
+    </dependency> 
+    <dependency>
+      <groupId>jep</groupId>
+      <artifactId>jep</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+    </dependency> 
+    <dependency>
+      <groupId>org.amplecode</groupId>
+      <artifactId>cave-process</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.amplecode</groupId>
+      <artifactId>quick</artifactId>
+    </dependency>
+  </dependencies>
   <properties>
     <rootDir>../../</rootDir>
   </properties>
-</project>
+</project>

=== modified file 'dhis-2/dhis-support/dhis-support-test/pom.xml'
--- dhis-2/dhis-support/dhis-support-test/pom.xml	2010-04-08 16:55:35 +0000
+++ dhis-2/dhis-support/dhis-support-test/pom.xml	2010-05-07 11:16:36 +0000
@@ -1,51 +1,59 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  
-  <parent>
-    <groupId>org.hisp.dhis</groupId>
-    <artifactId>dhis-support</artifactId>
-    <version>2.0.5-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>dhis-support-test</artifactId>
-  <packaging>jar</packaging>
-  <name>DHIS Test Support</name>
-  
-  <dependencies>
-    
-    <!-- DHIS -->
-
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-api</artifactId>
-    </dependency>
-		
-    <!-- Other -->
-    
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-    </dependency>
-  </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+    <groupId>org.hisp.dhis</groupId>
+    <artifactId>dhis-support</artifactId>
+    <version>2.0.5-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>dhis-support-test</artifactId>
+  <packaging>jar</packaging>
+  <name>DHIS Test Support</name>
+  
+  <dependencies>
+    
+    <!-- DHIS -->
+
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-api</artifactId>
+    </dependency>
+		
+    <!-- Other -->
+    
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-orm</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <!--dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate</artifactId>
+    </dependency-->
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+    </dependency>
+  </dependencies>
   <properties>
     <rootDir>../../</rootDir>
   </properties>
-</project>
+</project>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/pom.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/pom.xml	2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/pom.xml	2010-05-07 11:16:36 +0000
@@ -1,50 +1,50 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  
-  <parent>
-    <groupId>org.hisp.dhis</groupId>
-    <artifactId>dhis-web</artifactId>
-    <version>2.0.5-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>dhis-web-caseentry</artifactId>
-  <packaging>war</packaging>
-  <name>DHIS Case Entry</name>
-  
-  <build>
-    <finalName>dhis-web-caseentry</finalName>
-  </build>
-  
-  <dependencies>
-    
-    <!-- DHIS -->
-    
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-web-commons</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-web-commons-resources</artifactId>
-      <type>war</type>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-patient</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-options</artifactId>
-    </dependency>      
-    
-  </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+    <groupId>org.hisp.dhis</groupId>
+    <artifactId>dhis-web</artifactId>
+    <version>2.0.5-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>dhis-web-caseentry</artifactId>
+  <packaging>war</packaging>
+  <name>DHIS Case Entry</name>
+  
+  <build>
+    <finalName>dhis-web-caseentry</finalName>
+  </build>
+  
+  <dependencies>
+    
+    <!-- DHIS -->
+    
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-web-commons</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-web-commons-resources</artifactId>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-service-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-service-patient</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-service-options</artifactId>
+    </dependency>      
+    
+  </dependencies>
   <properties>
     <rootDir>../../</rootDir>
   </properties>
-</project>
+</project>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/pom.xml'
--- dhis-2/dhis-web/dhis-web-commons/pom.xml	2010-04-22 14:06:28 +0000
+++ dhis-2/dhis-web/dhis-web-commons/pom.xml	2010-05-07 11:16:36 +0000
@@ -97,8 +97,8 @@
     <!-- Other -->
 	
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java	2010-05-07 11:16:36 +0000
@@ -28,6 +28,7 @@
  */
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.hisp.dhis.dataelement.DataElementOperand;
@@ -36,8 +37,6 @@
 
 import com.opensymphony.xwork2.Action;
 
-import edu.emory.mathcs.backport.java.util.Collections;
-
 /**
  * @author Lars Helge Overland
  */

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/encoding/velocity/EncoderVelocityContext.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/encoding/velocity/EncoderVelocityContext.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/encoding/velocity/EncoderVelocityContext.java	2010-05-07 11:16:36 +0000
@@ -27,9 +27,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 import org.apache.velocity.VelocityContext;
 
-import com.opensymphony.xwork2.util.TextUtils;
+import org.apache.commons.lang.StringEscapeUtils;
 
 /**
  * @author Torgeir Lorange Ostby
@@ -127,7 +128,7 @@
 
         private String defaultEncode( String string )
         {
-            return TextUtils.htmlEncode( string );
+            return StringEscapeUtils.escapeHtml( string );
         }
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ExceptionInterceptor.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ExceptionInterceptor.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ExceptionInterceptor.java	2010-05-07 11:16:36 +0000
@@ -30,10 +30,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.security.AccessDeniedException;
-import org.springframework.security.InsufficientAuthenticationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.authentication.InsufficientAuthenticationException;
 
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.interceptor.Interceptor;

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/AbstractAutomaticAccessProvider.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/AbstractAutomaticAccessProvider.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/AbstractAutomaticAccessProvider.java	2010-05-07 11:16:36 +0000
@@ -31,8 +31,8 @@
 
 import org.hisp.dhis.security.authority.SystemAuthoritiesProvider;
 import org.hisp.dhis.user.UserStore;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 
 /**
  * Abstract automatic access provider class. Delegates methods initialise() and 

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/GhostAutomaticAccessProvider.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/GhostAutomaticAccessProvider.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/GhostAutomaticAccessProvider.java	2010-05-07 11:16:36 +0000
@@ -27,10 +27,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.springframework.security.Authentication;
-import org.springframework.security.context.SecurityContextHolder;
-import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
 
 /**
  * This access provider will put an Authentication object with all GrantedAuthorities
@@ -54,7 +54,7 @@
         String username = "ghost_admin";
         String password = "";
 
-        UserDetails user = new org.springframework.security.userdetails.User( username, password, true, true, true, true,
+        UserDetails user = new org.springframework.security.core.userdetails.User( username, password, true, true, true, true,
             getGrantedAuthorities() );
 
         authentication = new UsernamePasswordAuthenticationToken( user, user.getPassword(), user.getAuthorities() );

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/SpringSecurityActionAccessResolver.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/SpringSecurityActionAccessResolver.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/SpringSecurityActionAccessResolver.java	2010-05-07 11:16:36 +0000
@@ -31,13 +31,14 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.dispatcher.Dispatcher;
 import org.hisp.dhis.security.authority.RequiredAuthoritiesProvider;
-import org.springframework.security.AccessDecisionManager;
-import org.springframework.security.AccessDeniedException;
-import org.springframework.security.Authentication;
-import org.springframework.security.InsufficientAuthenticationException;
-import org.springframework.security.context.SecurityContext;
-import org.springframework.security.context.SecurityContextHolder;
-import org.springframework.security.intercept.ObjectDefinitionSource;
+
+import org.springframework.security.access.AccessDecisionManager;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.SecurityMetadataSource;
+import org.springframework.security.authentication.InsufficientAuthenticationException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
 
 import com.opensymphony.xwork2.config.Configuration;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
@@ -96,8 +97,8 @@
             throw new IllegalArgumentException( "Module " + module + " doesn't have an action named: '" + name + "'" );
         }
 
-        ObjectDefinitionSource objectDefinitionSource = requiredAuthoritiesProvider
-            .createObjectDefinitionSource( actionConfig );
+        SecurityMetadataSource securityMetadataSource = requiredAuthoritiesProvider
+            .createSecurityMetadataSource( actionConfig );
 
         // ---------------------------------------------------------------------
         // Test access
@@ -109,14 +110,14 @@
 
         try
         {
-            if ( objectDefinitionSource.getAttributes( actionConfig ) != null )
+            if ( securityMetadataSource.getAttributes( actionConfig ) != null )
             {
                 if ( authentication == null || !authentication.isAuthenticated() )
                 {
                     return false;
                 }
 
-                accessDecisionManager.decide( authentication, actionConfig, objectDefinitionSource
+                accessDecisionManager.decide( authentication, actionConfig, securityMetadataSource
                     .getAttributes( actionConfig ) );
             }
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/DefaultRequiredAuthoritiesProvider.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/DefaultRequiredAuthoritiesProvider.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/DefaultRequiredAuthoritiesProvider.java	2010-05-07 11:16:36 +0000
@@ -31,15 +31,14 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import org.springframework.security.ConfigAttributeDefinition;
-import org.springframework.security.SecurityConfig;
-import org.springframework.security.intercept.ObjectDefinitionSource;
-import org.hisp.dhis.security.intercept.SingleObjectDefinitionSource;
+import org.hisp.dhis.security.intercept.SingleSecurityMetadataSource;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.access.SecurityMetadataSource;
 
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 
@@ -72,29 +71,27 @@
     // RequiredAuthoritiesProvider implementation
     // -------------------------------------------------------------------------
 
-    public ObjectDefinitionSource createObjectDefinitionSource( ActionConfig actionConfig )
+    public SecurityMetadataSource createSecurityMetadataSource( ActionConfig actionConfig )
     {
-        return createObjectDefinitionSource( actionConfig, actionConfig );
+        return createSecurityMetadataSource( actionConfig, actionConfig );
     }
-    public ObjectDefinitionSource createObjectDefinitionSource( ActionConfig actionConfig, Object object )
+    public SecurityMetadataSource createSecurityMetadataSource( ActionConfig actionConfig, Object object )
     {
         Collection<String> requiredAuthorities = getRequiredAuthorities( actionConfig );
 
-        List<SecurityConfig> list = new ArrayList<SecurityConfig>();
+        Collection<ConfigAttribute> attributes = new ArrayList<ConfigAttribute>();
         
         for ( String requiredAuthority : requiredAuthorities )
         {
-            list.add( new SecurityConfig( requiredAuthority ) );
+            attributes.add( new SecurityConfig( requiredAuthority ) );
         }
 
         for ( String globalAttribute : globalAttributes )
         {
-            list.add( new SecurityConfig( globalAttribute ) );
+            attributes.add( new SecurityConfig( globalAttribute ) );
         }
 
-        ConfigAttributeDefinition attributes = new ConfigAttributeDefinition(list);
-        
-        return new SingleObjectDefinitionSource( object, attributes );
+        return new SingleSecurityMetadataSource( object, attributes );
     }
     
     public Collection<String> getRequiredAuthorities( ActionConfig actionConfig )

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/RequiredAuthoritiesProvider.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/RequiredAuthoritiesProvider.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/RequiredAuthoritiesProvider.java	2010-05-07 11:16:36 +0000
@@ -29,7 +29,7 @@
 
 import java.util.Collection;
 
-import org.springframework.security.intercept.ObjectDefinitionSource;
+import org.springframework.security.access.SecurityMetadataSource;
 
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 
@@ -40,25 +40,25 @@
 public interface RequiredAuthoritiesProvider
 {
     /**
-     * Creates an ObjectDefinitionSource based on the required authorities for
+     * Creates an SecurityMetadataSource based on the required authorities for
      * the action config. The specified action config is set as the secure
-     * object. The ObjectDefinitionSource may include additional attributes if
+     * object. The SecurityMetadataSource may include additional attributes if
      * needed.
      * 
      * @param actionConfig the secure actionConfig to get required authorities
      *        from.
      */
-    public ObjectDefinitionSource createObjectDefinitionSource( ActionConfig actionConfig );
+    public SecurityMetadataSource createSecurityMetadataSource( ActionConfig actionConfig );
 
     /**
-     * Creates an ObjectDefinitionSource for a specified secure object based on
+     * Creates an SecurityMetadataSource for a specified secure object based on
      * the required authorities for the action config. The
-     * ObjectDefinitionSource may include additional attributes if needed.
+     * SecurityMetadataSource may include additional attributes if needed.
      * 
      * @param actionConfig the actionConfig to get required authorities from.
      * @param object the secure object.
      */
-    public ObjectDefinitionSource createObjectDefinitionSource( ActionConfig actionConfig, Object object );
+    public SecurityMetadataSource createSecurityMetadataSource( ActionConfig actionConfig, Object object );
 
     /**
      * Returns the required authorities of an action configuration.

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/UserAuditLogoutFilter.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/UserAuditLogoutFilter.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/UserAuditLogoutFilter.java	2010-05-07 11:16:36 +0000
@@ -31,9 +31,9 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.hisp.dhis.useraudit.UserAuditService;
-import org.springframework.security.Authentication;
-import org.springframework.security.ui.logout.LogoutHandler;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.web.authentication.logout.LogoutHandler;
 
 /**
  * @author Lars Helge Overland

=== renamed file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/SingleObjectDefinitionSource.java' => 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/SingleSecurityMetadataSource.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/SingleObjectDefinitionSource.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/SingleSecurityMetadataSource.java	2010-05-07 11:16:36 +0000
@@ -29,42 +29,41 @@
 
 import java.util.Collection;
 
-import org.springframework.security.ConfigAttributeDefinition;
-import org.springframework.security.intercept.ObjectDefinitionSource;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.SecurityMetadataSource;
 
 /**
- * Generic ObjectDefinitionSource for one single object.
+ * Generic SecurityMetadataSource for one single object.
  * 
  * @author Torgeir Lorange Ostby
- * @version $Id: SingleObjectDefinitionSource.java 6335 2008-11-20 11:11:26Z larshelg $
  */
-public class SingleObjectDefinitionSource
-    implements ObjectDefinitionSource
+public class SingleSecurityMetadataSource
+    implements SecurityMetadataSource
 {
     private Object object;
 
-    private ConfigAttributeDefinition attributes;
+    private Collection<ConfigAttribute> attributes;
 
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------
 
-    public SingleObjectDefinitionSource( Object object )
+    public SingleSecurityMetadataSource( Object object )
     {
         this.object = object;
     }
 
-    public SingleObjectDefinitionSource( Object object, ConfigAttributeDefinition attributes )
+    public SingleSecurityMetadataSource( Object object, Collection<ConfigAttribute> attributes )
     {
         this.object = object;   
         this.attributes = attributes;        
     }
 
     // -------------------------------------------------------------------------
-    // ObjectDefinitionSource implementation
+    // SecurityMetadataSource implementation
     // -------------------------------------------------------------------------
 
-    public ConfigAttributeDefinition getAttributes( Object object )
+    public Collection<ConfigAttribute> getAttributes( Object object )
         throws IllegalArgumentException
     {
         if ( !supports( object.getClass() ) )
@@ -80,14 +79,16 @@
         return null;
     }
 
-    public Collection<?> getConfigAttributeDefinitions()
-    {
-        return null;
-    }
-
-    @SuppressWarnings( "unchecked" )
-    public boolean supports( Class clazz )
+    @Override
+    public boolean supports( Class<?> clazz )
     {
         return clazz.isAssignableFrom( object.getClass() );
     }
+
+    @Override
+    public Collection<ConfigAttribute> getAllConfigAttributes()
+    {
+        return this.attributes;
+    }
+
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/XWorkSecurityInterceptor.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/XWorkSecurityInterceptor.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/XWorkSecurityInterceptor.java	2010-05-07 11:16:36 +0000
@@ -30,11 +30,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.security.intercept.AbstractSecurityInterceptor;
-import org.springframework.security.intercept.InterceptorStatusToken;
-import org.springframework.security.intercept.ObjectDefinitionSource;
 import org.hisp.dhis.security.ActionAccessResolver;
 import org.hisp.dhis.security.authority.RequiredAuthoritiesProvider;
+import org.springframework.security.access.SecurityMetadataSource;
+import org.springframework.security.access.intercept.AbstractSecurityInterceptor;
+import org.springframework.security.access.intercept.InterceptorStatusToken;
 
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
@@ -50,7 +50,7 @@
 {
     private static final String KEY_ACTION_ACCESS_RESOLVER = "auth";
 
-    private ThreadLocal<ObjectDefinitionSource> definitionSourceTag = new ThreadLocal<ObjectDefinitionSource>();
+    private ThreadLocal<SecurityMetadataSource> definitionSourceTag = new ThreadLocal<SecurityMetadataSource>();
 
     // -------------------------------------------------------------------------
     // Dependencies
@@ -85,14 +85,14 @@
     public String intercept( ActionInvocation invocation )
         throws Exception
     {
-        Object result = null;
         ActionConfig actionConfig = invocation.getProxy().getConfig();
-        definitionSourceTag.set( requiredAuthoritiesProvider.createObjectDefinitionSource( actionConfig ) );
+        definitionSourceTag.set( requiredAuthoritiesProvider.createSecurityMetadataSource( actionConfig ) );
 
         InterceptorStatusToken token = beforeInvocation( actionConfig );
 
         addActionAccessResolver( invocation );
 
+        Object result = null;
         try
         {
             result = invocation.invoke();
@@ -123,9 +123,9 @@
     }
 
     @Override
-    public ObjectDefinitionSource obtainObjectDefinitionSource()
+    public SecurityMetadataSource obtainSecurityMetadataSource()
     {
-        ObjectDefinitionSource definitionSource = definitionSourceTag.get();
+        SecurityMetadataSource definitionSource = definitionSourceTag.get();
 
         if ( definitionSource != null )
         {
@@ -137,7 +137,7 @@
         // invocation. Returning an empty dummy.
         // ---------------------------------------------------------------------
 
-        return new SingleObjectDefinitionSource( new ActionConfig.Builder( "", "", "" ).build() );
+        return new SingleSecurityMetadataSource( new ActionConfig.Builder( "", "", "" ).build() );
     }
 
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/listener/AuthenticationListener.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/listener/AuthenticationListener.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/listener/AuthenticationListener.java	2010-05-07 11:16:36 +0000
@@ -30,9 +30,9 @@
 import org.hisp.dhis.useraudit.UserAuditService;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
-import org.springframework.security.event.authentication.AbstractAuthenticationFailureEvent;
-import org.springframework.security.event.authentication.AuthenticationSuccessEvent;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent;
+import org.springframework.security.authentication.event.AuthenticationSuccessEvent;
+import org.springframework.security.core.userdetails.UserDetails;
 
 /**
  * @author Lars Helge Overland

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/AbstractPrefixedAccessDecisionVoter.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/AbstractPrefixedAccessDecisionVoter.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/AbstractPrefixedAccessDecisionVoter.java	2010-05-07 11:16:36 +0000
@@ -27,10 +27,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.vote.AccessDecisionVoter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.security.access.AccessDecisionVoter;
+import org.springframework.security.access.ConfigAttribute;
 
 /**
  * @author Torgeir Lorange Ostby

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ActionAccessVoter.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ActionAccessVoter.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ActionAccessVoter.java	2010-05-07 11:16:36 +0000
@@ -31,10 +31,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.security.Authentication;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.ConfigAttributeDefinition;
-import org.springframework.security.GrantedAuthority;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
 
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 
@@ -51,8 +50,8 @@
     // AccessDecisionVoter implementation
     // -------------------------------------------------------------------------
 
-    @SuppressWarnings( "unchecked" )
-    public boolean supports( Class clazz )
+    @Override
+    public boolean supports( Class<?> clazz )
     {
         boolean result = ActionConfig.class.equals( clazz );
 
@@ -61,8 +60,8 @@
         return result;
     }
 
-    @SuppressWarnings( "unchecked" )
-    public int vote( Authentication authentication, Object object, ConfigAttributeDefinition definition )
+    @Override
+    public int vote( Authentication authentication, Object object, Collection<ConfigAttribute> attributes )
     {
         if ( !supports( object.getClass() ) )
         {
@@ -73,8 +72,6 @@
 
         int supported = 0;
         
-        Collection<ConfigAttribute> attributes =  definition.getConfigAttributes();
-
         for ( ConfigAttribute attribute : attributes )
         {
             if ( supports( attribute ) )

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/LogicalOrAccessDecisionManager.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/LogicalOrAccessDecisionManager.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/LogicalOrAccessDecisionManager.java	2010-05-07 11:16:36 +0000
@@ -27,17 +27,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.springframework.security.AccessDecisionManager;
-import org.springframework.security.AccessDeniedException;
-import org.springframework.security.Authentication;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.ConfigAttributeDefinition;
-import org.springframework.security.InsufficientAuthenticationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.security.access.AccessDecisionManager;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.authentication.InsufficientAuthenticationException;
+import org.springframework.security.core.Authentication;
 
 /**
  * AccessDecisionManager which delegates to other AccessDecisionManagers in a
@@ -65,7 +65,8 @@
     // Interface implementation
     // -------------------------------------------------------------------------
 
-    public void decide( Authentication authentication, Object object, ConfigAttributeDefinition definition )
+    @Override
+    public void decide( Authentication authentication, Object object, Collection<ConfigAttribute> configAttributes )
         throws AccessDeniedException, InsufficientAuthenticationException
     {
         AccessDeniedException ade = null;
@@ -75,7 +76,7 @@
         {
             try
             {
-                accessDecisionManager.decide( authentication, object, definition );
+                accessDecisionManager.decide( authentication, object, configAttributes );
 
                 LOG.debug( "ACCESS GRANTED [" + object.toString() + "]" );
 
@@ -117,8 +118,8 @@
         return false;
     }
 
-    @SuppressWarnings( "unchecked" )
-    public boolean supports( Class clazz )
+    @Override
+    public boolean supports( Class<?> clazz )
     {
         for ( AccessDecisionManager accessDecisionManager : accessDecisionManagers )
         {

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ModuleAccessVoter.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ModuleAccessVoter.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ModuleAccessVoter.java	2010-05-07 11:16:36 +0000
@@ -27,14 +27,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
 
-import org.springframework.security.Authentication;
-import org.springframework.security.ConfigAttributeDefinition;
-import org.springframework.security.GrantedAuthority;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
 
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 
@@ -75,8 +76,8 @@
      * <code>com.opensymphony.xwork.config.entities.ActionConfig</code>.
      * False otherwise.
      */
-    @SuppressWarnings( "unchecked" )
-    public boolean supports( Class clazz )
+    @Override
+    public boolean supports( Class<?> clazz )
     {
         boolean result = ActionConfig.class.equals( clazz );
 
@@ -91,7 +92,7 @@
      * prefix + module name, or the module name is in the always accessible set.
      * Otherwise votes ACCESS_DENIED.
      */
-    public int vote( Authentication authentication, Object object, ConfigAttributeDefinition definition )
+    public int vote( Authentication authentication, Object object, Collection<ConfigAttribute> attributes )
     {
         if ( !supports( object.getClass() ) )
         {

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/SimpleAccessVoter.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/SimpleAccessVoter.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/SimpleAccessVoter.java	2010-05-07 11:16:36 +0000
@@ -27,14 +27,16 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.springframework.security.Authentication;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.ConfigAttributeDefinition;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.vote.AccessDecisionVoter;
+import java.util.Collection;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.springframework.security.access.AccessDecisionVoter;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+
 /**
  * Simple AccessDecisionVoter which grants access if a specified required
  * authority is among the configAttributes.
@@ -64,13 +66,13 @@
             && configAttribute.getAttribute().equals( requiredAuthority );
     }
 
-    @SuppressWarnings( "unchecked" )
-    public boolean supports( Class clazz )
+    @Override
+    public boolean supports( Class<?> clazz )
     {
         return true;
     }
 
-    public int vote( Authentication authentication, Object object, ConfigAttributeDefinition definition )
+    public int vote( Authentication authentication, Object object, Collection<ConfigAttribute> attributes )
     {
         for ( GrantedAuthority authority : authentication.getAuthorities() )
         {

=== 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	2010-04-28 04:59:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2010-05-07 11:16:36 +0000
@@ -5,7 +5,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 
 						http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 						http://www.springframework.org/schema/security
-						http://www.springframework.org/schema/security/spring-security-2.0.xsd">
+						http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
 
 	<!-- Web Portal -->
 
@@ -21,7 +21,7 @@
 		</property>
 	</bean>
 		
-    <bean id="filterChainProxy" class="org.springframework.security.util.FilterChainProxy">
+    <bean id="filterChainProxy" class="org.springframework.security.web.FilterChainProxy">
         <sec:filter-chain-map path-type="ant">
         <sec:filter-chain pattern="/dhis-web-commons/security/**" filters="none"/>
         <sec:filter-chain pattern="/dhis-web-commons/util/**" filters="none"/>
@@ -281,23 +281,31 @@
     <!-- Security : Filter -->
 	
 	<bean id="httpSessionContextIntegrationFilter"
-		class="org.springframework.security.context.HttpSessionContextIntegrationFilter" />
+		class="org.springframework.security.web.context.HttpSessionContextIntegrationFilter" />
 
 	<bean id="authenticationProcessingFilter"
-		class="org.springframework.security.ui.webapp.AuthenticationProcessingFilter">
+		class="org.springframework.security.web.authentication.AuthenticationProcessingFilter">
 		<property name="authenticationManager" ref="authenticationManager" />
-		<property name="authenticationFailureUrl" value="/dhis-web-commons/security/loginfailed.jsp" />
-		<property name="defaultTargetUrl" value="/dhis-web-commons-security/loggedIn.action" />
+                <property name="authenticationFailureHandler" ref="failureHandler" />
+                <property name="authenticationSuccessHandler" ref="successHandler" />
 		<property name="filterProcessesUrl" value="/dhis-web-commons-security/login.action" />
-		<property name="alwaysUseDefaultTargetUrl" value="true" />
 	</bean>
 
-	<bean id="logoutFilter" class="org.springframework.security.ui.logout.LogoutFilter">
+        <bean id="successHandler" class="org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler" >
+          <property name="defaultTargetUrl" value="/dhis-web-commons-security/loggedIn.action" />
+          <property name="alwaysUseDefaultTargetUrl" value="true" />
+        </bean>
+        
+        <bean id="failureHandler" class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler" >
+          <property name="defaultFailureUrl" value="/dhis-web-commons/security/loginfailed.jsp" />
+        </bean>
+
+	<bean id="logoutFilter" class="org.springframework.security.web.authentication.logout.LogoutFilter">
 		<constructor-arg value="/" />
 		<constructor-arg>
 			<list>
 				<ref bean="userAuditLogoutFilter" />
-				<bean class="org.springframework.security.ui.logout.SecurityContextLogoutHandler" />
+				<bean class="org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler" />
 			</list>
 		</constructor-arg>
 		<property name="filterProcessesUrl" value="/dhis-web-commons-security/logout.action" />
@@ -369,7 +377,7 @@
 		</property>
 	</bean>
 
-	<bean id="regularAccessDecisionVoting" class="org.springframework.security.vote.UnanimousBased">
+	<bean id="regularAccessDecisionVoting" class="org.springframework.security.access.vote.UnanimousBased">
 		<property name="decisionVoters">
 			<list>
 				<ref local="actionAccessVoter" />
@@ -400,7 +408,7 @@
 		</property>
 	</bean>
 
-	<bean id="adminAccessDecisionVoting" class="org.springframework.security.vote.UnanimousBased">
+	<bean id="adminAccessDecisionVoting" class="org.springframework.security.access.vote.UnanimousBased">
 		<property name="decisionVoters">
 			<list>
 				<ref local="adminAccessVoter" />

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/GetDataSetAndPeriodByPeriodTypeAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/GetDataSetAndPeriodByPeriodTypeAction.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/GetDataSetAndPeriodByPeriodTypeAction.java	2010-05-07 11:16:36 +0000
@@ -28,6 +28,7 @@
 package org.hisp.dhis.reportexcel.datasetcompleted.action;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.hisp.dhis.dataset.DataSet;
@@ -45,8 +46,6 @@
 
 import com.opensymphony.xwork2.Action;
 
-import edu.emory.mathcs.backport.java.util.Collections;
-
 /**
  * @author Tran Thanh Tri
  * @version $Id$

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/ViewDataSetCompletedAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/ViewDataSetCompletedAction.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/ViewDataSetCompletedAction.java	2010-05-07 11:16:36 +0000
@@ -27,6 +27,7 @@
 package org.hisp.dhis.reportexcel.datasetcompleted.action;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -44,8 +45,6 @@
 import org.hisp.dhis.period.comparator.PeriodComparator;
 import org.hisp.dhis.reportexcel.action.ActionSupport;
 
-import edu.emory.mathcs.backport.java.util.Collections;
-
 /**
  * @author Tran Thanh Tri
  * @version $Id$

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java	2010-04-27 03:25:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java	2010-05-07 11:16:36 +0000
@@ -29,6 +29,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -53,8 +54,6 @@
 
 import com.opensymphony.xwork2.Action;
 
-import edu.emory.mathcs.backport.java.util.Collections;
-
 /**
  * @author espenjac, joakibj, briane, eivinhb
  * @version $Id$

=== 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	2010-04-29 04:33:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml	2010-05-07 11:16:36 +0000
@@ -414,16 +414,13 @@
 		</property>
 	</bean>
 
-	<bean
-		id="org.hisp.dhis.dataadmin.action.minmaxvalidation.UnselectOrganisationUnitGroupAction"
-		class="org.hisp.dhis.dataadmin.action.minmaxvalidation.UnselectOrganisationUnitGroupAction"
-		scope="prototype">
-		<property name="selectionTreeManager">
-			<ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
-		</property>
-		<property name="organisationUnitGroupService">
-			<ref bean="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
-		</property>
+	<bean id="org.hisp.dhis.dataadmin.action.minmaxvalidation.UnselectOrganisationUnitGroupAction"
+              class="org.hisp.dhis.dataadmin.action.minmaxvalidation.UnselectOrganisationUnitGroupAction"
+              scope="prototype">
+          <property name="selectionTreeManager"
+                    ref="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+          <property name="organisationUnitGroupService" 
+                    ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
 	</bean>
 
 </beans>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementAction.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementAction.java	2010-05-07 11:16:36 +0000
@@ -27,7 +27,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.hisp.dhis.dataelement.DataElement;
@@ -37,8 +39,6 @@
 
 import com.opensymphony.xwork2.ActionSupport;
 
-import edu.emory.mathcs.backport.java.util.Collections;
-
 /**
  * @author Torgeir Lorange Ostby
  * @version $Id: GetDataElementAction.java 5789 2008-10-02 09:47:04Z larshelg $

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowAddDataElementForm.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowAddDataElementForm.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowAddDataElementForm.java	2010-05-07 11:16:36 +0000
@@ -29,6 +29,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
@@ -43,8 +44,6 @@
 
 import com.opensymphony.xwork2.Action;
 
-import edu.emory.mathcs.backport.java.util.Collections;
-
 /**
  * @author Hans S. Toemmerholt
  * @version $Id: GetDataElementAction.java 2869 2007-02-20 14:26:09Z andegje $

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java	2010-05-07 11:16:36 +0000
@@ -31,6 +31,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -49,8 +50,6 @@
 
 import com.opensymphony.xwork2.ActionSupport;
 
-import edu.emory.mathcs.backport.java.util.Collections;
-
 /**
  * @author Hans S. Toemmerholt
  * @version $Id: GetDataElementAction.java 2869 2007-02-20 14:26:09Z andegje $

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetAssignedIndicatorGroupsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetAssignedIndicatorGroupsAction.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetAssignedIndicatorGroupsAction.java	2010-05-07 11:16:36 +0000
@@ -28,6 +28,7 @@
  */
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.hisp.dhis.indicator.Indicator;
@@ -37,7 +38,6 @@
 
 import com.opensymphony.xwork2.Action;
 
-import edu.emory.mathcs.backport.java.util.Collections;
 
 /**
  * @author Tran Thanh Tri

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupAction.java	2010-03-04 13:42:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupAction.java	2010-05-07 11:16:36 +0000
@@ -28,6 +28,7 @@
 package org.hisp.dhis.patient.action.patientattributegroup;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.hisp.dhis.patient.PatientAttribute;
@@ -38,8 +39,6 @@
 
 import com.opensymphony.xwork2.Action;
 
-import edu.emory.mathcs.backport.java.util.Collections;
-
 /**
  * @author Chau Thu Tran
  * @version $Id$

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupListAction.java	2010-01-29 03:08:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupListAction.java	2010-05-07 11:16:36 +0000
@@ -28,6 +28,7 @@
 package org.hisp.dhis.patient.action.patientattributegroup;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.hisp.dhis.patient.PatientAttributeGroup;
@@ -36,7 +37,6 @@
 
 import com.opensymphony.xwork2.Action;
 
-import edu.emory.mathcs.backport.java.util.Collections;
 
 /**
  * @author Chau Thu Tran

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/GetPatientIdentifierTypeListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/GetPatientIdentifierTypeListAction.java	2010-04-03 09:35:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/GetPatientIdentifierTypeListAction.java	2010-05-07 11:16:36 +0000
@@ -28,6 +28,7 @@
 package org.hisp.dhis.patient.action.patientidentifiertype;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.hisp.dhis.patient.PatientIdentifierType;
@@ -36,8 +37,6 @@
 
 import com.opensymphony.xwork2.Action;
 
-import edu.emory.mathcs.backport.java.util.Collections;
-
 /**
  * @author Viet 
  * @version $Id$

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLegendsAction.java'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLegendsAction.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLegendsAction.java	2010-05-07 11:16:36 +0000
@@ -27,7 +27,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.hisp.dhis.mapping.MapLegend;
@@ -36,8 +38,6 @@
 
 import com.opensymphony.xwork2.Action;
 
-import edu.emory.mathcs.backport.java.util.Collections;
-
 /**
  * @author Jan Henrik Overland
  * @version $Id$

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapLegendsByMapLegendSetAction.java'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapLegendsByMapLegendSetAction.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapLegendsByMapLegendSetAction.java	2010-05-07 11:16:36 +0000
@@ -28,6 +28,7 @@
  */
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.hisp.dhis.mapping.MapLegend;
@@ -36,8 +37,6 @@
 
 import com.opensymphony.xwork2.Action;
 
-import edu.emory.mathcs.backport.java.util.Collections;
-
 /**
  * @author Jan Henrik Overland
  * @version $Id$

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java	2010-05-07 11:16:36 +0000
@@ -30,6 +30,7 @@
 import static org.hisp.dhis.system.util.ConversionUtils.getIntegerCollection;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.hisp.dhis.chart.Chart;
@@ -45,8 +46,6 @@
 
 import com.opensymphony.xwork2.Action;
 
-import edu.emory.mathcs.backport.java.util.Collections;
-
 /**
  * @author Lars Helge Overland
  * @version $Id: UploadDesignAction.java 5207 2008-05-22 12:16:36Z larshelg $

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/pivottable/action/GetPivotTableAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/pivottable/action/GetPivotTableAction.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/pivottable/action/GetPivotTableAction.java	2010-05-07 11:16:36 +0000
@@ -27,6 +27,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.Collections;
 import java.util.Comparator;
 
 import org.hisp.dhis.i18n.I18nFormat;
@@ -37,8 +38,6 @@
 
 import com.opensymphony.xwork2.Action;
 
-import edu.emory.mathcs.backport.java.util.Collections;
-
 /**
  * @author Lars Helge Overland
  * @version $Id$

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/pom.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/pom.xml	2010-04-08 16:55:35 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/pom.xml	2010-05-07 11:16:36 +0000
@@ -46,10 +46,6 @@
     <!-- Other -->
     
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-    </dependency>
-    <dependency>
       <groupId>net.sourceforge.jexcelapi</groupId>
       <artifactId>jxl</artifactId>
     </dependency>

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2010-05-07 10:41:45 +0000
+++ dhis-2/pom.xml	2010-05-07 11:16:36 +0000
@@ -4,8 +4,8 @@
   <artifactId>dhis</artifactId>
   <version>2.0.5-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>DHIS 2 - District Health Information System</name>
-  <url>http://dhis2.com</url>
+  <name>DHIS 2</name>
+  <url>http://dhis2.org</url>
   
   <description>
     The District Health Information System deals with registering,
@@ -62,6 +62,10 @@
       <name>Dhis2 External Dependencies Repository</name>
       <url>http://dhis.uio.no/maven/external</url>
     </repository>
+    <repository>
+      <id>JBoss</id>
+      <url>http://repository.jboss.org/maven2</url>
+    </repository>
   </repositories>
   
   <issueManagement>
@@ -240,12 +244,12 @@
       <dependency>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-core</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.8.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-spring-plugin</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.8.1</version>
         <exclusions>
           <exclusion>
             <groupId>org.springframework</groupId>
@@ -271,10 +275,17 @@
         <artifactId>velocity-tools</artifactId>
         <version>1.2</version>
       </dependency>
+<!-- TODO: NEED TO DECIDE ON QUICK -->
       <dependency>
         <groupId>org.amplecode</groupId>
         <artifactId>quick</artifactId>
         <version>1.1.6</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
+          </exclusion>
+        </exclusions>        
       </dependency>
       <dependency>
         <groupId>com.lowagie</groupId>
@@ -283,34 +294,30 @@
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>spring</artifactId>
-        <version>2.5.6</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-beans</artifactId>
-        <version>2.5.6</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
         <artifactId>spring-test</artifactId>
-        <version>2.5.6</version>
+        <version>${spring.version}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>spring-core</artifactId>
-        <version>2.5.6</version>
+        <artifactId>spring-orm</artifactId>
+        <version>${spring.version}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
-        <version>2.5.6</version>
+        <version>${spring.version}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
-        <version>2.5.6</version>
-      </dependency>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-tx</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjrt</artifactId>
@@ -396,7 +403,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.4</version>
+        <version>4.8.1</version>
       </dependency>
       <dependency>
         <groupId>org.amplecode</groupId>
@@ -418,6 +425,7 @@
         <groupId>javax.servlet</groupId>
         <artifactId>servlet-api</artifactId>
         <version>2.4</version>
+        <scope>provided</scope>
       </dependency>
       <!--DBMS -->
       <dependency>
@@ -435,25 +443,43 @@
         <artifactId>ibatis2-sqlmap</artifactId>
         <version>2.1.7.597</version>
       </dependency>
-      <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate</artifactId>
-        <version>3.2.6.ga</version>
+
+      <dependency>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate-core</artifactId>
+        <version>3.5.1-Final</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate-ehcache</artifactId>
+        <version>3.5.1-Final</version>
         <exclusions>
           <exclusion>
-            <groupId>javax.transaction</groupId>
-            <artifactId>jta</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>pull-parser</groupId>
-            <artifactId>pull-parser</artifactId>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>net.sf.ehcache</groupId>
-        <artifactId>ehcache</artifactId>
-        <version>1.5.0</version>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate-entitymanager</artifactId>
+        <version>3.5.1-Final</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>1.5.8</version>
+      </dependency>
+
+      <dependency>
+        <groupId>net.sf.ehcache</groupId>
+        <artifactId>ehcache-core</artifactId>
+        <version>2.0.1</version>
+      </dependency>
+      <dependency>
+        <groupId>net.sf.ehcache</groupId>
+        <artifactId>ehcache-terracotta</artifactId>
+        <version>2.0.1</version>
       </dependency>
       <dependency>
         <groupId>geronimo-spec</groupId>
@@ -479,7 +505,7 @@
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-core</artifactId>
-        <version>2.0.5.RELEASE</version>
+        <version>3.0.2.RELEASE</version>
         <exclusions>
           <exclusion>
             <groupId>org.springframework</groupId>
@@ -501,8 +527,13 @@
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
-        <artifactId>spring-security-core-tiger</artifactId>
-        <version>2.0.5.RELEASE</version>
+        <artifactId>spring-security-web</artifactId>
+        <version>3.0.2.RELEASE</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.security</groupId>
+        <artifactId>spring-security-config</artifactId>
+        <version>3.0.2.RELEASE</version>
       </dependency>
       <!--Reporting -->
       <dependency>
@@ -619,5 +650,6 @@
   <properties>
     <rootDir></rootDir>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <spring.version>3.0.2.RELEASE</spring.version>  
   </properties>
 </project>