Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Streamline XML namespace support towards unversioned schemas

Browse Source 
This commit also removes support code for outdated options which were only available in older schema versions.

Issue: SPR-13499
This commit is contained in:
Juergen Hoeller
2016-07-05 20:50:00 +02:00
parent 12d373659a
commit bc2c22d51e
217 changed files with 413 additions and 41094 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-context/src/test/resources/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans default-dependency-check="all">
<beans>
<bean id="testBean" class="org.springframework.aop.framework.CglibTestBean">
<property name="name" value="Rob Harrop"/>

8
spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml
View File

@@ -13,7 +13,7 @@
<bean id="test1" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="interfaces"><value>org.springframework.tests.sample.beans.ITestBean</value></property>
<property name="target"><ref local="test"/></property>
<property name="target"><ref bean="test"/></property>
<property name="interceptorNames"><value>debugInterceptor</value></property>
</bean>
@@ -59,7 +59,7 @@
<bean id="test3" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="autodetectInterfaces"><value>true</value></property>
<property name="target"><ref local="test"/></property>
<property name="target"><ref bean="test"/></property>
<property name="interceptorNames"><value>debugInterceptor</value></property>
</bean>
@@ -115,7 +115,7 @@
class="org.springframework.aop.framework.ProxyFactoryBean"
>
<property name="proxyInterfaces"><value>org.springframework.tests.sample.beans.ITestBean</value></property>
<property name="target"><ref local="test"/></property>
<property name="target"><ref bean="test"/></property>
</bean>
-->
@@ -160,7 +160,7 @@
</list>
</property>
<property name="singleton"><value>false</value></property>
<property name="target"><ref local="prototypeTestBean"/></property>
<property name="target"><ref bean="prototypeTestBean"/></property>
<property name="interceptorNames">
<list>
<value>prototypeLockMixinInterceptor</value>

4
spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
View File

@@ -22,7 +22,7 @@
<bean id="adamTargetSource" class="org.springframework.aop.target.SingletonTargetSource">
<constructor-arg>
<ref local="adam"/>
<ref bean="adam"/>
</constructor-arg>
</bean>
@@ -45,7 +45,7 @@
<property name="proxyInterfaces"><value>org.springframework.tests.sample.beans.ITestBean</value></property>
<!-- this is the one used and NOT the one set by targetSource -->
<property name="interceptorNames"><value>adam</value></property>
<property name="targetSource"><ref local="eveTargetSource"/></property>
<property name="targetSource"><ref bean="eveTargetSource"/></property>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml
View File

@@ -18,7 +18,7 @@
>
<property name="proxyInterfaces"><value>org.springframework.tests.sample.beans.ITestBean</value></property>
<property name="target"><ref local="test"/></property>
<property name="target"><ref bean="test"/></property>
<property name="interceptorNames"><value>debugInterceptor</value></property>
<property name="frozen"><value>true</value></property>
<property name="optimize"><value>true</value></property>

2
spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml
View File

@@ -25,7 +25,7 @@
in a BeanFactory. If for some strange reason you want to, use Type 3 IoC.
-->
<bean id="targetSource" class="org.springframework.aop.target.SingletonTargetSource">
<constructor-arg><ref local="target"/></constructor-arg>
<constructor-arg><ref bean="target"/></constructor-arg>
</bean>
<bean id="directTarget"

2
spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml
View File

@@ -8,7 +8,7 @@
<bean id="simpleBeforeAdvice" class="org.springframework.aop.framework.adapter.SimpleBeforeAdviceImpl"/>
<bean id="simpleBeforeAdviceAdvisor" class="org.springframework.aop.support.DefaultPointcutAdvisor">
<constructor-arg><ref local="simpleBeforeAdvice"/></constructor-arg>
<constructor-arg><ref bean="simpleBeforeAdvice"/></constructor-arg>
</bean>
<bean id="testBean" class="org.springframework.aop.framework.ProxyFactoryBean">

2
spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml
View File

@@ -8,7 +8,7 @@
<bean id="simpleBeforeAdvice" class="org.springframework.aop.framework.adapter.SimpleBeforeAdviceImpl"/>
<bean id="simpleBeforeAdviceAdvisor" class="org.springframework.aop.support.DefaultPointcutAdvisor">
<constructor-arg><ref local="simpleBeforeAdvice"/></constructor-arg>
<constructor-arg><ref bean="simpleBeforeAdvice"/></constructor-arg>
</bean>
<bean id="testBean" class="org.springframework.aop.framework.ProxyFactoryBean">

