From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 9 Jan 2015 10:36:02 +0000 (+0000)
Subject: Fix CLI security DAO
X-Git-Tag: argeo-commons-2.1.30~462
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=0573217210e35627085c1693095b65884157543b;p=lgpl%2Fargeo-commons.git

Fix CLI security DAO

git-svn-id: https://svn.argeo.org/commons/trunk@7649 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.security.dao.cli/META-INF/spring/security-cli.xml b/org.argeo.security.dao.cli/META-INF/spring/security-cli.xml
index a9102edc8..f79cf0db1 100644
--- a/org.argeo.security.dao.cli/META-INF/spring/security-cli.xml
+++ b/org.argeo.security.dao.cli/META-INF/spring/security-cli.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" />