From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 17 Jan 2015 14:58:59 +0000 (+0000)
Subject: Adapt to package names changes in Spring Security
X-Git-Tag: argeo-commons-2.1.30~441
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=f3c695378b1f845acddb70ffb4ae905dc0d429f9;p=lgpl%2Fargeo-commons.git

Adapt to package names changes in Spring Security

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

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 @@
 				<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>
@@ -40,11 +40,11 @@
 		<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: 
diff --git a/org.argeo.security.auth.ldap/META-INF/spring/security-ldap.xml b/org.argeo.security.auth.ldap/META-INF/spring/security-ldap.xml
index f367aba1d..e63e01a95 100644
--- a/org.argeo.security.auth.ldap/META-INF/spring/security-ldap.xml
+++ b/org.argeo.security.auth.ldap/META-INF/spring/security-ldap.xml
@@ -15,28 +15,29 @@
 
 	<!-- AUTHENTICATION -->
 	<bean id="ldapAuthenticationProvider"
-		class="org.springframework.security.providers.ldap.LdapAuthenticationProvider">
+		class="org.springframework.security.ldap.authentication.LdapAuthenticationProvider">
 		<constructor-arg ref="ldapAuthenticator" />
 		<constructor-arg ref="authoritiesPopulator" />
 		<property name="userDetailsContextMapper" ref="jcrLdapSynchronizer" />
 	</bean>
 
 	<!-- PasswordComparisonAuthenticator doesn't work with SSHA -->
-<!-- 	<bean id="ldapAuthenticator" -->
-<!-- 		class="org.springframework.security.providers.ldap.authenticator.PasswordComparisonAuthenticator"> -->
-<!-- 		<constructor-arg ref="contextSource" /> -->
-<!-- 		<property name="userDnPatterns"> -->
-<!-- 			<list> -->
-<!-- 				<value><![CDATA[${argeo.ldap.usernameAttribute}={0},${argeo.ldap.userBase}]]></value> -->
-<!-- 			</list> -->
-<!-- 		</property> -->
-<!-- 		<property name="passwordAttributeName" value="${argeo.ldap.passwordAttribute}" /> -->
-<!-- 		<property name="passwordEncoder" ref="passwordEncoder" /> -->
-<!-- 	</bean> -->
+	<!-- <bean id="ldapAuthenticator" -->
+	<!-- class="org.springframework.security.providers.ldap.authenticator.PasswordComparisonAuthenticator"> -->
+	<!-- <constructor-arg ref="contextSource" /> -->
+	<!-- <property name="userDnPatterns"> -->
+	<!-- <list> -->
+	<!-- <value><![CDATA[${argeo.ldap.usernameAttribute}={0},${argeo.ldap.userBase}]]></value> -->
+	<!-- </list> -->
+	<!-- </property> -->
+	<!-- <property name="passwordAttributeName" value="${argeo.ldap.passwordAttribute}" 
+		/> -->
+	<!-- <property name="passwordEncoder" ref="passwordEncoder" /> -->
+	<!-- </bean> -->
 
 	<!-- Bind authenticator doesn't work with Apache DS 1.0 -->
 	<bean id="ldapAuthenticator"
-		class="org.springframework.security.providers.ldap.authenticator.BindAuthenticator">
+		class="org.springframework.security.ldap.authentication.BindAuthenticator">
 		<constructor-arg ref="contextSource" />
 		<property name="userDnPatterns">
 			<list>
@@ -46,35 +47,42 @@
 	</bean>
 
 	<!-- USER DETAILS -->