6
spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml
View File

@@ -14,17 +14,17 @@
<bean id="test" scope="prototype" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>Rod</value></property>
<property name="spouse"><ref local="wife"/></property>
<property name="spouse"><ref bean="wife"/></property>
</bean>
<bean id="prototypeTest" class="org.springframework.tests.sample.beans.CountingTestBean">
<property name="name"><value>Rod</value></property>
<property name="spouse"><ref local="wife"/></property>
<property name="spouse"><ref bean="wife"/></property>
</bean>
<bean id="lazyInitTest" class="org.springframework.tests.sample.beans.CountingTestBean" lazy-init="true">
<property name="name"><value>Rod</value></property>
<property name="spouse"><ref local="wife"/></property>
<property name="spouse"><ref bean="wife"/></property>
</bean>
<bean id="wife" class="org.springframework.tests.sample.beans.TestBean">

10
spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml
View File

@@ -6,7 +6,7 @@
<bean id="aapc" class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator">
<property name="customTargetSourceCreators">
<list>
<ref local="aapc.quickTargetSourceCreator"/>
<ref bean="aapc.quickTargetSourceCreator"/>
</list>
</property>
</bean>
@@ -16,7 +16,7 @@
<bean id="test" scope="prototype" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>Rod</value></property>
<property name="spouse"><ref local="wife"/></property>
<property name="spouse"><ref bean="wife"/></property>
</bean>
<bean id="wife" class="org.springframework.tests.sample.beans.TestBean">
@@ -26,19 +26,19 @@
<!-- Prefix means it will be pooled -->
<bean id=":test" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>Rod</value></property>
<property name="spouse"><ref local="wife"/></property>
<property name="spouse"><ref bean="wife"/></property>
</bean>
<!-- Prefix means it will be thread local -->
<bean name="%test" scope="prototype" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>Rod</value></property>
<property name="spouse"><ref local="wife"/></property>
<property name="spouse"><ref bean="wife"/></property>
</bean>
<!-- Prefix means it will be a prototype target source -->
<bean name="!test" scope="prototype" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>Rod</value></property>
<property name="spouse"><ref local="wife"/></property>
<property name="spouse"><ref bean="wife"/></property>
</bean>
</beans>

10
spring-context/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml
View File

@@ -13,7 +13,7 @@
</bean>
<bean id="poolConfigAdvisor" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
<property name="targetObject"><ref local="poolTargetSource" /></property>
<property name="targetObject"><ref bean="poolTargetSource" /></property>
<property name="targetMethod"><value>getPoolingConfigMixin</value></property>
</bean>
@@ -23,16 +23,16 @@
This will create a bean for each thread ("apartment")
-->
<bean id="pooled" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="targetSource"><ref local="poolTargetSource"/></property>
<property name="targetSource"><ref bean="poolTargetSource"/></property>
<property name="interceptorNames"><value>nop</value></property>
</bean>
<bean id="pooledNoInterceptors" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="targetSource"><ref local="poolTargetSource"/></property>
<property name="targetSource"><ref bean="poolTargetSource"/></property>
</bean>
<bean id="pooledWithMixin" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="targetSource"><ref local="poolTargetSource"/></property>
<property name="targetSource"><ref bean="poolTargetSource"/></property>
<property name="interceptorNames"><value>poolConfigAdvisor</value></property>
<!-- Necessary as have a mixin and want to avoid losing the class,
because there's no target interface -->
@@ -50,7 +50,7 @@
</bean>
<bean id="pooledPerson" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="targetSource"><ref local="personPoolTargetSource"/></property>
<property name="targetSource"><ref bean="personPoolTargetSource"/></property>
<property name="interceptorNames"><value>serializableNop</value></property>
</bean>

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml
View File

@@ -17,7 +17,7 @@
</bean>
<bean id="regularlyProxiedOverload" lazy-init="true" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="target"><ref local="regularlyProxiedOverloadTarget"/></property>
<property name="target"><ref bean="regularlyProxiedOverloadTarget"/></property>
<property name="proxyTargetClass"><value>true</value></property>
<property name="interceptorNames"><value>interceptor</value></property>
</bean>

21
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml
View File

