From 28520fd5db448f1165e994c7d30f0dc56f56311f Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Thu, 2 Jun 2011 14:28:16 +0000
Subject: [PATCH] Rename TransactionManagementConfigurer callback

Renamed TransactionManagementConfigurer#createTransactionManager()
to #annotationDrivenTransactionManager() to better reflect the fact
that the implemented method is optionally eligible for @Bean annotation.

See Javadoc for details.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4409 50f2f4bb-b051-0410-bef5-90022cba6387
---
 .../annotation/EnableTransactionManagementIntegrationTests.java | 2 +-
 .../annotation/AbstractTransactionManagementConfiguration.java  | 2 +-
 .../transaction/annotation/TransactionManagementConfigurer.java | 2 +-
 .../annotation/EnableTransactionManagementTests.java            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java b/org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
index 230a48d3815..e5e59cdee57 100644
--- a/org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
+++ b/org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
@@ -181,7 +181,7 @@ public class EnableTransactionManagementIntegrationTests {
 			return new CallCountingTransactionManager();
 		}
 
-		public PlatformTransactionManager createTransactionManager() {
+		public PlatformTransactionManager annotationDrivenTransactionManager() {
 			return txManager1();
 		}
 
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java b/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java
index eca12ccb2eb..1c7676af56f 100644
--- a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java
+++ b/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java
@@ -58,7 +58,7 @@ public abstract class AbstractTransactionManagementConfiguration implements Impo
 		}
 
 		TransactionManagementConfigurer configurer = configurers.iterator().next();
-		this.txManager = configurer.createTransactionManager();
+		this.txManager = configurer.annotationDrivenTransactionManager();
 	}
 
 }
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java b/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java
index 145db37d12e..7effb75a295 100644
--- a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java
+++ b/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java
@@ -20,6 +20,6 @@ import org.springframework.transaction.PlatformTransactionManager;
 
 public interface TransactionManagementConfigurer {
 
-	PlatformTransactionManager createTransactionManager();
+	PlatformTransactionManager annotationDrivenTransactionManager();
 
 }
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java b/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java
index 4f90653f158..f9727cc54c6 100644
--- a/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java
+++ b/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java
@@ -127,7 +127,7 @@ public class EnableTransactionManagementTests {
 			return new CallCountingTransactionManager();
 		}
 
-		public PlatformTransactionManager createTransactionManager() {
+		public PlatformTransactionManager annotationDrivenTransactionManager() {
 			return txManager2();
 		}
 	}