-<!-- 	<bean id="userDetailsManager" class="org.argeo.security.ldap.ArgeoLdapUserDetailsManager"> -->
-<!-- 		<constructor-arg ref="contextSource" /> -->
-<!-- 		<property name="groupSearchBase" value="${argeo.ldap.groupBase}" /> -->
-<!-- 		<property name="groupMemberAttributeName" value="${argeo.ldap.groupMemberAttribute}" /> -->
-<!-- 		<property name="usernameMapper" ref="usernameMapper" /> -->
-<!-- 		<property name="userDetailsMapper" ref="jcrLdapSynchronizer" /> -->
-<!-- 		<property name="userAdminDao" ref="userAdminDao" /> -->
-<!-- 		<property name="passwordEncoder" ref="passwordEncoder" /> -->
-<!-- 		<property name="passwordAttributeName" value="${argeo.ldap.passwordAttribute}" /> -->
-<!-- 		<property name="superUsername" value="${argeo.security.superUsername}" /> -->
-<!-- 	</bean> -->
+	<!-- <bean id="userDetailsManager" class="org.argeo.security.ldap.ArgeoLdapUserDetailsManager"> -->
+	<!-- <constructor-arg ref="contextSource" /> -->
+	<!-- <property name="groupSearchBase" value="${argeo.ldap.groupBase}" /> -->
+	<!-- <property name="groupMemberAttributeName" value="${argeo.ldap.groupMemberAttribute}" 
+		/> -->
+	<!-- <property name="usernameMapper" ref="usernameMapper" /> -->
+	<!-- <property name="userDetailsMapper" ref="jcrLdapSynchronizer" /> -->
+	<!-- <property name="userAdminDao" ref="userAdminDao" /> -->
+	<!-- <property name="passwordEncoder" ref="passwordEncoder" /> -->
+	<!-- <property name="passwordAttributeName" value="${argeo.ldap.passwordAttribute}" 
+		/> -->
+	<!-- <property name="superUsername" value="${argeo.security.superUsername}" 
+		/> -->
+	<!-- </bean> -->
 
-<!-- 	<bean id="userAdminDao" class="org.argeo.security.ldap.ArgeoUserAdminDaoLdap"> -->
-<!-- 		<constructor-arg ref="contextSource" /> -->
-<!-- 		<property name="userBase" value="${argeo.ldap.userBase}" /> -->
-<!-- 		<property name="usernameAttribute" value="${argeo.ldap.usernameAttribute}" /> -->
-<!-- 		<property name="groupClasses"> -->
-<!-- 			<list> -->
-<!-- 				<value>top</value> -->
-<!-- 				<value>${argeo.ldap.groupClass}</value> -->
-<!-- 			</list> -->
-<!-- 		</property> -->
-<!-- 		<property name="groupBase" value="${argeo.ldap.groupBase}" /> -->
-<!-- 		<property name="groupRoleAttribute" value="${argeo.ldap.groupRoleAttribute}" /> -->
-<!-- 		<property name="groupMemberAttribute" value="${argeo.ldap.groupMemberAttribute}" /> -->
-<!-- 		<property name="defaultRole" value="${argeo.security.defaultRole}" /> -->
-<!-- 		<property name="rolePrefix" value="${argeo.security.rolePrefix}" /> -->
-<!-- 		<property name="usernameMapper" ref="usernameMapper" /> -->
-<!-- 	</bean> -->
+	<!-- <bean id="userAdminDao" class="org.argeo.security.ldap.ArgeoUserAdminDaoLdap"> -->
+	<!-- <constructor-arg ref="contextSource" /> -->
+	<!-- <property name="userBase" value="${argeo.ldap.userBase}" /> -->
+	<!-- <property name="usernameAttribute" value="${argeo.ldap.usernameAttribute}" 
+		/> -->
+	<!-- <property name="groupClasses"> -->
+	<!-- <list> -->
+	<!-- <value>top</value> -->
+	<!-- <value>${argeo.ldap.groupClass}</value> -->
+	<!-- </list> -->
+	<!-- </property> -->
+	<!-- <property name="groupBase" value="${argeo.ldap.groupBase}" /> -->
+	<!-- <property name="groupRoleAttribute" value="${argeo.ldap.groupRoleAttribute}" 
+		/> -->
+	<!-- <property name="groupMemberAttribute" value="${argeo.ldap.groupMemberAttribute}" 
+		/> -->
+	<!-- <property name="defaultRole" value="${argeo.security.defaultRole}" 
+		/> -->
+	<!-- <property name="rolePrefix" value="${argeo.security.rolePrefix}" /> -->
+	<!-- <property name="usernameMapper" ref="usernameMapper" /> -->
+	<!-- </bean> -->
 
 	<bean id="usernameMapper"
 		class="org.springframework.security.ldap.DefaultLdapUsernameToDnMapper">