@@ -3,38 +3,31 @@
<beans>
<bean id="rod1" class="org.springframework.tests.sample.beans.DependenciesBean"
autowire="byType" dependency-check="objects">
<bean id="rod1" class="org.springframework.tests.sample.beans.DependenciesBean" autowire="byType">
<!-- Should pick up spouse automatically -->
</bean>
<bean id="rod1a" class="org.springframework.tests.sample.beans.DependenciesBean"
autowire="autodetect" dependency-check="objects">
<bean id="rod1a" class="org.springframework.tests.sample.beans.DependenciesBean" autowire="autodetect">
<!-- Should pick up spouse automatically -->
</bean>
<bean id="rod2" class="org.springframework.tests.sample.beans.DependenciesBean"
autowire="byName" dependency-check="objects">
<bean id="rod2" class="org.springframework.tests.sample.beans.DependenciesBean" autowire="byName">
<!-- Should pick up spouse automatically -->
</bean>
<bean id="rod2a" class="org.springframework.tests.sample.beans.DependenciesBean"
autowire="byName" dependency-check="objects">
<bean id="rod2a" class="org.springframework.tests.sample.beans.DependenciesBean" autowire="byName">
<property name="spouse" ref="spouse"/>
</bean>
<bean id="rod3" class="org.springframework.beans.factory.xml.ConstructorDependenciesBean"
autowire="constructor" dependency-check="objects">
<bean id="rod3" class="org.springframework.beans.factory.xml.ConstructorDependenciesBean" autowire="constructor">
<!-- Should pick up spouse automatically -->
</bean>
<bean id="rod3a" class="org.springframework.beans.factory.xml.ConstructorDependenciesBean"
autowire="autodetect" dependency-check="objects">
<bean id="rod3a" class="org.springframework.beans.factory.xml.ConstructorDependenciesBean" autowire="autodetect">
<!-- Should pick up spouse automatically -->
</bean>
<bean id="rod4" class="org.springframework.beans.factory.xml.ConstructorDependenciesBean"
scope="prototype" dependency-check="objects">
<bean id="rod4" class="org.springframework.beans.factory.xml.ConstructorDependenciesBean" scope="prototype">
<!-- Should not pick up spouse automatically -->
</bean>

40
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml
View File

@@ -8,7 +8,7 @@
<property name="age"><value>30</value></property>
<property name="spouse">
<!-- Could use id and href -->
<ref local="david"/>
<ref bean="david"/>
</property>
</bean>
@@ -29,8 +29,8 @@
<property name="friends">
<description>List of Rod's friends</description>
<list>
<ref local="jenny"/>
<ref local="david"/>
<ref bean="jenny"/>
<ref bean="david"/>
</list>
</property>
</bean>
@@ -40,7 +40,7 @@
<property name="age"><value>30</value></property>
<property name="spouse">
<!-- Could use id and href -->
<ref local="david"/>
<ref bean="david"/>
</property>
</bean>
@@ -54,8 +54,8 @@
<property name="age"><value>32</value></property>
<property name="friends">
<list>
<ref local="pJenny"/>
<ref local="pDavid"/>
<ref bean="pJenny"/>
<ref bean="pDavid"/>
</list>
</property>
</bean>
@@ -69,7 +69,7 @@
<property name="friends">
<list>
<description>My List</description>
<ref local="david"/>
<ref bean="david"/>
</list>
</property>
</bean>
@@ -77,10 +77,10 @@
<bean id="jumble" class="org.springframework.beans.factory.xml.MixedCollectionBean">
<property name="jumble">
<list>
<ref local="david"/>
<ref bean="david"/>
<value>literal</value>
<ref local="jenny"/>
<idref local="rod"/>
<ref bean="jenny"/>
<idref bean="rod"/>
</list>
</property>
</bean>
@@ -88,9 +88,9 @@
<bean id="jumble2" class="org.springframework.beans.factory.xml.MixedCollectionBean" lazy-init="true">
<property name="jumble">
<list>
<ref local="david"/>
<ref bean="david"/>
<value>literal</value>
<ref local="jenny"/>
<ref bean="jenny"/>
<idref bean="rod"/>
<idref bean="rod2"/>
</list>
@@ -102,7 +102,7 @@
</bean>
<bean id="verbose2" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><idref local="verbose"/></property>
<property name="name"><idref bean="verbose"/></property>
</bean>
<bean id="verbose3" class="org.springframework.tests.sample.beans.TestBean">
@@ -136,7 +136,7 @@
<key>
<ref bean="jennyKey"/>
</key>
<ref local="jenny"/>
<ref bean="jenny"/>
</entry>
<entry>
<key>
@@ -174,16 +174,16 @@
<key><null/></key>
<value>bar</value>
</entry>
<entry key="jenny"><ref local="jenny"/></entry>
<entry key="jenny"><ref bean="jenny"/></entry>
<entry key="list">
<list>
<value>zero</value>
<map>
<entry key="fo"><value>bar</value></entry>
<entry key="jen"><ref local="jenny"/></entry>
<entry key="jen"><ref bean="jenny"/></entry>
</map>
<list>
<ref local="jenny"/>
<ref bean="jenny"/>
<value>ba</value>
</list>
<null/>
@@ -192,7 +192,7 @@
<entry key="map">
<map>
<entry key="foo"><value>bar</value></entry>
<entry key="jenny"><ref local="jenny"/></entry>
<entry key="jenny"><ref bean="jenny"/></entry>
</map>
</entry>
</map>
@@ -211,7 +211,7 @@
<property name="set">
<set>
<value>bar</value>
<ref local="jenny"/>
<ref bean="jenny"/>
<null/>
</set>
</property>
@@ -247,7 +247,7 @@
<property name="objectArray">
<list>
<value>one</value>
<ref local="jenny"/>
<ref bean="jenny"/>
</list>
</property>
</bean>

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml
View File

