Male LDAP security DAO initialization more robust

[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 d0ad0eca945419762ca5213a618f318b90e70caa..f67cfb49267f71d18dc06934a07e71dfb0aecb46 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,15 +7,11 @@
        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
-       <!-- <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="nodeRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=node)" />\r
+       <list id="repositories" interface="javax.jcr.Repository"\r
+               filter="(argeo.jcr.repository.alias=${argeo.node.repo.alias})"\r
+               cardinality="0..N">\r
+       </list>\r
+\r
        <reference id="systemExecutionService" interface="org.argeo.security.SystemExecutionService" />\r
 \r
        <!-- SERVICES -->\r
@@ -23,14 +19,12 @@
                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="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
+       <service ref="userDetailsManager" interface="org.argeo.security.UserAdminService"\r
+               context-class-loader="service-provider" />\r
 </beans:beans>
\ No newline at end of file