X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.dao.jackrabbit%2FMETA-INF%2Fspring%2Fsecurity-jcr-services.xml;h=6a7bdeca53db26f6b1a6ab435f19594c0e640d51;hb=a43673012d2827b0780c03f8a4fe862a6f7dfbf8;hp=7f276a27131ca83ba0e2fb7f426e8a3502167cae;hpb=98da77614390f19ee7af36a63250f055d6865b06;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-services.xml b/org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-services.xml
index 7f276a271..6a7bdeca5 100644
--- a/org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-services.xml
+++ b/org.argeo.security.dao.jackrabbit/META-INF/spring/security-jcr-services.xml
@@ -12,7 +12,8 @@
 		</property>
 	</bean>
 
-	<bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
+	<bean id="authenticationManager"
+		class="org.springframework.security.authentication.ProviderManager">
 		<property name="providers">
 			<list>
 				<ref bean="authByAdapterProvider" />
@@ -23,20 +24,19 @@
 	</bean>
 
 	<!-- Authentication providers -->
-	<bean id="authByAdapterProvider"
-		class="org.springframework.security.adapters.AuthByAdapterProvider">
+	<bean id="authByAdapterProvider" class="org.argeo.security.core.InternalAuthenticationProvider">
 		<property name="key" value="${argeo.security.systemKey}" />
 	</bean>
 
 	<bean id="anonymousAuthenticationProvider"
-		class="org.springframework.security.providers.anonymous.AnonymousAuthenticationProvider">
+		class="org.springframework.security.authentication.AnonymousAuthenticationProvider">
 		<description><![CDATA[Anonymous authentication]]></description>
 		<property name="key" value="${argeo.security.systemKey}" />
 	</bean>
 
 	<!-- User manager -->
 	<bean id="userDetailsManager"
-		class="org.argeo.security.jackrabbit.JackrabbitUserAdminService"
+		class="org.argeo.security.jcr.jackrabbit.JackrabbitUserAdminService"
 		init-method="init" destroy-method="destroy" depends-on="systemInit">
 		<property name="repository" ref="nodeRepository" />
 		<property name="securityModel" ref="jcrSecurityModel" />
@@ -61,7 +61,8 @@
 		initialization himself, in order to prevent the following dependency cycle: 
 		Repository.login() <= AuthenticationManager <= JackrabbitUserAdminService 
 		<= Repository.login() in init() -->
-	<bean id="internalAuthenticationManager" class="org.springframework.security.providers.ProviderManager">
+	<bean id="internalAuthenticationManager"
+		class="org.springframework.security.authentication.ProviderManager">
 		<property name="providers">
 			<list>
 				<ref bean="authByAdapterProvider" />