@@ -23,7 +23,7 @@
<bean class="org.springframework.tests.sample.beans.TestBean">
<property name="someSet">
<set>
<ref local="proxy1"/>
<ref bean="proxy1"/>
</set>
</property>
</bean>

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml
View File

@@ -81,7 +81,7 @@
</bean>
<bean id="rod11" class="org.springframework.beans.factory.xml.ConstructorDependenciesBean" scope="prototype">
<constructor-arg index="0"><ref local="kerry2"/></constructor-arg>
<constructor-arg index="0"><ref bean="kerry2"/></constructor-arg>
</bean>
<bean id="rod12" class="org.springframework.beans.factory.xml.ConstructorDependenciesBean">

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml
View File

@@ -28,7 +28,7 @@
class="org.springframework.beans.factory.xml.FactoryMethods"
factory-method="newInstance"
scope="prototype">
<constructor-arg index="0"><ref local="jenny"/></constructor-arg>
<constructor-arg index="0"><ref bean="jenny"/></constructor-arg>
</bean>
</beans>

4
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans default-autowire="byType" default-dependency-check="objects">
<beans default-autowire="byType">
<bean id="rod1" class="org.springframework.tests.sample.beans.DependenciesBean">
<!-- Should pick up spouse automatically -->
@@ -15,7 +15,7 @@
<!-- Should not pick up spouse automatically -->
</bean>
<bean id="spouse" class="org.springframework.tests.sample.beans.TestBean" autowire="no" dependency-check="none">
<bean id="spouse" class="org.springframework.tests.sample.beans.TestBean" autowire="no">
<property name="name">
<value>Kerry</value>
</property>

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml
View File

@@ -64,7 +64,7 @@
<property name="age"><value>30</value></property>
<property name="spouse">
<!-- Could use id and href -->
<ref local="david"/>
<ref bean="david"/>
</property>
</bean>

4
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml
View File

@@ -4,8 +4,8 @@
<beans>
<bean id="dependingBean" class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$DependingBean">
<constructor-arg index="0"><ref local="preparingBean1"/></constructor-arg>
<constructor-arg index="1"><ref local="preparingBean2"/></constructor-arg>
<constructor-arg index="0"><ref bean="preparingBean1"/></constructor-arg>
<constructor-arg index="1"><ref bean="preparingBean2"/></constructor-arg>
</bean>
<bean id="preparingBean1" class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$PreparingBean1"/>

4
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml
View File

@@ -6,8 +6,8 @@
<bean id="holdingBean" class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$HoldingBean">
<property name="dependingBean">
<bean class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$DependingBean">
<constructor-arg index="0"><ref local="preparingBean1"/></constructor-arg>
<constructor-arg index="1"><ref local="preparingBean2"/></constructor-arg>
<constructor-arg index="0"><ref bean="preparingBean1"/></constructor-arg>
<constructor-arg index="1"><ref bean="preparingBean2"/></constructor-arg>
</bean>
</property>
</bean>

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml
View File

@@ -13,7 +13,7 @@
</bean>
<bean id="prototypeBenchmark" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="target"><ref local="prototypeTargetSource"/></property>
<property name="target"><ref bean="prototypeTargetSource"/></property>
<property name="proxyInterfaces"><value>org.springframework.beans.factory.xml.DummyBo</value></property>
</bean>

4
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml
View File

@@ -4,8 +4,8 @@
<beans>
<bean id="dependingBean" class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$DependingBean">
<property name="bean1"><ref local="preparingBean1"/></property>
<property name="bean2"><ref local="preparingBean2"/></property>
<property name="bean1"><ref bean="preparingBean1"/></property>
<property name="bean2"><ref bean="preparingBean2"/></property>
</bean>
<bean id="preparingBean1" class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$PreparingBean1"/>

