From 8ec78d2d5a09671c6eb8ec1001cb91a515f22072 Mon Sep 17 00:00:00 2001
From: Calvin <calvinxiu@gmail.com>
Date: Wed, 8 Aug 2012 16:01:57 +0800
Subject: [PATCH] =?UTF-8?q?spring=E5=AF=B9=E5=A4=9A=E4=B8=AAtransactionMan?=
 =?UTF-8?q?ager=E7=9A=84=E6=94=AF=E6=8C=81=E5=B7=B2=E6=88=90=E7=86=9F?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88=E5=8E=9F=E6=9D=A5=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E5=BC=8F=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../showcase/modules/cache/guava/GuavaCacheDemo.java        | 2 --
 examples/showcase/src/main/resources/applicationContext.xml | 6 +++---
 .../examples/showcase/modules/schedule/JdkTimerJobTest.java | 2 --
 .../modules/schedule/QuartzTimerClusterJobTest.java         | 2 --
 .../showcase/modules/schedule/SpringTimerJobTest.java       | 2 --
 .../examples/showcase/repository/jpa/JpaMappingTest.java    | 3 ++-
 .../showcase/repository/mybatis/TeamMybatisDaoTest.java     | 2 --
 .../showcase/repository/mybatis/UserMybatisDaoTest.java     | 2 --
 8 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/cache/guava/GuavaCacheDemo.java b/examples/showcase/src/main/java/org/springside/examples/showcase/modules/cache/guava/GuavaCacheDemo.java
index 5c9183ca..239bf61f 100644
--- a/examples/showcase/src/main/java/org/springside/examples/showcase/modules/cache/guava/GuavaCacheDemo.java
+++ b/examples/showcase/src/main/java/org/springside/examples/showcase/modules/cache/guava/GuavaCacheDemo.java
@@ -9,7 +9,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.transaction.TransactionConfiguration;
 import org.springside.examples.showcase.entity.User;
 import org.springside.examples.showcase.service.AccountService;
 import org.springside.modules.test.data.DataFixtures;
@@ -27,7 +26,6 @@ import com.google.common.cache.LoadingCache;
  * @author hzl7652
  */
 @ContextConfiguration(locations = { "/applicationContext.xml" })