@@ -83,7 +91,7 @@
 	</bean>
 
 	<bean id="authoritiesPopulator"
-		class="org.springframework.security.ldap.populator.DefaultLdapAuthoritiesPopulator">
+		class="org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator">
 		<constructor-arg ref="contextSource" />
 		<constructor-arg value="${argeo.ldap.groupBase}" />
 		<property name="groupSearchFilter" value="${argeo.ldap.groupMemberAttribute}={0}" />
@@ -96,8 +104,8 @@
 		class="org.springframework.security.ldap.DefaultSpringSecurityContextSource">
 		<constructor-arg
 			value="${argeo.ldap.protocol}://${argeo.ldap.host}:${argeo.ldap.port}/${argeo.ldap.rootdn}" />
-<!-- 		<property name="userDn" value="${argeo.ldap.manager.userdn}" /> -->
-<!-- 		<property name="password" value="${argeo.ldap.manager.password}" /> -->
+		<!-- <property name="userDn" value="${argeo.ldap.manager.userdn}" /> -->
+		<!-- <property name="password" value="${argeo.ldap.manager.password}" /> -->
 	</bean>
 
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
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">
 		<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" />
@@ -23,16 +23,16 @@
 		<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.authentication.AnonymousAuthenticationProvider">
@@ -40,11 +40,11 @@
 		<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: 
diff --git a/org.argeo.security.dao.ldap/META-INF/spring/security-ldap.xml b/org.argeo.security.dao.ldap/META-INF/spring/security-ldap.xml
index 3777f8853..ede9e2919 100644
--- a/org.argeo.security.dao.ldap/META-INF/spring/security-ldap.xml
+++ b/org.argeo.security.dao.ldap/META-INF/spring/security-ldap.xml
@@ -15,7 +15,7 @@
 
 	<!-- AUTHENTICATION -->
 	<bean id="ldapAuthenticationProvider"
-		class="org.springframework.security.providers.ldap.LdapAuthenticationProvider">
+		class="org.springframework.security.ldap.authentication.LdapAuthenticationProvider">
 		<constructor-arg ref="ldapAuthenticator" />
 		<constructor-arg ref="authoritiesPopulator" />
 		<property name="userDetailsContextMapper" ref="jcrLdapSynchronizer" />
@@ -23,7 +23,7 @@
 
 	<!-- PasswordComparisonAuthenticator doesn't work with SSHA -->
 	<bean id="ldapAuthenticator"
-		class="org.springframework.security.providers.ldap.authenticator.PasswordComparisonAuthenticator">
+		class="org.springframework.security.ldap.authentication.PasswordComparisonAuthenticator">
 		<constructor-arg ref="contextSource" />
 		<property name="userDnPatterns">
 			<list>
@@ -36,7 +36,7 @@
 
 	<!-- Bind authenticator doesn't work with Apache DS 1.0 -->
 	<!-- <bean id="ldapAuthenticator" -->
-	<!-- class="org.springframework.security.providers.ldap.authenticator.BindAuthenticator"> -->
+	<!-- class="org.springframework.security.ldap.authentication.BindAuthenticator"> -->
 	<!-- <constructor-arg ref="contextSource" /> -->
 	<!-- <property name="userDnPatterns"> -->
 	<!-- <list> -->
@@ -83,7 +83,7 @@
 	</bean>
 
 	<bean id="authoritiesPopulator"
-		class="org.springframework.security.ldap.populator.DefaultLdapAuthoritiesPopulator">
+		class="org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator">
 		<constructor-arg ref="contextSource" />
 		<constructor-arg value="${argeo.ldap.groupBase}" />
 		<property name="groupSearchFilter" value="${argeo.ldap.groupMemberAttribute}={0}" />
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