6
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml
View File

@@ -4,12 +4,12 @@
<beans>
<bean id="dependingBean" class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$DependingBean">
<property name="inTheMiddleBean"><ref local="inTheMiddleBean"/></property>
<property name="inTheMiddleBean"><ref bean="inTheMiddleBean"/></property>
</bean>
<bean id="inTheMiddleBean" class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$InTheMiddleBean">
<property name="bean1"><ref local="preparingBean1"/></property>
<property name="bean2"><ref local="preparingBean2"/></property>
<property name="bean1"><ref bean="preparingBean1"/></property>
<property name="bean2"><ref bean="preparingBean2"/></property>
</bean>
<bean id="preparingBean1" class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$PreparingBean1"/>

4
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml
View File

@@ -6,8 +6,8 @@
<bean id="holdingBean" class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$HoldingBean">
<property name="dependingBean">
<bean id="dependingBean" class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$DependingBean">
<property name="bean1"><ref local="preparingBean1"/></property>
<property name="bean2"><ref local="preparingBean2"/></property>
<property name="bean1"><ref bean="preparingBean1"/></property>
<property name="bean2"><ref bean="preparingBean2"/></property>
</bean>
</property>
</bean>

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml
View File

@@ -4,7 +4,7 @@
<beans>
<bean id="singletonFactory" class="org.springframework.tests.sample.beans.factory.DummyFactory">
<property name="otherTestBean"><ref local="singletonFactory"/></property>
<property name="otherTestBean"><ref bean="singletonFactory"/></property>
</bean>
</beans>

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml
View File

@@ -9,7 +9,7 @@
<property name="age"><value>30</value></property>
<property name="spouse">
<!-- Could use id and href -->
<ref local="david"/>
<ref bean="david"/>
</property>
</bean>

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml
View File

@@ -18,7 +18,7 @@
<bean id="factoryMethods" class="org.springframework.beans.factory.xml.FactoryMethods"
factory-method="newInstance" scope="prototype">
<constructor-arg index="0"><ref local="jenny"/></constructor-arg>
<constructor-arg index="0"><ref bean="jenny"/></constructor-arg>
</bean>
</beans>

10
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml
View File

@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
<!-- just ensures that one can use <ref local=""/> to refer to the various <util:collections/> types -->
<!-- just ensures that one can use <ref bean=""/> to refer to the various <util:collections/> types -->
<util:map id="map"/>
<util:list id="list"/>
@@ -16,20 +16,20 @@
<property name="someMap">
<map>
<entry key="map">
<ref local="map"/>
<ref bean="map"/>
</entry>
</map>
</property>
<property name="someList">
<list>
<ref local="list"/>
<ref bean="list"/>
</list>
</property>
<property name="someProperties">
<ref local="properties"/>
<ref bean="properties"/>
</property>
<property name="someSet">
<ref local="set"/>
<ref bean="set"/>
</property>
</bean>

4
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml
View File

@@ -39,7 +39,7 @@
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
<property name="spouse">
<ref local="david"/>
<ref bean="david"/>
</property>
<property name="friends">
<bean class="org.springframework.tests.sample.beans.TestBean"/>
@@ -56,7 +56,7 @@
<bean id="jennyChild" class="org.springframework.tests.sample.beans.TestBean" parent="jennyParent" scope="prototype">
<property name="spouse">
<ref local="david"/>
<ref bean="david"/>
</property>
</bean>

6
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml
View File

@@ -5,7 +5,7 @@
<bean id="jenny" name="jenny" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
<property name="spouse"><ref local="david"/></property>
<property name="spouse"><ref bean="david"/></property>
</bean>
<bean id="david" class="org.springframework.tests.sample.beans.TestBean">
@@ -17,7 +17,7 @@
<bean id="jenks" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
<property name="name"><value>Andrew</value></property>
<property name="age"><value>36</value></property>
<property name="spouse"><ref local="jenny"/></property>
<property name="spouse"><ref bean="jenny"/></property>
</bean>
<bean id="emma" class="org.springframework.tests.sample.beans.TestBean">
@@ -29,7 +29,7 @@
<bean id="georgia" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>Georgia</value></property>
<property name="age"><value>33</value></property>
<property name="spouse"><ref local="jenks"/></property>
<property name="spouse"><ref bean="jenks"/></property>
</bean>
<bean id="ego" class="org.springframework.tests.sample.beans.TestBean">

