Merge from commons 1.2.x, see following bugs:

[lgpl/argeo-commons.git] / security / plugins / org.argeo.security.ui.admin / META-INF / spring / commands.xml

diff --git a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/commands.xml b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/commands.xml
index 7f6781cc1e5b4014f39587bfd50450f7f0e33e6a..e0a435e07a11dda1b65ca8640be9685dd9a97610 100644 (file)
--- a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/commands.xml
+++ b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/commands.xml
@@ -8,10 +8,36 @@
                class="org.argeo.security.ui.admin.commands.OpenArgeoUserEditor"
                scope="prototype" />
 
+       <!-- USERS -->
        <bean id="newUser" class="org.argeo.security.ui.admin.commands.NewUser"
                scope="prototype">
-               <property name="session" ref="session" />
+               <property name="repository" ref="nodeRepository" />
                <property name="userAdminService" ref="userAdminService" />
+               <property name="jcrSecurityModel" ref="jcrSecurityModel" />
+       </bean>
+
+       <bean id="refreshUsersList" class="org.argeo.security.ui.admin.commands.RefreshUsersList"
+               scope="prototype">
+               <property name="userAdminService" ref="userAdminService" />
+               <property name="repository" ref="nodeRepository" />
+       </bean>
+
+       <bean id="deleteUser" class="org.argeo.security.ui.admin.commands.DeleteUser"
+               scope="prototype">
+               <property name="userAdminService" ref="userAdminService" />
+       </bean>
+       
+       <bean id="userBatchUpdate" class="org.argeo.security.ui.admin.commands.UserBatchUpdate"
+               scope="prototype">
+               <property name="repository" ref="nodeRepository" />
+               <property name="userAdminService" ref="userAdminService" />
+               <property name="jcrSecurityModel" ref="jcrSecurityModel" />
+       </bean>
+       
+
+       <!-- ROLES -->
+       <bean id="refreshRoles" class="org.argeo.security.ui.admin.commands.RefreshRoles"
+               scope="prototype">
        </bean>
 
        <bean id="addRole" class="org.argeo.security.ui.admin.commands.AddRole"
@@ -19,9 +45,8 @@
                <property name="userAdminService" ref="userAdminService" />
        </bean>
 
-       <bean id="refreshUsersList" class="org.argeo.security.ui.admin.commands.RefreshUsersList"
+       <bean id="deleteRole" class="org.argeo.security.ui.admin.commands.DeleteRole"
                scope="prototype">
                <property name="userAdminService" ref="userAdminService" />
-               <property name="session" ref="session" />
        </bean>
 </beans>