XML ref to bean

Spring 5 removes ref XML attribute in favor of bean XML attribute. This
commit updates all the samples and tests to use bean instead of ref.

Issue gh-4080

config/src/test/resources/org/springframework/security/util/filtertest-valid.xml

@@ -131,7 +131,7 @@
 					<constructor-arg ref="fooMatcher"/>
 					<constructor-arg>
 						<list>
-						  <ref local="mockFilter"/>
+						  <ref bean="mockFilter"/>
 						</list>
 					</constructor-arg>
 				</bean>
@@ -143,9 +143,9 @@
 					</constructor-arg>
 					<constructor-arg>
 						<list>
-							<ref local="sif"/>
-							<ref local="mockFilter"/>
-							<ref local="mockFilter2"/>
+							<ref bean="sif"/>
+							<ref bean="mockFilter"/>
+							<ref bean="mockFilter2"/>
 						</list>
 					</constructor-arg>
 				</bean>
@@ -167,9 +167,9 @@
 					</constructor-arg>
 					<constructor-arg>
 						<list>
-						  <ref local="sif"/>
-						  <ref local="apf"/>
-						  <ref local="mockFilter"/>
+						  <ref bean="sif"/>
+						  <ref bean="apf"/>
+						  <ref bean="mockFilter"/>
 						</list>
 					</constructor-arg>
 				</bean>

samples/xml/contacts/client/clientContext.xml

@@ -23,7 +23,7 @@
 			<value>rmi://${serverName}:${rmiPort}/contactManager</value>
 		</property>
 		<property name="remoteInvocationFactory">
-			<ref local="remoteInvocationFactory"/>
+			<ref bean="remoteInvocationFactory"/>
 		</property>
 	</bean>
 
@@ -40,7 +40,7 @@
 			<value>http://${serverName}:${httpPort}${contextPath}/remoting/ContactManager-httpinvoker</value>
 		</property>
 		<property name="httpInvokerRequestExecutor">
-			<ref local="httpInvokerRequestExecutor"/>
+			<ref bean="httpInvokerRequestExecutor"/>
 		</property>
 	</bean>
 

samples/xml/dms/src/main/resources/applicationContext-dms-secure.xml

@@ -105,8 +105,8 @@
 	  <constructor-arg value="ACL_ABSTRACT_ELEMENT_WRITE_PARENT"/>
 	  <constructor-arg>
 		  <list>
-		  <ref local="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
-		  <ref local="org.springframework.security.acls.domain.BasePermission.WRITE"/>
+		  <ref bean="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
+		  <ref bean="org.springframework.security.acls.domain.BasePermission.WRITE"/>
 		  </list>
 	  </constructor-arg>
 	  <property name="processDomainObjectClass" value="sample.dms.AbstractElement"/>
@@ -119,8 +119,8 @@
 	  <constructor-arg value="ACL_ABSTRACT_ELEMENT_WRITE"/>
 	  <constructor-arg>
 		  <list>
-		  <ref local="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
-		  <ref local="org.springframework.security.acls.domain.BasePermission.WRITE"/>
+		  <ref bean="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
+		  <ref bean="org.springframework.security.acls.domain.BasePermission.WRITE"/>
 		  </list>
 	  </constructor-arg>
 	  <property name="processDomainObjectClass" value="sample.dms.AbstractElement"/>
@@ -130,9 +130,9 @@
    <bean id="businessAccessDecisionManager" class="org.springframework.security.access.vote.AffirmativeBased">
 	  <constructor-arg>
 		 <list>
-			<ref local="roleVoter"/>
-			<ref local="aclAbstractElementWriteParentVoter"/>
-			<ref local="aclAbstractElementWriteVoter"/>
+			<ref bean="roleVoter"/>
+			<ref bean="aclAbstractElementWriteParentVoter"/>
+			<ref bean="aclAbstractElementWriteVoter"/>
 		 </list>
 	  </constructor-arg>
 	  <property name="allowIfAllAbstainDecisions" value="true"/>
@@ -203,7 +203,7 @@
    <bean id="afterInvocationManager" class="org.springframework.security.access.intercept.AfterInvocationProviderManager">
 	  <property name="providers">
 		 <list>
-			<ref local="afterAclCollectionRead"/>
+			<ref bean="afterAclCollectionRead"/>
 		 </list>
 	  </property>
    </bean>
@@ -213,8 +213,8 @@
 	  <constructor-arg ref="aclService"/>
 	  <constructor-arg>
 		  <list>
-		  <ref local="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
-		  <ref local="org.springframework.security.acls.domain.BasePermission.READ"/>
+		  <ref bean="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
+		  <ref bean="org.springframework.security.acls.domain.BasePermission.READ"/>
 		  </list>
 	  </constructor-arg>
    </bean>

sandbox/heavyduty/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml

@@ -48,8 +48,8 @@
 	</bean>
 
 	<bean id="basicProcessingFilter" class="org.springframework.security.ui.basicauth.BasicProcessingFilter">
-		<property name="authenticationManager"><ref local="authenticationManager"/></property>
-		<property name="authenticationEntryPoint"><ref local="basicProcessingFilterEntryPoint"/></property>
+		<property name="authenticationManager"><ref bean="authenticationManager"/></property>
+		<property name="authenticationEntryPoint"><ref bean="basicProcessingFilterEntryPoint"/></property>
 	</bean>
 
 	<bean id="basicProcessingFilterEntryPoint" class="org.springframework.security.ui.basicauth.BasicProcessingFilterEntryPoint">
@@ -114,7 +114,7 @@
 	<bean id="authenticationManager" class="org.springframework.security.authentication.ProviderManager">
 		<property name="providers">
 			<list>
-				<ref local="daoAuthenticationProvider"/>
+				<ref bean="daoAuthenticationProvider"/>
 				<bean class="org.springframework.security.authentication.AnonymousAuthenticationProvider">
 					<property name="key" value="changeThis"/>
 				</bean>
@@ -146,14 +146,14 @@
 	<bean id="attributes" class="org.springframework.security.access.annotation.SecurityAnnotationAttributes"/>
 
 	<bean id="securityMetadataSource" class="org.springframework.security.access.intercept.method.MethodDefinitionAttributes">
-		<property name="attributes"><ref local="attributes"/></property>
+		<property name="attributes"><ref bean="attributes"/></property>
 	</bean>
 
 	<bean id="securityInterceptor" class="org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor">
-		<property name="authenticationManager"><ref local="authenticationManager"/></property>
-		<property name="accessDecisionManager"><ref local="accessDecisionManager"/></property>
+		<property name="authenticationManager"><ref bean="authenticationManager"/></property>
+		<property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>
 		<property name="securityMetadataSource">
-			<ref local="securityMetadataSource"/>
+			<ref bean="securityMetadataSource"/>
 		</property>
 	</bean>