17
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml
View File

@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<bean id="a" class="org.springframework.tests.sample.beans.DependenciesBean"
dependency-check="objects">
<property name="spouse"><ref local="kerry"/></property>
<property name="age"><value>33</value></property>
<property name="name"><value>Rod</value></property>
</bean>
<bean id="kerry" class="org.springframework.tests.sample.beans.TestBean"
dependency-check="none">
</bean>
</beans>

13
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<bean id="a" class="org.springframework.tests.sample.beans.DependenciesBean" dependency-check="objects">
<property name="spouse"><ref local="kerry"/></property>
</bean>
<bean id="kerry" class="org.springframework.tests.sample.beans.TestBean" dependency-check="none">
</bean>
</beans>

13
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<bean id="a" class="org.springframework.tests.sample.beans.DependenciesBean"
dependency-check="simple">
<property name="age"><value>33</value></property>
<property name="name"><value>Rod</value></property>
</bean>
</beans>

14
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml
View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<bean id="a" class="org.springframework.tests.sample.beans.DependenciesBean"
dependency-check="all">
<property name="age"><value>33</value></property>
<property name="name"><value>Rod</value></property>
</bean>
</beans>

16
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml
View File

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<bean id="a" class="org.springframework.tests.sample.beans.DependenciesBean"
dependency-check="simple">
<property name ="name"><value>tony</value></property>
<property name="spouse"><ref local="kerry"></property> -->
</bean>
<bean id="kerry" class="org.springframework.tests.sample.beans.TestBean"
dependency-check="none">
</bean>
</beans>

11
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<bean id="a" class="org.springframework.tests.sample.beans.DependenciesBean"
dependency-check="objects">
<!-- <property name="name"><value>Rod</value></property> -->
</bean>
</beans>

11
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<bean id="a" class="org.springframework.tests.sample.beans.DependenciesBean"
dependency-check="simple">
<!-- <property name="name"><value>Rod</value></property> -->
</bean>
</beans>

40
spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml
View File

@@ -8,7 +8,7 @@
<property name="age"><value>30</value></property>
<property name="spouse">
<!-- Could use id and href -->
<ref local="david"/>
<ref bean="david"/>
</property>
</bean>
@@ -29,8 +29,8 @@
<property name="friends">
<description>List of Rod's friends</description>
<list>
<ref local="jenny"/>
<ref local="david"/>
<ref bean="jenny"/>
<ref bean="david"/>
</list>
</property>
</bean>
@@ -40,7 +40,7 @@
<property name="age"><value>30</value></property>
<property name="spouse">
<!-- Could use id and href -->
<ref local="david"/>
<ref bean="david"/>
</property>
</bean>
@@ -54,8 +54,8 @@
<property name="age"><value>32</value></property>
<property name="friends">
<list>
<ref local="pJenny"/>
<ref local="pDavid"/>
<ref bean="pJenny"/>
<ref bean="pDavid"/>
</list>
</property>
</bean>
@@ -69,7 +69,7 @@
<property name="friends">
<list>
<description>My List</description>
<ref local="david"/>
<ref bean="david"/>
</list>
</property>
</bean>
@@ -77,10 +77,10 @@
<bean id="jumble" class="org.springframework.context.access.MixedCollectionBean">
<property name="jumble">
<list>
<ref local="david"/>
<ref bean="david"/>
<value>literal</value>
<ref local="jenny"/>
<idref local="rod"/>
<ref bean="jenny"/>
<idref bean="rod"/>
</list>
</property>
</bean>
@@ -88,9 +88,9 @@
<bean id="jumble2" class="org.springframework.context.access.MixedCollectionBean" lazy-init="true">
<property name="jumble">
<list>
<ref local="david"/>
<ref bean="david"/>
<value>literal</value>
<ref local="jenny"/>
<ref bean="jenny"/>
<idref bean="rod"/>
<idref bean="rod2"/>
</list>
@@ -102,7 +102,7 @@
</bean>
<bean id="verbose2" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><idref local="verbose"/></property>
<property name="name"><idref bean="verbose"/></property>
</bean>
<bean id="verbose3" class="org.springframework.tests.sample.beans.TestBean">
@@ -136,7 +136,7 @@
<key>
<ref bean="jennyKey"/>
</key>
<ref local="jenny"/>
<ref bean="jenny"/>
</entry>
<entry>
<key>
@@ -174,16 +174,16 @@
<key><null/></key>
<value>bar</value>
</entry>
<entry key="jenny"><ref local="jenny"/></entry>
<entry key="jenny"><ref bean="jenny"/></entry>
<entry key="list">
<list>
<value>zero</value>
<map>
<entry key="fo"><value>bar</value></entry>
<entry key="jen"><ref local="jenny"/></entry>
<entry key="jen"><ref bean="jenny"/></entry>
</map>
<list>
<ref local="jenny"/>
<ref bean="jenny"/>
<value>ba</value>
</list>
<null/>
@@ -192,7 +192,7 @@
<entry key="map">
<map>
<entry key="foo"><value>bar</value></entry>
<entry key="jenny"><ref local="jenny"/></entry>
<entry key="jenny"><ref bean="jenny"/></entry>
</map>
</entry>
</map>
@@ -211,7 +211,7 @@
<property name="set">
<set>
<value>bar</value>
<ref local="jenny"/>
<ref bean="jenny"/>
<null/>
</set>
</property>
@@ -247,7 +247,7 @@
<property name="objectArray">
<list>
<value>one</value>
<ref local="jenny"/>
<ref bean="jenny"/>
</list>
</property>
</bean>

