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=f67cfb49267f71d18dc06934a07e71dfb0aecb46;hb=01d5597f584ac37c81b5a9f6b3cdcf77a487c904;hp=b09aabfe47624cdf952caf48cbf6d3923e7e6eee;hpb=b614eb03ce70d86fd6d02fc443ce11e7125e467d;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 b09aabfe4..f67cfb492 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,24 @@
        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>
+	<list id="repositories" interface="javax.jcr.Repository"
+		filter="(argeo.jcr.repository.alias=${argeo.node.repo.alias})"
+		cardinality="0..N">
+	</list>
+
 	<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"
-		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