X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.dao.ldap%2FMETA-INF%2Fspring%2Fldap-osgi.xml;h=69931f5748295e2104d66bc2cdfaadf5a885717e;hb=118878eb12c8e142da7648cae3880754b34798b2;hp=d0ad0eca945419762ca5213a618f318b90e70caa;hpb=2745f0c8c57d9468855179d56f858fb2448f779c;p=lgpl%2Fargeo-commons.git

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 d0ad0eca9..69931f574 100644
--- 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,8 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<!-- REFERENCES -->
-	<!-- <list id="userNatureMappers" interface="org.argeo.security.ldap.UserNatureMapper" -->
-	<!-- cardinality="0..N" /> -->
-	<!-- <reference id="repositoryFactory" interface="javax.jcr.RepositoryFactory" -->
-	<!-- cardinality="0..1"> -->
-	<!-- <listener ref="jcrUserDetailsContextMapper" bind-method="register" -->
-	<!-- unbind-method="unregister" /> -->
-	<!-- </reference> -->
 	<reference id="nodeRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=node)" />
+		filter="(argeo.jcr.repository.alias=${argeo.node.repo.alias})" />
 	<reference id="systemExecutionService" interface="org.argeo.security.SystemExecutionService" />
 
 	<!-- SERVICES -->
@@ -23,14 +16,12 @@
 		interface="org.springframework.security.providers.AuthenticationProvider"
 		context-class-loader="service-provider" />
 
-	<service ref="securityDao" interface="org.argeo.security.CurrentUserDao"
-		context-class-loader="service-provider" />
-	<service ref="securityDao" interface="org.argeo.security.UserAdminDao"
-		context-class-loader="service-provider" />
 	<service ref="userDetailsManager"
 		interface="org.springframework.security.userdetails.UserDetailsService"
 		context-class-loader="service-provider" />
 	<service ref="userDetailsManager"
 		interface="org.springframework.security.userdetails.UserDetailsManager"
 		context-class-loader="service-provider" />
+	<service ref="userDetailsManager" interface="org.argeo.security.UserAdminService"
+		context-class-loader="service-provider" />
 </beans:beans>
\ No newline at end of file