X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.manager.ldap%2FMETA-INF%2Fspring%2Fldap.xml;h=ddfa022f7cbc2d35aa8bf1cdd1029eccecc2cb5b;hb=b00a7e9898ea2819100290cab22bf614e23a3abf;hp=22fd5baffcb289bc23555835b7cbfe4418831247;hpb=8220766ace9f3bde3a9d69890cd8307c34fe8ddd;p=lgpl%2Fargeo-commons.git

diff --git a/security/modules/org.argeo.security.manager.ldap/META-INF/spring/ldap.xml b/security/modules/org.argeo.security.manager.ldap/META-INF/spring/ldap.xml
index 22fd5baff..ddfa022f7 100644
--- a/security/modules/org.argeo.security.manager.ldap/META-INF/spring/ldap.xml
+++ b/security/modules/org.argeo.security.manager.ldap/META-INF/spring/ldap.xml
@@ -13,17 +13,6 @@
 		</property>
 	</bean>
 
-	<!--
-		<security:ldap-server
-		url="ldap://localhost:10389/dc=demo,dc=argeo,dc=org"
-		manager-dn="uid=admin,ou=system" manager-password="secret" />
-
-		<security:ldap-authentication-provider
-		user-details-class="inetOrgPerson" user-dn-pattern="uid={0},ou=users"
-		group-search-base="ou=groups"> <security:password-compare hash="{sha}"
-		/> </security:ldap-authentication-provider>
-	-->
-
 	<bean id="contextSource"
 		class="org.springframework.security.ldap.DefaultSpringSecurityContextSource">
 		<constructor-arg value="ldap://localhost:10389/dc=demo,dc=argeo,dc=org" />
@@ -52,11 +41,10 @@
 		<property name="userDetailsContextMapper" ref="userDetailsMapper" />
 	</bean>
 
-	<bean id="authoritiesPopulator"
-		class="org.springframework.security.ldap.populator.DefaultLdapAuthoritiesPopulator">
+	<bean id="authoritiesPopulator" class="org.argeo.security.ldap.ArgeoLdapAuthoritiesPopulator">
 		<constructor-arg ref="contextSource" />
 		<constructor-arg value="ou=groups" />
-		<!-- <property name="defaultRole" value="ROLE_USER" /> -->
+		<property name="defaultRole" value="ROLE_USER" />
 		<property name="groupSearchFilter" value="uniqueMember={0}" />
 	</bean>
 
@@ -75,11 +63,6 @@
 	</bean>
 
 	<bean id="userDetailsMapper" class="org.argeo.security.ldap.ArgeoUserDetailsContextMapper">
-		<property name="userNatureMappers">
-			<list>
-				<bean class="org.argeo.security.ldap.SimpleUserNatureMapper" />
-				<bean class="org.argeo.security.ldap.CoworkerUserNatureMapper" />
-			</list>
-		</property>
+		<property name="userNatureMappers" ref="userNatureMappers" />
 	</bean>
 </beans>