=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSetPopulator.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSetPopulator.java	2010-01-19 21:48:28 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSetPopulator.java	2010-03-04 16:57:53 +0000
@@ -64,7 +64,7 @@
             type = new OrganisationUnitGroupSet();
             type.setName( "Type" );
             type.setDescription( "Type of organisation unit, examples are PHU, chiefdom and district" );
-            type.setCompulsory( true );
+            type.setCompulsory( false );
             
             organisationUnitGroupService.addOrganisationUnitGroupSet( type );
         }
@@ -76,7 +76,7 @@
             ownership = new OrganisationUnitGroupSet();
             ownership.setName( "Ownership" );
             ownership.setDescription( "Ownership of organisation unit, examples are private and public" );
-            ownership.setCompulsory( true );
+            ownership.setCompulsory( false );
             
             organisationUnitGroupService.addOrganisationUnitGroupSet( ownership );
         }

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/DatabaseAutomaticAccessProvider.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/DatabaseAutomaticAccessProvider.java	2010-02-25 03:10:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/DatabaseAutomaticAccessProvider.java	2010-03-04 16:57:53 +0000
@@ -38,54 +38,56 @@
  * @version $Id: DatabaseAutomaticAccessProvider.java 3513 2007-08-04 16:16:40Z
  *          torgeilo $
  */