29
spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml
View File

@@ -1,29 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
default-dependency-check="all">
<context:component-scan base-package="org.springframework.context.annotation"
use-default-filters="false"
annotation-config="false">
<context:include-filter type="assignable"
expression="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$DefaultsTestBean"/>
</context:component-scan>
<bean class="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$ConstructorDependencyTestBean">
<constructor-arg value="cd"/>
</bean>
<bean class="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$PropertyDependencyTestBean">
<constructor-arg value="pd1"/>
</bean>
<bean id="propertyDependency2"
class="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$PropertyDependencyTestBean">
<constructor-arg value="pd2"/>
</bean>
</beans>

27
spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml
View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
default-dependency-check="objects"
default-autowire="byName">
<context:component-scan base-package="org.springframework.context.annotation"
use-default-filters="false"
annotation-config="false">
<context:include-filter type="assignable"
expression="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$DefaultsTestBean"/>
</context:component-scan>
<bean id="propertyDependency1"
class="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$PropertyDependencyTestBean">
<constructor-arg value="pd1"/>
</bean>
<bean id="propertyDependency2"
class="org.springframework.context.annotation.ComponentScanParserBeanDefinitionDefaultsTests$PropertyDependencyTestBean">
<constructor-arg value="pd2"/>
</bean>
</beans>

2
spring-context/src/test/resources/org/springframework/context/support/test/contextA.xml
View File

@@ -15,7 +15,7 @@
<bean class="org.springframework.context.support.FactoryBeanAndApplicationListener"/>
<bean name="service" class="org.springframework.context.support.Service" dependency-check="objects">
<bean name="service" class="org.springframework.context.support.Service">
<property name="resources" value="/org/springframework/context/support/test/context*.xml"/>
</bean>

2
spring-context/src/test/resources/org/springframework/jmx/applicationContext.xml
View File

@@ -7,7 +7,7 @@
<property name="beans">
<map>
<entry key="bean:name=testBean1">
<ref local="testBean"/>
<ref bean="testBean"/>
</entry>
</map>
</property>

6
spring-context/src/test/resources/org/springframework/jmx/export/annotation/annotations.xml
View File

@@ -7,15 +7,15 @@
<property name="beans">
<map>
<entry key="namingTest">
<ref local="testBean"/>
<ref bean="testBean"/>
</entry>
</map>
</property>
<property name="assembler">
<ref local="metadataAssembler"/>
<ref bean="metadataAssembler"/>
</property>
<property name="namingStrategy">
<ref local="metadataNamingStrategy"/>
<ref bean="metadataNamingStrategy"/>
</property>
</bean>

2
spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssembler.xml
View File

@@ -7,7 +7,7 @@
<property name="beans">
<map>
<entry key="bean:name=testBean4">
<ref local="testBean"/>
<ref bean="testBean"/>
</entry>
</map>
</property>

2
spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml
View File

@@ -7,7 +7,7 @@
<property name="beans">
<map>
<entry key="bean:name=testBean5">
<ref local="testBean"/>
<ref bean="testBean"/>
</entry>
</map>
</property>

2
spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml
View File

@@ -7,7 +7,7 @@
<property name="beans">
<map>
<entry key="bean:name=testBean4">
<ref local="testBean"/>
<ref bean="testBean"/>
</entry>
</map>
</property>

8
spring-context/src/test/resources/org/springframework/jmx/export/assembler/metadata-autodetect.xml
View File

