Restructure security

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

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 2867ad2c23ea08a1f240d3886b0e92d7f98e1be8..ddfa022f7cbc2d35aa8bf1cdd1029eccecc2cb5b 100644 (file)
--- 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" />
@@ -55,7 +44,7 @@
        <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>
 
@@ -74,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>