X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.dao.ldap%2FMETA-INF%2Fspring%2Fsecurity-ldap.xml;h=a31f79dc124416260fd4e4f17b3e1513ae5bd8af;hb=e1133b983c25f3c14a189d5609ee88a5fd4c3c29;hp=8ce3081e423babc24fca6f19a122eddea511005d;hpb=484dcb1507e4e35cc282e50522ea7eac7e99a7f9;p=lgpl%2Fargeo-commons.git

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 8ce3081e4..a31f79dc1 100644
--- 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">