[maven-release-plugin] prepare for next development iteration

[lgpl/argeo-commons.git] / security / modules / org.argeo.security.dao.ldap / META-INF / spring / security-ldap.xml

diff --git a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap.xml b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap.xml
index 8ce3081e423babc24fca6f19a122eddea511005d..a31f79dc124416260fd4e4f17b3e1513ae5bd8af 100644 (file)
--- a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap.xml
+++ b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap.xml
@@ -46,7 +46,18 @@
        <!-- </bean> -->
 
        <!-- USER DETAILS -->
-       <bean id="userAdminDao" class="org.argeo.security.ldap.ArgeoSecurityDaoLdap">
+       <bean id="userDetailsManager" class="org.argeo.security.ldap.ArgeoLdapUserDetailsManager">
+               <constructor-arg ref="contextSource" />
+               <property name="groupSearchBase" value="${argeo.ldap.groupBase}" />
+               <property name="groupMemberAttributeName" value="${argeo.ldap.groupMemberAttribute}" />
+               <property name="usernameMapper" ref="usernameMapper" />
+               <property name="userDetailsMapper" ref="jcrLdapSynchronizer" />
+               <property name="userAdminDao" ref="userAdminDao" />
+               <property name="passwordEncoder" ref="passwordEncoder" />
+               <property name="passwordAttributeName" value="${argeo.ldap.passwordAttribute}" />
+       </bean>
+
+       <bean id="userAdminDao" class="org.argeo.security.ldap.ArgeoUserAdminDaoLdap">
                <constructor-arg ref="contextSource" />
                <property name="userBase" value="${argeo.ldap.userBase}" />
                <property name="usernameAttribute" value="${argeo.ldap.usernameAttribute}" />
@@ -79,17 +90,6 @@
                <property name="rolePrefix" value="${argeo.security.rolePrefix}" />
        </bean>
 
-       <bean id="userDetailsManager" class="org.argeo.security.ldap.ArgeoLdapUserDetailsManager">
-               <constructor-arg ref="contextSource" />
-               <property name="groupSearchBase" value="${argeo.ldap.groupBase}" />
-               <property name="groupMemberAttributeName" value="${argeo.ldap.groupMemberAttribute}" />
-               <property name="usernameMapper" ref="usernameMapper" />
-               <property name="userDetailsMapper" ref="jcrLdapSynchronizer" />
-               <property name="userAdminDao" ref="userAdminDao" />
-               <property name="passwordEncoder" ref="passwordEncoder" />
-               <property name="passwordAttributeName" value="${argeo.ldap.passwordAttribute}" />
-       </bean>
-
        <!-- LDAP LOW LEVEL -->
        <bean id="contextSource"
                class="org.springframework.security.ldap.DefaultSpringSecurityContextSource">