From 508d9ba48b0b7bf8c3f6fbd677bacaabf9ee6590 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 4 Feb 2010 16:47:57 +0000 Subject: [PATCH] added warning about pointing to a custom transaction manager bean (SPR-5174) git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2924 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../context/transaction/TransactionConfiguration.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/transaction/TransactionConfiguration.java b/org.springframework.test/src/main/java/org/springframework/test/context/transaction/TransactionConfiguration.java index 98d58635f18..c2c72c7c344 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/context/transaction/TransactionConfiguration.java +++ b/org.springframework.test/src/main/java/org/springframework/test/context/transaction/TransactionConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ import org.springframework.transaction.PlatformTransactionManager; /** * TransactionConfiguration defines class-level metadata for configuring * transactional tests. - * + * * @author Sam Brannen * @since 2.5 * @see ContextConfiguration @@ -46,6 +46,11 @@ public @interface TransactionConfiguration { * used to drive transactions. This attribute is not required and only needs * to be specified explicitly if the bean name of the desired * PlatformTransactionManager is not "transactionManager". + *

NOTE: The XML <tx:annotation-driven> element + * also refers to a bean named "transactionManager" by default. If you are + * using both features in combination, make sure to point to the same + * transaction manager bean - here in @TransactionConfiguration and + * also in <tx:annotation-driven transaction-manager="...">. */ String transactionManager() default "transactionManager";