X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.dao.ldap%2FMETA-INF%2Fspring%2Fldap-osgi.xml;h=69931f5748295e2104d66bc2cdfaadf5a885717e;hb=70538e1286a2b47ecd58cb1cfb7ede8dddff5859;hp=fcfa5fed17b8b2d0946c86145b092efe99495173;hpb=802beab5459c8da4970215886babb45d968e4639;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 fcfa5fed1..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,24 +7,21 @@
        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=${argeo.node.repo.alias})" />
 	<reference id="systemExecutionService" interface="org.argeo.security.SystemExecutionService" />
 
 	<!-- SERVICES -->
-	<service ref="authenticationProvider"
+	<service ref="ldapAuthenticationProvider"
 		interface="org.springframework.security.providers.AuthenticationProvider"
 		context-class-loader="service-provider" />
-	<service ref="securityDao" interface="org.argeo.security.CurrentUserDao"
+
+	<service ref="userDetailsManager"
+		interface="org.springframework.security.userdetails.UserDetailsService"
 		context-class-loader="service-provider" />
-	<service ref="securityDao" interface="org.argeo.security.UserAdminDao"
+	<service ref="userDetailsManager"
+		interface="org.springframework.security.userdetails.UserDetailsManager"
 		context-class-loader="service-provider" />
-	<service ref="userDetailsService"
-		interface="org.springframework.security.userdetails.UserDetailsService"
+	<service ref="userDetailsManager" interface="org.argeo.security.UserAdminService"
 		context-class-loader="service-provider" />
 </beans:beans>
\ No newline at end of file