From f3c695378b1f845acddb70ffb4ae905dc0d429f9 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 17 Jan 2015 14:58:59 +0000 Subject: [PATCH] Adapt to package names changes in Spring Security git-svn-id: https://svn.argeo.org/commons/trunk@7683 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../spring/security-ldap-services.xml | 14 +-- .../META-INF/spring/security-ldap.xml | 96 ++++++++++--------- org.argeo.security.auth.ldap/bnd.bnd | 1 - .../spring/security-ldap-services.xml | 34 +++---- .../META-INF/spring/security-ldap.xml | 8 +- org.argeo.security.dao.ldap/bnd.bnd | 1 - 6 files changed, 80 insertions(+), 74 deletions(-) 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 6fcf77dea..105be7df5 100644 --- 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 @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ + class="org.argeo.security.core.InternalAuthenticationProvider"> @@ -40,11 +40,11 @@ - - - - + + + + + + class="org.springframework.security.ldap.authentication.LdapAuthenticationProvider"> - - - - - - - - - - - + + + + + + + + + + + + class="org.springframework.security.ldap.authentication.BindAuthenticator"> @@ -46,35 +47,42 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -83,7 +91,7 @@ + class="org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator"> @@ -96,8 +104,8 @@ class="org.springframework.security.ldap.DefaultSpringSecurityContextSource"> - - + + diff --git a/org.argeo.security.auth.ldap/bnd.bnd b/org.argeo.security.auth.ldap/bnd.bnd index 85e0e5c66..54130229d 100644 --- a/org.argeo.security.auth.ldap/bnd.bnd +++ b/org.argeo.security.auth.ldap/bnd.bnd @@ -1,5 +1,4 @@ Import-Package: org.argeo.jcr,\ com.sun.jndi.ldap;resolution:=optional,\ org.springframework.ldap.core.support,\ -org.springframework.security,\ * \ No newline at end of file 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 886f333f6..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 @@ -8,8 +8,8 @@ class="org.springframework.security.authentication.ProviderManager"> - - + + @@ -23,16 +23,16 @@ - - - - - - - - + + + + + + + + + + @@ -40,11 +40,11 @@ - - - - + + + + + + class="org.springframework.security.ldap.authentication.LdapAuthenticationProvider"> @@ -23,7 +23,7 @@ + class="org.springframework.security.ldap.authentication.PasswordComparisonAuthenticator"> @@ -36,7 +36,7 @@ - + @@ -83,7 +83,7 @@ + class="org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator"> diff --git a/org.argeo.security.dao.ldap/bnd.bnd b/org.argeo.security.dao.ldap/bnd.bnd index 85e0e5c66..54130229d 100644 --- a/org.argeo.security.dao.ldap/bnd.bnd +++ b/org.argeo.security.dao.ldap/bnd.bnd @@ -1,5 +1,4 @@ Import-Package: org.argeo.jcr,\ com.sun.jndi.ldap;resolution:=optional,\ org.springframework.ldap.core.support,\ -org.springframework.security,\ * \ No newline at end of file -- 2.39.2