-public class DatabaseAutomaticAccessProvider extends
-		AbstractAutomaticAccessProvider {
-	// -------------------------------------------------------------------------
-	// Dependencies
-	// -------------------------------------------------------------------------
-
-	private PasswordManager passwordManager;
-
-	public void setPasswordManager(PasswordManager passwordManager) {
-		this.passwordManager = passwordManager;
-	}
-
-	// -------------------------------------------------------------------------
-	// AdminAccessManager implementation
-	// -------------------------------------------------------------------------
-
-	public void initialise() {
-		// ---------------------------------------------------------------------
-		// Assumes no UserAuthorityGroup called "Superuser" in database
-		// ---------------------------------------------------------------------
-
-		String username = "admin";
-		String password = "district";
-
-		User user = new User();
-		user.setFirstName(username);
-		user.setSurname(username);
-
-		userStore.addUser(user);
-
-		UserAuthorityGroup userAuthorityGroup = new UserAuthorityGroup();
-		userAuthorityGroup.setName("ALL");
-		
-		userAuthorityGroup
-				.setAuthorities(new HashSet<String>(getAuthorities()));
-
-		userStore.addUserAuthorityGroup(userAuthorityGroup);
-
-		UserCredentials userCredentials = new UserCredentials();
-		userCredentials.setUsername(username);
-		userCredentials.setPassword(passwordManager.encodePassword(username,
-				password));
-		userCredentials.setUser(user);
-		userCredentials.getUserAuthorityGroups().add(userAuthorityGroup);
-		
-		userStore.addUserCredentials(userCredentials);
-	}
-
-	public void access() {
-	}
+public class DatabaseAutomaticAccessProvider
+    extends AbstractAutomaticAccessProvider
+{
+    // -------------------------------------------------------------------------
+    // Dependencies
+    // -------------------------------------------------------------------------
+
+    private PasswordManager passwordManager;
+
+    public void setPasswordManager( PasswordManager passwordManager )
+    {
+        this.passwordManager = passwordManager;
+    }
+
+    // -------------------------------------------------------------------------
+    // AdminAccessManager implementation
+    // -------------------------------------------------------------------------
+
+    public void initialise()
+    {
+        // ---------------------------------------------------------------------
+        // Assumes no UserAuthorityGroup called "Superuser" in database
+        // ---------------------------------------------------------------------
+
+        String username = "admin";
+        String password = "district";
+
+        User user = new User();
+        user.setFirstName( username );
+        user.setSurname( username );
+
+        userStore.addUser( user );
+
+        UserAuthorityGroup userAuthorityGroup = new UserAuthorityGroup();
+        userAuthorityGroup.setName( "ALL" );
+
+        userAuthorityGroup.setAuthorities( new HashSet<String>( getAuthorities() ) );
+
+        userStore.addUserAuthorityGroup( userAuthorityGroup );
+
+        UserCredentials userCredentials = new UserCredentials();
+        userCredentials.setUsername( username );
+        userCredentials.setPassword( passwordManager.encodePassword( username, password ) );
+        userCredentials.setUser( user );
+        userCredentials.getUserAuthorityGroups().add( userAuthorityGroup );
+
+        userStore.addUserCredentials( userCredentials );
+    }
+
+    public void access()
+    {
+    }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/RequiredLoginFilter.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/RequiredLoginFilter.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/RequiredLoginFilter.java	2010-03-04 16:57:53 +0000
@@ -117,8 +117,6 @@
                 targetUrl.append( request.getQueryString() );
             }
 
-            // request.getSession().setAttribute( AbstractProcessingFilter.ACEGI_SECURITY_TARGET_URL_KEY, targetUrl.toString() );
-
             response.sendRedirect( response.encodeRedirectURL( request.getContextPath() + loginPageUrl ) );
 
             return;

=== renamed file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/WebWorkSecurityInterceptor.java' => '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/WebWorkSecurityInterceptor.java	2010-01-28 15:23:28 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/XWorkSecurityInterceptor.java	2010-03-04 16:57:53 +0000
@@ -44,7 +44,7 @@
  * @author Torgeir Lorange Ostby
  * @version $Id: WebWorkSecurityInterceptor.java 5797 2008-10-02 15:40:29Z larshelg $
  */
-public class WebWorkSecurityInterceptor
+public class XWorkSecurityInterceptor
     extends AbstractSecurityInterceptor
     implements Interceptor
 {
@@ -113,7 +113,7 @@
     }
 
     // -------------------------------------------------------------------------
-    // Acegi Security Interceptor
+    // Spring Security Interceptor
     // -------------------------------------------------------------------------
 
     @Override

=== renamed file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/WebWorkPortalMenuInterceptor.java' => 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalMenuInterceptor.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/WebWorkPortalMenuInterceptor.java	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalMenuInterceptor.java	2010-03-04 16:57:53 +0000
@@ -40,7 +40,7 @@
  * @author Torgeir Lorange Ostby
  * @version $Id: WebWorkPortalMenuInterceptor.java 2869 2007-02-20 14:26:09Z andegje $
  */
-public class WebWorkPortalMenuInterceptor
+public class XWorkPortalMenuInterceptor
     implements Interceptor
 {
     private static final String KEY_MENU_STATE = "menuState";

=== renamed file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/WebWorkPortalModuleInterceptor.java' => 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalModuleInterceptor.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/WebWorkPortalModuleInterceptor.java	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalModuleInterceptor.java	2010-03-04 16:57:53 +0000
@@ -39,7 +39,7 @@
  * @author Torgeir Lorange Ostby
  * @version $Id: WebWorkPortalModuleInterceptor.java 2869 2007-02-20 14:26:09Z andegje $
  */
-public class WebWorkPortalModuleInterceptor
+public class XWorkPortalModuleInterceptor
     implements Interceptor
 {
     private static final String KEY_MAINTENANCE_MODULES = "maintenanceModules";

=== renamed file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/WebWorkPortalParamsInterceptor.java' => 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalParamsInterceptor.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/WebWorkPortalParamsInterceptor.java	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalParamsInterceptor.java	2010-03-04 16:57:53 +0000
@@ -40,7 +40,7 @@
  * @author Torgeir Lorange Ostby
  * @version $Id: WebWorkPortalParamsInterceptor.java 4559 2008-02-09 18:47:24Z torgeilo $
  */
-public class WebWorkPortalParamsInterceptor
+public class XWorkPortalParamsInterceptor
     implements Interceptor
 {
     // -------------------------------------------------------------------------

=== renamed file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/WebWorkPortalUserInterceptor.java' => 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalUserInterceptor.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/WebWorkPortalUserInterceptor.java	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalUserInterceptor.java	2010-03-04 16:57:53 +0000
@@ -39,7 +39,7 @@
  * @author Torgeir Lorange Ostby
  * @version $Id: WebWorkPortalUserInterceptor.java 2869 2007-02-20 14:26:09Z andegje $
  */
-public class WebWorkPortalUserInterceptor
+public class XWorkPortalUserInterceptor
     implements Interceptor
 {
     // -------------------------------------------------------------------------

=== 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-02-25 15:43:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2010-03-04 16:57:53 +0000
@@ -59,8 +59,8 @@
 		</property>
 	</bean>
 
-	<bean id="org.hisp.dhis.webportal.interceptor.WebWorkPortalParamsInterceptor"
-		class="org.hisp.dhis.webportal.interceptor.WebWorkPortalParamsInterceptor">
+	<bean id="org.hisp.dhis.webportal.interceptor.XWorkPortalParamsInterceptor"
+		class="org.hisp.dhis.webportal.interceptor.XWorkPortalParamsInterceptor">
 		<property name="standardParams">
 			<set>
 				<value>page</value>
@@ -76,8 +76,8 @@
 		</property>
 	</bean>
 
-	<bean id="org.hisp.dhis.webportal.interceptor.WebWorkPortalModuleInterceptor"
-		class="org.hisp.dhis.webportal.interceptor.WebWorkPortalModuleInterceptor">
+	<bean id="org.hisp.dhis.webportal.interceptor.XWorkPortalModuleInterceptor"
+		class="org.hisp.dhis.webportal.interceptor.XWorkPortalModuleInterceptor">
 		<property name="moduleManager">
 			<ref local="org.hisp.dhis.webportal.module.ModuleManager" />
 		</property>
@@ -99,15 +99,15 @@
 		</property>
 	</bean>
 
-	<bean id="org.hisp.dhis.webportal.interceptor.WebWorkPortalMenuInterceptor"
-		class="org.hisp.dhis.webportal.interceptor.WebWorkPortalMenuInterceptor">
+	<bean id="org.hisp.dhis.webportal.interceptor.XWorkPortalMenuInterceptor"
+		class="org.hisp.dhis.webportal.interceptor.XWorkPortalMenuInterceptor">
 		<property name="menuStateManager">
 			<ref local="org.hisp.dhis.webportal.menu.MenuStateManager" />
 		</property>
 	</bean>
 
-	<bean id="org.hisp.dhis.webportal.interceptor.WebWorkPortalUserInterceptor"
-		class="org.hisp.dhis.webportal.interceptor.WebWorkPortalUserInterceptor">
+	<bean id="org.hisp.dhis.webportal.interceptor.XWorkPortalUserInterceptor"
+		class="org.hisp.dhis.webportal.interceptor.XWorkPortalUserInterceptor">
 		<property name="currentUserService">
 			<ref bean="org.hisp.dhis.user.CurrentUserService" />
 		</property>
@@ -318,14 +318,6 @@
 			ref="org.hisp.dhis.security.authority.SystemAuthoritiesProvider" />
 	</bean>
 
-	<!--
-		<bean
-		class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
-		<property name="advice" ref="readWriteTransactionInterceptor"/>
-		<property name="pattern" value=".*\.AutomaticAccessProvider\.init.*"/>
-		</bean>
-	-->
-
 	<bean id="requiredLoginFilter" class="org.hisp.dhis.security.filter.RequiredLoginFilter">
 		<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
 		<property name="loginPageUrl" value="/dhis-web-commons/security/login.html" />
@@ -384,8 +376,8 @@
 		<property name="requiredAuthority" value="ALL" />
 	</bean>
 
-	<bean id="org.hisp.dhis.security.intercept.WebWorkSecurityInterceptor"
-		class="org.hisp.dhis.security.intercept.WebWorkSecurityInterceptor">
+	<bean id="org.hisp.dhis.security.intercept.XWorkSecurityInterceptor"
+		class="org.hisp.dhis.security.intercept.XWorkSecurityInterceptor">
 		<property name="accessDecisionManager" ref="accessDecisionManager" />
 		<property name="authenticationManager" ref="authenticationManager" />
 		<property name="validateConfigAttributes" value="false" />

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2010-02-27 19:45:18 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2010-03-04 16:57:53 +0000
@@ -49,17 +49,17 @@
 				class="org.hisp.dhis.interceptor.StyleInterceptor" />
 
 			<interceptor name="portalParamsInterceptor"
-				class="org.hisp.dhis.webportal.interceptor.WebWorkPortalParamsInterceptor" />
+				class="org.hisp.dhis.webportal.interceptor.XWorkPortalParamsInterceptor" />
 			<interceptor name="portalModuleInterceptor"
-				class="org.hisp.dhis.webportal.interceptor.WebWorkPortalModuleInterceptor" />
+				class="org.hisp.dhis.webportal.interceptor.XWorkPortalModuleInterceptor" />
 			<interceptor name="portalMenuInterceptor"
-				class="org.hisp.dhis.webportal.interceptor.WebWorkPortalMenuInterceptor" />
+				class="org.hisp.dhis.webportal.interceptor.XWorkPortalMenuInterceptor" />
 			<interceptor name="organisationUnitTreeInterceptor"
 				class="org.hisp.dhis.ouwt.interceptor.OrganisationUnitTreeInterceptor" />
 			<interceptor name="portalUserInterceptor"
-				class="org.hisp.dhis.webportal.interceptor.WebWorkPortalUserInterceptor" />
+				class="org.hisp.dhis.webportal.interceptor.XWorkPortalUserInterceptor" />
 			<interceptor name="securityInterceptor"
-				class="org.hisp.dhis.security.intercept.WebWorkSecurityInterceptor" />
+				class="org.hisp.dhis.security.intercept.XWorkSecurityInterceptor" />
 
 			<interceptor-stack name="commonInterceptors">
 				<interceptor-ref name="staticParams" />