Improve RAP security

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

diff --git a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap-osgi.xml b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap-osgi.xml
index 3ae43c3307780e0bd0676038d6b7129c84dd3769..8deaeacdea6af41542c282890364d6d7109b1934 100644 (file)
--- a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap-osgi.xml
+++ b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap-osgi.xml
@@ -7,18 +7,30 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
        <!-- REFERENCES -->\r
-       <list id="userNatureMappers" interface="org.argeo.security.ldap.UserNatureMapper"\r
-               cardinality="0..N" />\r
+<!--   <list id="userNatureMappers" interface="org.argeo.security.ldap.UserNatureMapper" -->\r
+<!--           cardinality="0..N" /> -->\r
+<!--   <reference id="repositoryFactory" interface="javax.jcr.RepositoryFactory" -->\r
+<!--           cardinality="0..1"> -->\r
+<!--           <listener ref="jcrUserDetailsContextMapper" bind-method="register" -->\r
+<!--                   unbind-method="unregister" /> -->\r
+<!--   </reference> -->\r
+       <reference id="nodeSession" interface="javax.jcr.Session"\r
+               filter="(argeo.jcr.repository.alias=node)" />\r
+       <reference id="systemExecutionService" interface="org.argeo.security.SystemExecutionService" />\r
 \r
        <!-- SERVICES -->\r
-       <service ref="authenticationProvider"\r
+       <service ref="ldapAuthenticationProvider"\r
                interface="org.springframework.security.providers.AuthenticationProvider"\r
                context-class-loader="service-provider" />\r
+               \r
        <service ref="securityDao" interface="org.argeo.security.CurrentUserDao"\r
                context-class-loader="service-provider" />\r
        <service ref="securityDao" interface="org.argeo.security.UserAdminDao"\r
                context-class-loader="service-provider" />\r
-       <service ref="userDetailsService"\r
+       <service ref="userDetailsManager"\r
                interface="org.springframework.security.userdetails.UserDetailsService"\r
                context-class-loader="service-provider" />\r
+       <service ref="userDetailsManager"\r
+               interface="org.springframework.security.userdetails.UserDetailsManager"\r
+               context-class-loader="service-provider" />\r
 </beans:beans>
\ No newline at end of file