Harmonize resources location
Issue: SPR-12766
This commit is contained in:
@@ -1,19 +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"
|
||||
xmlns:tx="http://www.springframework.org/schema/tx"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
|
||||
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
|
||||
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd">
|
||||
|
||||
<tx:annotation-driven order="#{ T(java.lang.Integer).MAX_VALUE }"/>
|
||||
|
||||
<bean id="transactionManager" class="org.springframework.tests.transaction.CallCountingTransactionManager"/>
|
||||
|
||||
<bean id="testBean"
|
||||
class="org.springframework.transaction.annotation.AnnotationTransactionNamespaceHandlerTests$TransactionalTestBean"/>
|
||||
|
||||
<context:mbean-export/>
|
||||
|
||||
</beans>
|
||||
@@ -1,23 +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:aop="http://www.springframework.org/schema/aop"
|
||||
xmlns:context="http://www.springframework.org/schema/context"
|
||||
xmlns:tx="http://www.springframework.org/schema/tx"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
|
||||
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
|
||||
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
|
||||
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
|
||||
|
||||
<context:annotation-config/>
|
||||
|
||||
<tx:annotation-driven proxy-target-class="true" order="0"/>
|
||||
|
||||
<aop:config>
|
||||
<aop:advisor advice-ref="txCheckingInterceptor" pointcut="execution(* *..TransactionalService.*(..))" order="1"/>
|
||||
</aop:config>
|
||||
|
||||
<bean id="txCheckingInterceptor" class="org.springframework.transaction.config.AnnotationDrivenTests$TransactionCheckingInterceptor"/>
|
||||
|
||||
<bean id="service" class="org.springframework.transaction.config.TransactionalService"/>
|
||||
|
||||
</beans>
|
||||
@@ -1,26 +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:aop="http://www.springframework.org/schema/aop"
|
||||
xmlns:tx="http://www.springframework.org/schema/tx"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
|
||||
|
||||
<tx:annotation-driven proxy-target-class="true" order="0"/>
|
||||
|
||||
<aop:config>
|
||||
<aop:advisor advice-ref="txCheckingInterceptor" pointcut="execution(* *..TransactionalService.*(..))" order="1"/>
|
||||
</aop:config>
|
||||
|
||||
<bean id="txCheckingInterceptor" class="org.springframework.transaction.config.AnnotationDrivenTests$TransactionCheckingInterceptor"/>
|
||||
|
||||
<bean id="transactionManager1" class="org.springframework.tests.transaction.CallCountingTransactionManager">
|
||||
<qualifier value="synch"/>
|
||||
</bean>
|
||||
|
||||
<bean id="transactionManager2" class="org.springframework.tests.transaction.CallCountingTransactionManager">
|
||||
<property name="transactionSynchronizationName" value="SYNCHRONIZATION_NEVER"/>
|
||||
<qualifier value="noSynch"/>
|
||||
</bean>
|
||||
|
||||
<bean id="service" class="org.springframework.transaction.config.TransactionalService"/>
|
||||
|
||||
</beans>
|
||||
@@ -1,22 +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>
|
||||
|
||||
<!-- Simple target -->
|
||||
<bean id="target" class="org.springframework.tests.sample.beans.DerivedTestBean">
|
||||
<property name="name"><value>custom</value></property>
|
||||
<property name="age"><value>666</value></property>
|
||||
</bean>
|
||||
|
||||
<bean id="mockMan" class="org.springframework.transaction.interceptor.PlatformTransactionManagerFacade"/>
|
||||
|
||||
<!--
|
||||
Invalid: we need a transaction attribute source
|
||||
-->
|
||||
<bean id="noTransactionAttributeSource" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
|
||||
<property name="transactionManager"><ref local="mockMan"/></property>
|
||||
<property name="target"><ref local="target"/></property>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
@@ -1,137 +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="targetDependency" class="org.springframework.tests.sample.beans.TestBean">
|
||||
<property name="name"><value>dependency</value></property>
|
||||
</bean>
|
||||
|
||||
<!-- Simple target -->
|
||||
<bean id="target" class="org.springframework.tests.sample.beans.DerivedTestBean" lazy-init="true">
|
||||
<property name="name"><value>custom</value></property>
|
||||
<property name="age"><value>666</value></property>
|
||||
<property name="spouse"><ref local="targetDependency"/></property>
|
||||
</bean>
|
||||
|
||||
<bean id="debugInterceptor" class="org.springframework.aop.interceptor.DebugInterceptor"/>
|
||||
|
||||
<bean id="mockMan" class="org.springframework.transaction.interceptor.PlatformTransactionManagerFacade"/>
|
||||
|
||||
<bean id="txInterceptor" class="org.springframework.transaction.interceptor.TransactionInterceptor">
|
||||
<property name="transactionManager"><ref local="mockMan"/></property>
|
||||
<property name="transactionAttributeSource">
|
||||
<value>
|
||||
org.springframework.tests.sample.beans.ITestBean.s*=PROPAGATION_MANDATORY
|
||||
org.springframework.tests.sample.beans.ITestBean.setAg*=PROPAGATION_REQUIRED
|
||||
org.springframework.tests.sample.beans.ITestBean.set*= PROPAGATION_SUPPORTS , readOnly
|
||||
</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="proxyFactory1" class="org.springframework.aop.framework.ProxyFactoryBean">
|
||||
<property name="proxyInterfaces">
|
||||
<value>org.springframework.tests.sample.beans.ITestBean</value>
|
||||
</property>
|
||||
<property name="interceptorNames">
|
||||
<list>
|
||||
<value>txInterceptor</value>
|
||||
<value>target</value>
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="baseProxyFactory" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
|
||||
abstract="true">
|
||||
<property name="transactionManager"><ref local="mockMan"/></property>
|
||||
<property name="transactionAttributes">
|
||||
<props>
|
||||
<prop key="s*">PROPAGATION_MANDATORY</prop>
|
||||
<prop key="setAg*"> PROPAGATION_REQUIRED , readOnly </prop>
|
||||
<prop key="set*">PROPAGATION_SUPPORTS</prop>
|
||||
</props>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="proxyFactory2DynamicProxy" parent="baseProxyFactory">
|
||||
<property name="target"><ref local="target"/></property>
|
||||
</bean>
|
||||
|
||||
<!--
|
||||
Same as proxyFactory2DynamicProxy but forces the use of CGLIB.
|
||||
-->
|
||||
<bean id="proxyFactory2Cglib" parent="baseProxyFactory">
|
||||
<property name="proxyTargetClass"><value>true</value></property>
|
||||
<property name="target"><ref local="target"/></property>
|
||||
</bean>
|
||||
|
||||
<bean id="proxyFactory2Lazy" parent="baseProxyFactory">
|
||||
<property name="target">
|
||||
<bean class="org.springframework.aop.target.LazyInitTargetSource">
|
||||
<property name="targetBeanName"><idref local="target"/></property>
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="proxyFactory3" parent="baseProxyFactory">
|
||||
<property name="target"><ref local="target"/></property>
|
||||
<property name="proxyTargetClass"><value>true</value></property>
|
||||
<property name="pointcut">
|
||||
<ref local="txnInvocationCounterPointcut"/>
|
||||
</property>
|
||||
<property name="preInterceptors">
|
||||
<list>
|
||||
<ref local="preInvocationCounterInterceptor"/>
|
||||
</list>
|
||||
</property>
|
||||
<property name="postInterceptors">
|
||||
<list>
|
||||
<ref local="postInvocationCounterInterceptor"/>
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean name="cglibNoInterfaces" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
|
||||
<property name="transactionManager"><ref local="mockMan"/></property>
|
||||
<property name="target">
|
||||
<bean class="org.springframework.transaction.interceptor.ImplementsNoInterfaces">
|
||||
<property name="dependency"><ref local="targetDependency"/></property>
|
||||
</bean>
|
||||
</property>
|
||||
<property name="transactionAttributes">
|
||||
<props>
|
||||
<prop key="*">PROPAGATION_REQUIRED</prop>
|
||||
</props>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!--
|
||||
The HotSwappableTargetSource is a Type 3 component.
|
||||
-->
|
||||
<bean id="swapper" class="org.springframework.aop.target.HotSwappableTargetSource">
|
||||
<constructor-arg><ref local="target"/></constructor-arg>
|
||||
</bean>
|
||||
|
||||
<bean id="hotSwapped" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
|
||||
<property name="transactionManager"><ref local="mockMan"/></property>
|
||||
<!-- Should automatically pick up the target source, rather than simple target -->
|
||||
<property name="target"><ref local="swapper"/></property>
|
||||
<property name="transactionAttributes">
|
||||
<props>
|
||||
<prop key="s*">PROPAGATION_MANDATORY</prop>
|
||||
<prop key="setAg*">PROPAGATION_REQUIRED</prop>
|
||||
<prop key="set*">PROPAGATION_SUPPORTS</prop>
|
||||
</props>
|
||||
</property>
|
||||
<property name="proxyTargetClass"><value>true</value></property>
|
||||
<property name="optimize"><value>false</value></property>
|
||||
</bean>
|
||||
|
||||
<bean id="txnInvocationCounterPointcut"
|
||||
class="org.springframework.transaction.interceptor.BeanFactoryTransactionTests$InvocationCounterPointcut"/>
|
||||
|
||||
<bean id="preInvocationCounterInterceptor" class="org.springframework.transaction.interceptor.BeanFactoryTransactionTests$InvocationCounterInterceptor"/>
|
||||
|
||||
<bean id="postInvocationCounterInterceptor" class="org.springframework.transaction.interceptor.BeanFactoryTransactionTests$InvocationCounterInterceptor"/>
|
||||
|
||||
</beans>
|
||||
@@ -1,33 +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:aop="http://www.springframework.org/schema/aop"
|
||||
xmlns:tx="http://www.springframework.org/schema/tx"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
|
||||
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
|
||||
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
|
||||
|
||||
<aop:config>
|
||||
<aop:advisor pointcut="execution(* *..ITestBean.*(..))" advice-ref="txAdvice"/>
|
||||
</aop:config>
|
||||
|
||||
<tx:advice id="txAdvice">
|
||||
<tx:attributes>
|
||||
<tx:method name="get*" read-only="true"/>
|
||||
<tx:method name="set*"/>
|
||||
<tx:method name="exceptional"/>
|
||||
</tx:attributes>
|
||||
</tx:advice>
|
||||
|
||||
<tx:advice id="txRollbackAdvice">
|
||||
<tx:attributes>
|
||||
<tx:method name="get*" rollback-for="java.lang.Exception"/>
|
||||
<tx:method name="set*" no-rollback-for="java.lang.RuntimeException"/>
|
||||
</tx:attributes>
|
||||
</tx:advice>
|
||||
|
||||
<bean id="transactionManager" class="org.springframework.tests.transaction.CallCountingTransactionManager"/>
|
||||
|
||||
<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean"/>
|
||||
|
||||
</beans>
|
||||
Reference in New Issue
Block a user