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=d0ad0eca945419762ca5213a618f318b90e70caa;hb=7f23c34bcf51716cfb8f3853d47680035747052f;hp=7a0fa89fac7290b2e160c108f42318a6f71e9f3a;hpb=95d53b1b0018e86014d8659bdba9903e6f63526a;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 7a0fa89fa..d0ad0eca9 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,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="nodeRepository" interface="javax.jcr.Repository"
+		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" />
-
-	<!-- Provides deserialization -->
-	<service interface="org.argeo.server.json.JsonObjectFactory">
-		<beans:bean class="org.argeo.server.json.JsonObjectFactoryImpl" />
-	</service>
-
+	<service ref="userDetailsManager"
+		interface="org.springframework.security.userdetails.UserDetailsManager"
+		context-class-loader="service-provider" />
 </beans:beans>
\ No newline at end of file