spring对多个transactionManager的支持已成熟，取消原来的显式定义

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);

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"/>

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

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

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

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);

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

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