-@TransactionConfiguration(transactionManager = "defaultTransactionManager")
 public class GuavaCacheDemo extends SpringTransactionalTestCase {
 
 	private static Logger logger = LoggerFactory.getLogger(GuavaCacheDemo.class);
diff --git a/examples/showcase/src/main/resources/applicationContext.xml b/examples/showcase/src/main/resources/applicationContext.xml
index 378863e3..8700fce7 100644
--- a/examples/showcase/src/main/resources/applicationContext.xml
+++ b/examples/showcase/src/main/resources/applicationContext.xml
@@ -40,7 +40,7 @@
 	</bean>
 
 	<!-- Spring Data Jpa配置, 扫描base-package下所有继承于Repository<T,ID>的接口, 动态生成实现类 -->
- 	<jpa:repositories base-package="org.springside.examples.showcase" transaction-manager-ref="defaultTransactionManager" entity-manager-factory-ref="entityManagerFactory"/>
+ 	<jpa:repositories base-package="org.springside.examples.showcase" transaction-manager-ref="transactionManager" entity-manager-factory-ref="entityManagerFactory"/>
 	
 	<!-- MyBatis配置 -->
 	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
@@ -57,7 +57,7 @@
 	</bean>
 	
 	<!-- 事务管理器配置, Jpa单数据源事务 -->
-	<bean id="defaultTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
 		<property name="entityManagerFactory" ref="entityManagerFactory"/>
 	</bean>
 
@@ -67,7 +67,7 @@
 	</bean>
 
 	<!-- 使用annotation定义事务 -->
-	<tx:annotation-driven transaction-manager="defaultTransactionManager" proxy-target-class="true" />
+	<tx:annotation-driven transaction-manager="transactionManager" proxy-target-class="true" />
 	
 	<!-- 定义aspectj -->
 	<aop:aspectj-autoproxy proxy-target-class="true"/>
diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/JdkTimerJobTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/JdkTimerJobTest.java
index 0dc69073..2f432bb5 100644
--- a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/JdkTimerJobTest.java
+++ b/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/JdkTimerJobTest.java
@@ -6,7 +6,6 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.transaction.TransactionConfiguration;
 import org.springside.modules.test.category.UnStable;
 import org.springside.modules.test.log.Log4jMockAppender;
 import org.springside.modules.test.spring.SpringTransactionalTestCase;
@@ -15,7 +14,6 @@ import org.springside.modules.utils.Threads;
 @Category(UnStable.class)
 @DirtiesContext
 @ContextConfiguration(locations = { "/applicationContext.xml", "/schedule/applicationContext-jdk-timer.xml" })
-@TransactionConfiguration(transactionManager = "defaultTransactionManager")
 public class JdkTimerJobTest extends SpringTransactionalTestCase {
 
 	@Test
diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/QuartzTimerClusterJobTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/QuartzTimerClusterJobTest.java
index eb4d790f..d8cc0b98 100644
--- a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/QuartzTimerClusterJobTest.java
+++ b/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/QuartzTimerClusterJobTest.java
@@ -6,7 +6,6 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.transaction.TransactionConfiguration;
 import org.springside.modules.test.category.UnStable;
 import org.springside.modules.test.log.Log4jMockAppender;
 import org.springside.modules.test.spring.SpringTransactionalTestCase;
@@ -20,7 +19,6 @@ import org.springside.modules.utils.Threads;
 @Category(UnStable.class)
 @DirtiesContext
 @ContextConfiguration(locations = { "/applicationContext.xml", "/schedule/applicationContext-quartz-timer-cluster.xml" })
-@TransactionConfiguration(transactionManager = "defaultTransactionManager")
 public class QuartzTimerClusterJobTest extends SpringTransactionalTestCase {
 
 	@Test
diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/SpringTimerJobTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/SpringTimerJobTest.java
index f96ce5b5..d0cbd113 100644
--- a/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/SpringTimerJobTest.java
+++ b/examples/showcase/src/test/java/org/springside/examples/showcase/modules/schedule/SpringTimerJobTest.java
@@ -6,7 +6,6 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.transaction.TransactionConfiguration;
 import org.springside.modules.test.category.UnStable;
 import org.springside.modules.test.log.Log4jMockAppender;
 import org.springside.modules.test.spring.SpringTransactionalTestCase;
@@ -15,7 +14,6 @@ import org.springside.modules.utils.Threads;
 @Category(UnStable.class)
 @DirtiesContext
 @ContextConfiguration(locations = { "/applicationContext.xml", "/schedule/applicationContext-spring-scheduler.xml" })
-@TransactionConfiguration(transactionManager = "defaultTransactionManager")
 public class SpringTimerJobTest extends SpringTransactionalTestCase {
 
 	@Test
diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/repository/jpa/JpaMappingTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/repository/jpa/JpaMappingTest.java
index 485d1963..b33b455c 100644
--- a/examples/showcase/src/test/java/org/springside/examples/showcase/repository/jpa/JpaMappingTest.java
+++ b/examples/showcase/src/test/java/org/springside/examples/showcase/repository/jpa/JpaMappingTest.java
@@ -16,7 +16,8 @@ import org.springside.modules.test.spring.SpringTransactionalTestCase;
 
 @DirtiesContext
 @ContextConfiguration(locations = { "/applicationContext.xml" })
-@TransactionConfiguration(transactionManager = "defaultTransactionManager")
+//如果存在多个transactionManager，可以需显式指定
+@TransactionConfiguration(transactionManager = "transactionManager")
 public class JpaMappingTest extends SpringTransactionalTestCase {
 
 	private static Logger logger = LoggerFactory.getLogger(JpaMappingTest.class);
diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/TeamMybatisDaoTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/TeamMybatisDaoTest.java
index a7f122fe..18d7b019 100644
--- a/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/TeamMybatisDaoTest.java
+++ b/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/TeamMybatisDaoTest.java
@@ -6,13 +6,11 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.transaction.TransactionConfiguration;
 import org.springside.examples.showcase.entity.Team;
 import org.springside.modules.test.spring.SpringTransactionalTestCase;
 
 @DirtiesContext
 @ContextConfiguration(locations = { "/applicationContext.xml" })
-@TransactionConfiguration(transactionManager = "defaultTransactionManager")
 public class TeamMybatisDaoTest extends SpringTransactionalTestCase {
 
 	@Autowired
diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/UserMybatisDaoTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/UserMybatisDaoTest.java
index 86d94e69..3b965831 100644
--- a/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/UserMybatisDaoTest.java
+++ b/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/UserMybatisDaoTest.java
@@ -9,7 +9,6 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.transaction.TransactionConfiguration;
 import org.springside.examples.showcase.data.UserData;
 import org.springside.examples.showcase.entity.User;
 import org.springside.modules.test.spring.SpringTransactionalTestCase;
@@ -18,7 +17,6 @@ import com.google.common.collect.Maps;
 
 @DirtiesContext
 @ContextConfiguration(locations = { "/applicationContext.xml" })
-@TransactionConfiguration(transactionManager = "defaultTransactionManager")
 public class UserMybatisDaoTest extends SpringTransactionalTestCase {
 
 	@Autowired
-- 
GitLab