Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-08-06 02:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

XML ref to bean

Browse Source 
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
This commit is contained in:
Rob Winch
2016-10-14 17:36:32 -05:00
parent 08c1f500a7
commit 1222fc5f10
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/xml/contacts/client/clientContext.xml
+2 -2
View File
@@ -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
+10 -10
View File
@@ -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>