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

8
spring-aop/src/test/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
View File

@@ -12,7 +12,7 @@
<bean id="nopInterceptor" class="org.springframework.tests.aop.interceptor.SerializableNopInterceptor"/>
<bean id="settersAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
<property name="advice"><ref local="nopInterceptor"/></property>
<property name="advice"><ref bean="nopInterceptor"/></property>
<property name="pattern">
<value>
.*set.*
@@ -22,7 +22,7 @@
<bean id="settersAdvised" 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>
<property name="interceptorNames"><value>settersAdvisor</value></property>
</bean>
@@ -38,7 +38,7 @@
<!-- Illustrates use of multiple patterns -->
<bean id="settersAndAbsquatulateAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
<property name="advice"><ref local="nopInterceptor"/></property>
<property name="advice"><ref bean="nopInterceptor"/></property>
<property name="patterns">
<list>
<value>.*get.*</value>
@@ -51,7 +51,7 @@
<property name="proxyInterfaces"><value>org.springframework.tests.sample.beans.ITestBean</value></property>
<!-- Force CGLIB so we can cast to TestBean -->
<property name="proxyTargetClass"><value>true</value></property>
<property name="target"><ref local="test"/></property>
<property name="target"><ref bean="test"/></property>
<property name="interceptorNames"><value>settersAndAbsquatulateAdvisor</value></property>
</bean>

4
spring-aop/src/test/resources/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml
View File

@@ -16,11 +16,11 @@
Hot swappable target source. Note the use of Type 3 IoC.
-->
<bean id="swapper" class="org.springframework.aop.target.HotSwappableTargetSource">
<constructor-arg><ref local="target1"/></constructor-arg>
<constructor-arg><ref bean="target1"/></constructor-arg>
</bean>
<bean id="swappable" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="targetSource"><ref local="swapper"/></property>
<property name="targetSource"><ref bean="swapper"/></property>
</bean>
</beans>

2
spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml
View File

@@ -13,7 +13,7 @@
<bean id="proxy" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="targetSource">
<bean class="org.springframework.aop.target.LazyInitTargetSourceTests$CustomLazyInitTargetSource">
<property name="targetBeanName"><idref local="target"/></property>
<property name="targetBeanName"><idref bean="target"/></property>
</bean>
</property>
</bean>

2
spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml
View File

@@ -13,7 +13,7 @@
<bean id="proxy" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="targetSource">
<bean class="org.springframework.aop.target.LazyInitTargetSource">
<property name="targetBeanName"><idref local="target"/></property>
<property name="targetBeanName"><idref bean="target"/></property>
</bean>
</property>
</bean>

2
spring-aop/src/test/resources/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
View File

@@ -26,7 +26,7 @@
This will create a bean that creates a new target on each invocation.
-->
<bean id="prototype" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="targetSource"><ref local="prototypeTargetSource"/></property>
<property name="targetSource"><ref bean="prototypeTargetSource"/></property>
<property name="interceptorNames"><value>debugInterceptor</value></property>
</bean>

8
spring-aop/src/test/resources/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml
View File

@@ -17,7 +17,7 @@
We want to invoke the getStatsMixin method on our ThreadLocal invoker
-->
<bean id="statsAdvisor" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
<property name="targetObject"><ref local="threadLocalTs" /></property>
<property name="targetObject"><ref bean="threadLocalTs" /></property>
<property name="targetMethod"><value>getStatsMixin</value></property>
</bean>
@@ -26,7 +26,7 @@
-->
<bean id="apartment" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="interceptorNames"><value>debugInterceptor,statsAdvisor</value></property>
<property name="targetSource"><ref local="threadLocalTs"/></property>
<property name="targetSource"><ref bean="threadLocalTs"/></property>
<!-- Necessary as have a mixin and want to avoid losing the class,
because there's no target interface -->
<property name="proxyTargetClass"><value>true</value></property>
@@ -36,7 +36,7 @@
<bean id="test" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
<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">
@@ -48,7 +48,7 @@
</bean>
<bean id="threadLocal2" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="targetSource"><ref local="threadLocalTs2"/></property>
<property name="targetSource"><ref bean="threadLocalTs2"/></property>
</bean>
</beans>