=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonSystemAuthorities.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonSystemAuthorities.vm	2011-06-19 09:59:18 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonSystemAuthorities.vm	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#set( $size = $systemAuthorities.size() )
-{ "systemAuthorities": [
-#foreach( $systemAuthority in $systemAuthorities )
-  {
-  	#set( $name = $i18n.getString( "${systemAuthority}") )
-
-  	"id": "$!encoder.jsonEncode( ${systemAuthority} )",
-    "name": "$!encoder.jsonEncode( $name )"
-  }#if( $velocityCount < $size ),#end
-#end
-]
-#if( $usePaging ),
-	"paging":#parse( "/dhis-web-commons/ajax/jsonPaging.vm" )
-#end
-}

=== removed file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetSystemAuthoritiesAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetSystemAuthoritiesAction.java	2011-06-19 09:21:37 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetSystemAuthoritiesAction.java	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-package org.hisp.dhis.commons.action;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * 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.paging.ActionPagingSupport;
-import org.hisp.dhis.security.authority.SystemAuthoritiesProvider;
-
-/**
- * @author mortenoh
- */
-public class GetSystemAuthoritiesAction
-    extends ActionPagingSupport<String>
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private SystemAuthoritiesProvider authoritiesProvider;
-
-    public void setAuthoritiesProvider( SystemAuthoritiesProvider authoritiesProvider )
-    {
-        this.authoritiesProvider = authoritiesProvider;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input & Output
-    // -------------------------------------------------------------------------
-
-    private List<String> systemAuthorities;
-
-    public List<String> getSystemAuthorities()
-    {
-        return systemAuthorities;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-        throws Exception
-    {
-        systemAuthorities = new ArrayList<String>( authoritiesProvider.getSystemAuthorities() );
-
-        Collections.sort( systemAuthorities );
-
-        if ( usePaging )
-        {
-            this.paging = createPaging( systemAuthorities.size() );
-
-            systemAuthorities = systemAuthorities.subList( paging.getStartPos(), paging.getEndPos() );
-        }
-
-        return SUCCESS;
-    }
-}

=== 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	2011-06-19 09:21:37 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2011-06-19 10:30:48 +0000
@@ -339,11 +339,6 @@
     <property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
   </bean>
 
-  <bean id="org.hisp.dhis.commons.action.GetSystemAuthoritiesAction" class="org.hisp.dhis.commons.action.GetSystemAuthoritiesAction"
-    scope="prototype">
-    <property name="authoritiesProvider" ref="org.hisp.dhis.security.authority.SystemAuthoritiesProvider" />
-  </bean>
-
   <bean id="org.hisp.dhis.commons.action.GetValidationRulesAction" class="org.hisp.dhis.commons.action.GetValidationRulesAction"
     scope="prototype">
     <property name="validationRuleService" ref="org.hisp.dhis.validation.ValidationRuleService" />

=== 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	2011-06-19 09:21:37 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2011-06-19 10:30:48 +0000
@@ -421,12 +421,6 @@
       <param name="onExceptionReturn">plainTextError</param>
     </action>
 
-    <action name="getSystemAuthorities" class="org.hisp.dhis.commons.action.GetSystemAuthoritiesAction">
-      <result name="success" type="velocity-json">
-        /dhis-web-commons/ajax/jsonSystemAuthorities.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-
     <action name="getValidationRules" class="org.hisp.dhis.commons.action.GetValidationRulesAction">
       <result name="success" type="velocity-json">
         /dhis-web-commons/ajax/jsonValidationRules.vm</result>

=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetSystemAuthoritiesAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetSystemAuthoritiesAction.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetSystemAuthoritiesAction.java	2011-06-19 10:30:48 +0000
@@ -0,0 +1,85 @@
+package org.hisp.dhis.user.action;
+
+/*
+ * Copyright (c) 2004-2010, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ *   be used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * 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.paging.ActionPagingSupport;
+import org.hisp.dhis.security.authority.SystemAuthoritiesProvider;
+
+/**
+ * @author mortenoh
+ */
+public class GetSystemAuthoritiesAction
+    extends ActionPagingSupport<String>
+{
+    // -------------------------------------------------------------------------
+    // Dependencies
+    // -------------------------------------------------------------------------
+
+    private SystemAuthoritiesProvider authoritiesProvider;
+
+    public void setAuthoritiesProvider( SystemAuthoritiesProvider authoritiesProvider )
+    {
+        this.authoritiesProvider = authoritiesProvider;
+    }
+
+    // -------------------------------------------------------------------------
+    // Input & Output
+    // -------------------------------------------------------------------------
+
+    private List<String> systemAuthorities;
+
+    public List<String> getSystemAuthorities()
+    {
+        return systemAuthorities;
+    }
+
+    // -------------------------------------------------------------------------
+    // Action implementation
+    // -------------------------------------------------------------------------
+
+    public String execute()
+        throws Exception
+    {
+        systemAuthorities = new ArrayList<String>( authoritiesProvider.getSystemAuthorities() );
+
+        Collections.sort( systemAuthorities );
+
+        if ( usePaging )
+        {
+            this.paging = createPaging( systemAuthorities.size() );
+
+            systemAuthorities = systemAuthorities.subList( paging.getStartPos(), paging.getEndPos() );
+        }
+
+        return SUCCESS;
+    }
+}

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/META-INF/dhis/beans.xml	2011-06-11 08:15:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/META-INF/dhis/beans.xml	2011-06-19 10:30:48 +0000
@@ -1,252 +1,238 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-	<bean id="org.hisp.dhis.user.action.NoAction" class="org.hisp.dhis.user.action.NoAction"
-		scope="prototype" />
+  <bean id="org.hisp.dhis.user.action.NoAction" class="org.hisp.dhis.user.action.NoAction" scope="prototype" />
 
 	<!-- User -->
 
-	<bean id="org.hisp.dhis.user.action.AddUserAction" class="org.hisp.dhis.user.action.AddUserAction"
-		scope="prototype">
-		<property name="userService">
-			<ref bean="org.hisp.dhis.user.UserService" />
-		</property>
-		<property name="passwordManager">
-			<ref bean="org.hisp.dhis.security.PasswordManager" />
-		</property>
-		<property name="selectionTreeManager">
-			<ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
-		</property>
-		<property name="selectionManager">
-			<ref bean="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
-		</property>
-		<property name="currentUserService">
-			<ref bean="org.hisp.dhis.user.CurrentUserService" />
-		</property>
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.DeleteCurrentUserAction"
-		class="org.hisp.dhis.user.action.DeleteCurrentUserAction" scope="prototype">
-		<property name="currentUserService">
-			<ref bean="org.hisp.dhis.user.CurrentUserService" />
-		</property>
-		<property name="passwordManager">
-			<ref bean="org.hisp.dhis.security.PasswordManager" />
-		</property>
-		<property name="userService">
-			<ref bean="org.hisp.dhis.user.UserService" />
-		</property>
-	</bean>
-
-
-	<bean id="org.hisp.dhis.user.action.GetUserAction" class="org.hisp.dhis.user.action.GetUserAction"
-		scope="prototype">
-		<property name="userService">
-			<ref bean="org.hisp.dhis.user.UserService" />
-		</property>
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.GetOrgunitUserListAction"
-		class="org.hisp.dhis.user.action.GetOrgunitUserListAction" scope="prototype">
-		<property name="userService">
-			<ref bean="org.hisp.dhis.user.UserService" />
-		</property>
-		<property name="selectionManager">
-			<ref bean="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
-		</property>
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.GetUserListAction" class="org.hisp.dhis.user.action.GetUserListAction"
-		scope="prototype">
-		<property name="userService">
-			<ref bean="org.hisp.dhis.user.UserService" />
-		</property>
-		<property name="currentUserService">
-			<ref bean="org.hisp.dhis.user.CurrentUserService" />
-		</property>
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.RemoveUserAction" class="org.hisp.dhis.user.action.RemoveUserAction"
-		scope="prototype">
-		<property name="currentUserService">
-			<ref bean="org.hisp.dhis.user.CurrentUserService" />
-		</property>
-		<property name="userService">
-			<ref bean="org.hisp.dhis.user.UserService" />
-		</property>
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.UpdateUserAction" class="org.hisp.dhis.user.action.UpdateUserAction"
-		scope="prototype">
-		<property name="userService">
-			<ref bean="org.hisp.dhis.user.UserService" />
-		</property>
-		<property name="passwordManager">
-			<ref bean="org.hisp.dhis.security.PasswordManager" />
-		</property>
-		<property name="selectionTreeManager">
-			<ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
-		</property>
-		<property name="selectionManager">
-			<ref bean="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
-		</property>
-		<property name="currentUserService">
-			<ref bean="org.hisp.dhis.user.CurrentUserService" />
-		</property>
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.ValidateUserAction" class="org.hisp.dhis.user.action.ValidateUserAction"
-		scope="prototype">
-		<property name="userService">
-			<ref bean="org.hisp.dhis.user.UserService" />
-		</property>
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.SetupTreeAction" class="org.hisp.dhis.user.action.SetupTreeAction"
-		scope="prototype">
-		<property name="selectionTreeManager">
-			<ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
-		</property>
-		<property name="selectionManager">
-			<ref bean="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
-		</property>
-		<property name="userService">
-			<ref bean="org.hisp.dhis.user.UserService" />
-		</property>
-		<property name="currentUserService">
-			<ref bean="org.hisp.dhis.user.CurrentUserService" />
-		</property>
-	</bean>
-
-	<bean
-		id="org.hisp.dhis.user.action.SelectOrganisationUnitGroupMembersAction"
-		class="org.hisp.dhis.user.action.SelectOrganisationUnitGroupMembersAction"
-		scope="prototype">
-		<property name="organisationUnitGroupService">
-			<ref bean="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
-		</property>
-		<property name="selectionTreeManager">
-			<ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
-		</property>
-	</bean>
-
-	<bean
-		id="org.hisp.dhis.user.action.RemoveOrganisationUnitGroupMembersAction"
-		class="org.hisp.dhis.user.action.RemoveOrganisationUnitGroupMembersAction"
-		scope="prototype">
-		<property name="organisationUnitGroupService">
-			<ref bean="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
-		</property>
-		<property name="selectionTreeManager">
-			<ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
-		</property>
-	</bean>
+  <bean id="org.hisp.dhis.user.action.AddUserAction" class="org.hisp.dhis.user.action.AddUserAction" scope="prototype">
+    <property name="userService">
+      <ref bean="org.hisp.dhis.user.UserService" />
+    </property>
+    <property name="passwordManager">
+      <ref bean="org.hisp.dhis.security.PasswordManager" />
+    </property>
+    <property name="selectionTreeManager">
+      <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+    </property>
+    <property name="selectionManager">
+      <ref bean="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
+    </property>
+    <property name="currentUserService">
+      <ref bean="org.hisp.dhis.user.CurrentUserService" />
+    </property>
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.DeleteCurrentUserAction" class="org.hisp.dhis.user.action.DeleteCurrentUserAction"
+    scope="prototype">
+    <property name="currentUserService">
+      <ref bean="org.hisp.dhis.user.CurrentUserService" />
+    </property>
+    <property name="passwordManager">
+      <ref bean="org.hisp.dhis.security.PasswordManager" />
+    </property>
+    <property name="userService">
+      <ref bean="org.hisp.dhis.user.UserService" />
+    </property>
+  </bean>
+
+
+  <bean id="org.hisp.dhis.user.action.GetUserAction" class="org.hisp.dhis.user.action.GetUserAction" scope="prototype">
+    <property name="userService">
+      <ref bean="org.hisp.dhis.user.UserService" />
+    </property>
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.GetOrgunitUserListAction" class="org.hisp.dhis.user.action.GetOrgunitUserListAction"
+    scope="prototype">
+    <property name="userService">
+      <ref bean="org.hisp.dhis.user.UserService" />
+    </property>
+    <property name="selectionManager">
+      <ref bean="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
+    </property>
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.GetUserListAction" class="org.hisp.dhis.user.action.GetUserListAction" scope="prototype">
+    <property name="userService">
+      <ref bean="org.hisp.dhis.user.UserService" />
+    </property>
+    <property name="currentUserService">
+      <ref bean="org.hisp.dhis.user.CurrentUserService" />
+    </property>
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.RemoveUserAction" class="org.hisp.dhis.user.action.RemoveUserAction" scope="prototype">
+    <property name="currentUserService">
+      <ref bean="org.hisp.dhis.user.CurrentUserService" />
+    </property>
+    <property name="userService">
+      <ref bean="org.hisp.dhis.user.UserService" />
+    </property>
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.UpdateUserAction" class="org.hisp.dhis.user.action.UpdateUserAction" scope="prototype">
+    <property name="userService">
+      <ref bean="org.hisp.dhis.user.UserService" />
+    </property>
+    <property name="passwordManager">
+      <ref bean="org.hisp.dhis.security.PasswordManager" />
+    </property>
+    <property name="selectionTreeManager">
+      <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+    </property>
+    <property name="selectionManager">
+      <ref bean="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
+    </property>
+    <property name="currentUserService">
+      <ref bean="org.hisp.dhis.user.CurrentUserService" />
+    </property>
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.ValidateUserAction" class="org.hisp.dhis.user.action.ValidateUserAction"
+    scope="prototype">
+    <property name="userService">
+      <ref bean="org.hisp.dhis.user.UserService" />
+    </property>
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.SetupTreeAction" class="org.hisp.dhis.user.action.SetupTreeAction" scope="prototype">
+    <property name="selectionTreeManager">
+      <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+    </property>
+    <property name="selectionManager">
+      <ref bean="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
+    </property>
+    <property name="userService">
+      <ref bean="org.hisp.dhis.user.UserService" />
+    </property>
+    <property name="currentUserService">
+      <ref bean="org.hisp.dhis.user.CurrentUserService" />
+    </property>
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.SelectOrganisationUnitGroupMembersAction" class="org.hisp.dhis.user.action.SelectOrganisationUnitGroupMembersAction"
+    scope="prototype">
+    <property name="organisationUnitGroupService">
+      <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
+    </property>
+    <property name="selectionTreeManager">
+      <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+    </property>
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.RemoveOrganisationUnitGroupMembersAction" class="org.hisp.dhis.user.action.RemoveOrganisationUnitGroupMembersAction"
+    scope="prototype">
+    <property name="organisationUnitGroupService">
+      <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
+    </property>
+    <property name="selectionTreeManager">
+      <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+    </property>
+  </bean>
 
 	<!-- Role -->
 
-	<bean id="org.hisp.dhis.user.action.AddRoleAction" class="org.hisp.dhis.user.action.AddRoleAction"
-		scope="prototype">
-		<property name="userService">
-			<ref bean="org.hisp.dhis.user.UserService" />
-		</property>
-		<property name="dataSetService">
-			<ref bean="org.hisp.dhis.dataset.DataSetService" />
-		</property>
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.GetRoleAction" class="org.hisp.dhis.user.action.GetRoleAction"
-		scope="prototype">
-		<property name="userService">
-			<ref bean="org.hisp.dhis.user.UserService" />
-		</property>
-		<property name="dataSetService">
-			<ref bean="org.hisp.dhis.dataset.DataSetService" />
-		</property>
-		<property name="authoritiesProvider"
-			ref="org.hisp.dhis.security.authority.SystemAuthoritiesProvider" />
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.GetRoleListAction" class="org.hisp.dhis.user.action.GetRoleListAction"
-		scope="prototype">
-		<property name="userService">
-			<ref bean="org.hisp.dhis.user.UserService" />
-		</property>
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.RemoveRoleAction" class="org.hisp.dhis.user.action.RemoveRoleAction"
-		scope="prototype">
-		<property name="userService">
-			<ref bean="org.hisp.dhis.user.UserService" />
-		</property>
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.UpdateRoleAction" class="org.hisp.dhis.user.action.UpdateRoleAction"
-		scope="prototype">
-		<property name="userService">
-			<ref bean="org.hisp.dhis.user.UserService" />
-		</property>
-		<property name="dataSetService">
-			<ref bean="org.hisp.dhis.dataset.DataSetService" />
-		</property>
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.SetupRoleAction" class="org.hisp.dhis.user.action.SetupRoleAction"
-		scope="prototype">
-		<property name="dataSetService">
-			<ref bean="org.hisp.dhis.dataset.DataSetService" />
-		</property>
-		<property name="authoritiesProvider">
-			<ref bean="org.hisp.dhis.security.authority.SystemAuthoritiesProvider" />
-		</property>
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.ValidateRoleAction" class="org.hisp.dhis.user.action.ValidateRoleAction"
-		scope="prototype">
-		<property name="userService">
-			<ref bean="org.hisp.dhis.user.UserService" />
-		</property>
-	</bean>
+  <bean id="org.hisp.dhis.user.action.AddRoleAction" class="org.hisp.dhis.user.action.AddRoleAction" scope="prototype">
+    <property name="userService">
+      <ref bean="org.hisp.dhis.user.UserService" />
+    </property>
+    <property name="dataSetService">
+      <ref bean="org.hisp.dhis.dataset.DataSetService" />
+    </property>
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.GetRoleAction" class="org.hisp.dhis.user.action.GetRoleAction" scope="prototype">
+    <property name="userService">
+      <ref bean="org.hisp.dhis.user.UserService" />
+    </property>
+    <property name="dataSetService">
+      <ref bean="org.hisp.dhis.dataset.DataSetService" />
+    </property>
+    <property name="authoritiesProvider" ref="org.hisp.dhis.security.authority.SystemAuthoritiesProvider" />
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.GetRoleListAction" class="org.hisp.dhis.user.action.GetRoleListAction" scope="prototype">
+    <property name="userService">
+      <ref bean="org.hisp.dhis.user.UserService" />
+    </property>
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.RemoveRoleAction" class="org.hisp.dhis.user.action.RemoveRoleAction" scope="prototype">
+    <property name="userService">
+      <ref bean="org.hisp.dhis.user.UserService" />
+    </property>
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.UpdateRoleAction" class="org.hisp.dhis.user.action.UpdateRoleAction" scope="prototype">
+    <property name="userService">
+      <ref bean="org.hisp.dhis.user.UserService" />
+    </property>
+    <property name="dataSetService">
+      <ref bean="org.hisp.dhis.dataset.DataSetService" />
+    </property>
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.SetupRoleAction" class="org.hisp.dhis.user.action.SetupRoleAction" scope="prototype">
+    <property name="dataSetService">
+      <ref bean="org.hisp.dhis.dataset.DataSetService" />
+    </property>
+    <property name="authoritiesProvider">
+      <ref bean="org.hisp.dhis.security.authority.SystemAuthoritiesProvider" />
+    </property>
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.ValidateRoleAction" class="org.hisp.dhis.user.action.ValidateRoleAction"
+    scope="prototype">
+    <property name="userService">
+      <ref bean="org.hisp.dhis.user.UserService" />
+    </property>
+  </bean>
 
 	<!-- User groups -->
 
-	<bean id="org.hisp.dhis.user.action.GetUserGroupListAction" class="org.hisp.dhis.user.action.GetUserGroupListAction"
-		scope="prototype">
-		<property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.AddUserGroupAction" class="org.hisp.dhis.user.action.AddUserGroupAction"
-		scope="prototype">
-		<property name="userService" ref="org.hisp.dhis.user.UserService" />
-		<property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.EditUserGroupFormAction"
-		class="org.hisp.dhis.user.action.EditUserGroupFormAction" scope="prototype">
-		<property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.UpdateUserGroupAction" class="org.hisp.dhis.user.action.UpdateUserGroupAction"
-		scope="prototype">
-		<property name="userService" ref="org.hisp.dhis.user.UserService" />
-		<property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.RemoveUserGroupAction" class="org.hisp.dhis.user.action.RemoveUserGroupAction"
-		scope="prototype">
-		<property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.GetUserGroupAction" class="org.hisp.dhis.user.action.GetUserGroupAction"
-		scope="prototype">
-		<property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
-	</bean>
-
-	<bean id="org.hisp.dhis.user.action.ValidateUserGroupAction"
-		class="org.hisp.dhis.user.action.ValidateUserGroupAction" scope="prototype">
-		<property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
-	</bean>
+  <bean id="org.hisp.dhis.user.action.GetUserGroupListAction" class="org.hisp.dhis.user.action.GetUserGroupListAction"
+    scope="prototype">
+    <property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.AddUserGroupAction" class="org.hisp.dhis.user.action.AddUserGroupAction"
+    scope="prototype">
+    <property name="userService" ref="org.hisp.dhis.user.UserService" />
+    <property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.EditUserGroupFormAction" class="org.hisp.dhis.user.action.EditUserGroupFormAction"
+    scope="prototype">
+    <property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.UpdateUserGroupAction" class="org.hisp.dhis.user.action.UpdateUserGroupAction"
+    scope="prototype">
+    <property name="userService" ref="org.hisp.dhis.user.UserService" />
+    <property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.RemoveUserGroupAction" class="org.hisp.dhis.user.action.RemoveUserGroupAction"
+    scope="prototype">
+    <property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.GetUserGroupAction" class="org.hisp.dhis.user.action.GetUserGroupAction"
+    scope="prototype">
+    <property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.ValidateUserGroupAction" class="org.hisp.dhis.user.action.ValidateUserGroupAction"
+    scope="prototype">
+    <property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
+  </bean>
+
+  <bean id="org.hisp.dhis.user.action.GetSystemAuthoritiesAction" class="org.hisp.dhis.user.action.GetSystemAuthoritiesAction"
+    scope="prototype">
+    <property name="authoritiesProvider" ref="org.hisp.dhis.security.authority.SystemAuthoritiesProvider" />
+  </bean>
 
 </beans>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2011-06-11 20:37:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2011-06-19 10:30:48 +0000
@@ -204,6 +204,13 @@
 	  <result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm</result>
 	  <param name="onExceptionReturn">plainTextError</param>
     </action>
-    
+
+    <!-- Json Actions -->
+    <action name="getSystemAuthorities" class="org.hisp.dhis.user.action.GetSystemAuthoritiesAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-maintenance-user/ajax/jsonSystemAuthorities.vm</result>
+      <param name="onExceptionReturn">plainTextError</param>
+    </action>
+
   </package>
 </struts>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm	2011-06-19 09:59:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm	2011-06-19 10:30:48 +0000
@@ -15,7 +15,7 @@
 		});
 
 		jQuery("#availableListAuthority").dhisAjaxSelect({
-			source: "../dhis-web-commons-ajax-json/getSystemAuthorities.action",
+			source: "getSystemAuthorities.action",
 			iterator: 'systemAuthorities',
 			connectedTo: 'selectedListAuthority',
 			handler: function(item) {

=== added directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/ajax'
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/ajax/jsonSystemAuthorities.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/ajax/jsonSystemAuthorities.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/ajax/jsonSystemAuthorities.vm	2011-06-19 10:30:48 +0000
@@ -0,0 +1,15 @@
+#set( $size = $systemAuthorities.size() )
+{ "systemAuthorities": [
+#foreach( $systemAuthority in $systemAuthorities )
+  {
+  	#set( $name = $i18n.getString( "${systemAuthority}") )
+
+  	"id": "$!encoder.jsonEncode( ${systemAuthority} )",
+    "name": "$!encoder.jsonEncode( $name )"
+  }#if( $velocityCount < $size ),#end
+#end
+]
+#if( $usePaging ),
+	"paging":#parse( "/dhis-web-commons/ajax/jsonPaging.vm" )
+#end
+}

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm	2011-06-19 09:59:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm	2011-06-19 10:30:48 +0000
@@ -15,7 +15,7 @@
 		});
 
 		jQuery("#availableListAuthority").dhisAjaxSelect({
-			source: "../dhis-web-commons-ajax-json/getSystemAuthorities.action",
+			source: "getSystemAuthorities.action",
 			iterator: 'systemAuthorities',
 			connectedTo: 'selectedListAuthority',
 			handler: function(item) {