X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.dao.ldap%2FMETA-INF%2Fspring%2Fsecurity-ldap-services.xml;h=8fc2b2d0dbf0de8f2a4ac176add451d7fc22a2bd;hb=f3c695378b1f845acddb70ffb4ae905dc0d429f9;hp=36dedf3891587823d384000e6f777dea902e1b01;hpb=1df1bf64759d35d3d72b9d96b26b71118fdbe031;p=lgpl%2Fargeo-commons.git

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 36dedf389..8fc2b2d0d 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,11 +4,12 @@
 	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.providers.ProviderManager">
+	<bean id="authenticationManager"
+		class="org.springframework.security.authentication.ProviderManager">
 		<property name="providers">
 			<list>
-				<ref bean="authByAdapterProvider" />
-				<ref bean="preAuthProvider" />
+				<!-- <ref bean="authByAdapterProvider" /> -->
+				<!-- <ref bean="preAuthProvider" /> -->
 				<ref bean="anonymousAuthenticationProvider" />
 				<ref bean="rememberMeAuthenticationProvider" />
 				<ref bean="ldapAuthenticationProvider" />
@@ -17,40 +18,40 @@
 	</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>
 
-	<bean id="preAuthProvider"
-		class="org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationProvider">
-		<description><![CDATA[Pre-authentication]]></description>
-		<property name="preAuthenticatedUserDetailsService">
-			<bean id="userDetailsServiceWrapper"
-				class="org.springframework.security.userdetails.UserDetailsByNameServiceWrapper">
-				<property name="userDetailsService" ref="userDetailsManager" />
-			</bean>
-		</property>
-	</bean>
+	<!-- <bean id="preAuthProvider" -->
+	<!-- class="org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationProvider"> -->
+	<!-- <description><![CDATA[Pre-authentication]]></description> -->
+	<!-- <property name="preAuthenticatedUserDetailsService"> -->
+	<!-- <bean id="userDetailsServiceWrapper" -->
+	<!-- class="org.springframework.security.userdetails.UserDetailsByNameServiceWrapper"> -->
+	<!-- <property name="userDetailsService" ref="userDetailsManager" /> -->
+	<!-- </bean> -->
+	<!-- </property> -->
+	<!-- </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>
 
-	<bean id="rememberMeAuthenticationProvider"
-		class="org.springframework.security.providers.rememberme.RememberMeAuthenticationProvider">
-		<description><![CDATA[Remember me authentication]]></description>
-		<property name="key" value="${argeo.security.systemKey}" />
-	</bean>
+	<!-- <bean id="rememberMeAuthenticationProvider" -->
+	<!-- class="org.springframework.security.providers.rememberme.RememberMeAuthenticationProvider"> -->
+	<!-- <description><![CDATA[Remember me authentication]]></description> -->
+	<!-- <property name="key" value="${argeo.security.systemKey}" /> -->
+	<!-- </bean> -->
 
 	<!-- Internal authentication, used by during the general authentication 
 		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.providers.ProviderManager">
+	<bean id="internalAuthenticationManager"
+		class="org.springframework.security.authentication.ProviderManager">
 		<property name="providers">
 			<list>
 				<ref bean="authByAdapterProvider" />