X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.dao.ldap%2FMETA-INF%2Fspring%2Fldap.xml;fp=security%2Fmodules%2Forg.argeo.security.dao.ldap%2FMETA-INF%2Fspring%2Fldap.xml;h=77a6ac7d5b48d9281420f38a67c5b9d8c562abd2;hb=2745f0c8c57d9468855179d56f858fb2448f779c;hp=72de115ca04cda85b2b41381d5277b807721748c;hpb=113e31e7c85bfad76d3c2ce6c20d63557a6fc02a;p=lgpl%2Fargeo-commons.git

diff --git a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap.xml b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap.xml
index 72de115ca..77a6ac7d5 100644
--- a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap.xml
+++ b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap.xml
@@ -80,27 +80,13 @@
 		<property name="rolePrefix" value="${argeo.security.rolePrefix}" />
 	</bean>
 
-	<bean id="userDetailsManager"
-		class="org.springframework.security.userdetails.ldap.LdapUserDetailsManager">
+	<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="jcrUserDetailsContextMapper" />
+		<property name="passwordEncoder" ref="passwordEncoder" />
+		<property name="passwordAttributeName" value="${argeo.ldap.passwordAttribute}" />
 	</bean>
-
-	<!-- <bean id="userDetailsService" -->
-	<!-- class="org.springframework.security.userdetails.ldap.LdapUserDetailsManager"> -->
-	<!-- <constructor-arg> -->
-	<!-- <bean -->
-	<!-- class="org.springframework.security.ldap.search.FilterBasedLdapUserSearch"> -->
-	<!-- <constructor-arg value="${argeo.ldap.userBase}" /> -->
-	<!-- <constructor-arg value="(${argeo.ldap.usernameAttribute}={0})" /> -->
-	<!-- <constructor-arg ref="contextSource" /> -->
-	<!-- </bean> -->
-	<!-- </constructor-arg> -->
-	<!-- <constructor-arg ref="authoritiesPopulator" /> -->
-	<!-- <property name="userDetailsMapper" ref="jcrUserDetailsContextMapper" 
-		/> -->
-	<!-- </bean> -->
 </beans>