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=8deaeacdea6af41542c282890364d6d7109b1934;hb=2f510fb09e18bc3d3e902c8131d0037763c5f279;hp=3ae43c3307780e0bd0676038d6b7129c84dd3769;hpb=8007bb802cc45fcf9343221379987f722696de3b;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 3ae43c330..8deaeacde 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,18 +7,30 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<!-- REFERENCES -->
-	<list id="userNatureMappers" interface="org.argeo.security.ldap.UserNatureMapper"
-		cardinality="0..N" />
+<!-- 	<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="nodeSession" interface="javax.jcr.Session"
+		filter="(argeo.jcr.repository.alias=node)" />
+	<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="userDetailsService"
+	<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" />
 </beans:beans>
\ No newline at end of file