From c03f363f45a1e595b8d4e30c3cd0cde1c13eb30e Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 7 Jan 2015 11:01:49 +0000
Subject: [PATCH] check-osgi working

git-svn-id: https://svn.argeo.org/commons/branches/mbaudier.2.tp@7640 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/spring/security-ldap-services.xml           | 9 +++++----
 .../META-INF/spring/security-os.xml                      | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml b/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml
index 9a2f2d1d4..886f333f6 100644
--- a/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml
+++ b/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml
@@ -4,7 +4,8 @@
 	xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<bean id="authenticationManager" class="org.springframework.security.authentication.ProviderManager">
+	<bean id="authenticationManager"
+		class="org.springframework.security.authentication.ProviderManager">
 		<property name="providers">
 			<list>
 				<ref bean="authByAdapterProvider" />
@@ -17,8 +18,7 @@
 	</bean>
 
 	<!-- Authentication provider -->
-	<bean id="authByAdapterProvider"
-		class="org.springframework.security.adapters.AuthByAdapterProvider">
+	<bean id="authByAdapterProvider" class="org.argeo.security.core.InternalAuthenticationProvider">
 		<description><![CDATA[System authentication]]></description>
 		<property name="key" value="${argeo.security.systemKey}" />
 	</bean>
@@ -50,7 +50,8 @@
 		initialization himself, in order to prevent the following dependency cycle: 
 		Repository.login() <= AuthenticationManager <= LdapAuthenticationProvider 
 		<= Repository.login() in init() -->
-	<bean id="internalAuthenticationManager" class="org.springframework.security.authentication.ProviderManager">
+	<bean id="internalAuthenticationManager"
+		class="org.springframework.security.authentication.ProviderManager">
 		<property name="providers">
 			<list>
 				<ref bean="authByAdapterProvider" />
diff --git a/org.argeo.security.dao.os/META-INF/spring/security-os.xml b/org.argeo.security.dao.os/META-INF/spring/security-os.xml
index d80084dfe..69880f750 100644
--- a/org.argeo.security.dao.os/META-INF/spring/security-os.xml
+++ b/org.argeo.security.dao.os/META-INF/spring/security-os.xml
@@ -23,7 +23,8 @@
 		<property name="bundleContext" ref="bundleContext" />
 	</bean>
 
-	<bean id="authenticationManager" class="org.springframework.security.authentication.ProviderManager">
+	<bean id="authenticationManager"
+		class="org.springframework.security.authentication.ProviderManager">
 		<property name="providers">
 			<list>
 				<ref bean="authByAdapterProvider" />
@@ -41,8 +42,7 @@
 
 	<bean name="jcrSecurityModel" class="org.argeo.security.jackrabbit.JackrabbitSecurityModel" />
 
-	<bean id="authByAdapterProvider"
-		class="org.springframework.security.adapters.AuthByAdapterProvider">
+	<bean id="authByAdapterProvider" class="org.argeo.security.core.InternalAuthenticationProvider">
 		<description><![CDATA[System authentication]]></description>
 		<property name="key" value="${argeo.security.systemKey}" />
 	</bean>
@@ -51,7 +51,8 @@
 		himself, in order to prevent the following dependency cycle: Repository.login() 
 		<= AuthenticationManager <= osJcrAuthenticationProvider <= Repository.login() 
 		in init() -->
-	<bean id="internalAuthenticationManager" class="org.springframework.security.authentication.ProviderManager">
+	<bean id="internalAuthenticationManager"
+		class="org.springframework.security.authentication.ProviderManager">
 		<property name="providers">
 			<list>
 				<ref bean="authByAdapterProvider" />
-- 
2.30.2