Centralise login in Kernel

[lgpl/argeo-commons.git] / org.argeo.security.auth.ldap / META-INF / spring / security-ldap-services.xml

diff --git a/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-services.xml b/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-services.xml
index 0b9a8b8f0bfe1bec6a21368de84e6e894ea01d5d..105be7df5e60112284880e5eb8337fd965045b1b 100644 (file)
--- a/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-services.xml
+++ b/org.argeo.security.auth.ldap/META-INF/spring/security-ldap-services.xml
@@ -4,13 +4,13 @@
        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="anonymousAuthenticationProvider" />
-                               <ref bean="rememberMeAuthenticationProvider" />
+<!--                           <ref bean="rememberMeAuthenticationProvider" /> -->
                                <ref bean="ldapAuthenticationProvider" />
                        </list>
                </property>
@@ -18,7 +18,7 @@
 
        <!-- Authentication provider -->
        <bean id="authByAdapterProvider"
-               class="org.springframework.security.adapters.AuthByAdapterProvider">
+               class="org.argeo.security.core.InternalAuthenticationProvider">
                <description><![CDATA[System authentication]]></description>
                <property name="key" value="${argeo.security.systemKey}" />
        </bean>
@@ -35,22 +35,22 @@
 <!--   </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" />