@@ -5,10 +5,10 @@
<bean id="jmxAdapter" class="org.springframework.jmx.export.MBeanExporter">
<property name="assembler">
<ref local="metadataAssembler"/>
<ref bean="metadataAssembler"/>
</property>
<property name="namingStrategy">
<ref local="namingStrategy"/>
<ref bean="namingStrategy"/>
</property>
</bean>
@@ -23,13 +23,13 @@
<bean id="metadataAssembler" class="org.springframework.jmx.export.assembler.MetadataMBeanInfoAssembler">
<property name="attributeSource">
<ref local="attributeSource"/>
<ref bean="attributeSource"/>
</property>
</bean>
<bean id="namingStrategy" class="org.springframework.jmx.export.naming.MetadataNamingStrategy">
<property name="attributeSource">
<ref local="attributeSource"/>
<ref bean="attributeSource"/>
</property>
</bean>

4
spring-context/src/test/resources/org/springframework/jmx/export/assembler/metadataAssembler.xml
View File

@@ -7,12 +7,12 @@
<property name="beans">
<map>
<entry key="bean:name=testBean3">
<ref local="testBean"/>
<ref bean="testBean"/>
</entry>
</map>
</property>
<property name="assembler">
<ref local="metadataAssembler"/>
<ref bean="metadataAssembler"/>
</property>
</bean>

2
spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodNameAssembler.xml
View File

@@ -7,7 +7,7 @@
<property name="beans">
<map>
<entry key="bean:name=testBean5">
<ref local="testBean"/>
<ref bean="testBean"/>
</entry>
</map>
</property>

2
spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml
View File

@@ -7,7 +7,7 @@
<property name="beans">
<map>
<entry key="bean:name=testBean4">
<ref local="testBean"/>
<ref bean="testBean"/>
</entry>
</map>
</property>

2
spring-context/src/test/resources/org/springframework/jmx/export/assembler/reflectiveAssembler.xml
View File

@@ -5,7 +5,7 @@
<property name="beans">
<map>
<entry key="bean:name=testBean1">
<ref local="testBean"/>
<ref bean="testBean"/>
</entry>
</map>
</property>

4
spring-context/src/test/resources/org/springframework/jmx/export/excludedBeans.xml
View File

@@ -7,7 +7,7 @@
<bean id="exporter" class="org.springframework.jmx.export.MBeanExporter">
<property name="server">
<ref local="server"/>
<ref bean="server"/>
</property>
<property name="autodetect">
<value>true</value>
@@ -20,7 +20,7 @@
<bean id="connector" class="org.springframework.jmx.support.ConnectorServerFactoryBean">
<property name="server">
<ref local="server"/>
<ref bean="server"/>
</property>
</bean>

2
spring-context/src/test/resources/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml
View File

@@ -27,7 +27,7 @@
<property name="beans">
<map>
<entry key="bean:name=proxyTestBean1">
<ref local="testBean"/>
<ref bean="testBean"/>
</entry>
</map>
</property>

2
spring-context/src/test/resources/org/springframework/scripting/bsh/bsh-with-xsd.xml
View File

@@ -29,7 +29,7 @@
</lang:bsh>
<lang:bsh id="messengerByType" script-source="classpath:org/springframework/scripting/bsh/MessengerImpl.bsh"
autowire="byType" dependency-check="objects" init-method="init" destroy-method="destroy">
autowire="byType" init-method="init" destroy-method="destroy">
</lang:bsh>
<lang:bsh id="messengerByName" script-source="classpath:org/springframework/scripting/bsh/MessengerImpl.bsh"

4
spring-context/src/test/resources/org/springframework/scripting/groovy/groovy-multiple-properties.xml
View File

@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd">
<lang:groovy id="bean" script-source="classpath:org/springframework/scripting/groovy/ScriptBean.groovy" autowire="byType" dependency-check="all">
<lang:groovy id="bean" script-source="classpath:org/springframework/scripting/groovy/ScriptBean.groovy" autowire="byType">
<lang:property name="name" value="Sophie Marceau"/>
<lang:property name="age" value="31"/>
</lang:groovy>
@@ -14,7 +14,7 @@
<lang:property name="age" value="31"/>
</lang:groovy>
<lang:groovy id="bean3" script-source="classpath:org/springframework/scripting/groovy/ScriptBean.groovy" dependency-check="objects" scope="prototype">
<lang:groovy id="bean3" script-source="classpath:org/springframework/scripting/groovy/ScriptBean.groovy" scope="prototype">
<lang:property name="name" value="Sophie Marceau"/>
<lang:property name="age" value="31"/>
</lang:groovy>