From 50fa5d1d2c51446102005716193fd384d57d0ee6 Mon Sep 17 00:00:00 2001
From: Ulrik Sandberg <ulrik.sandberg@jayway.com>
Date: Tue, 10 Apr 2007 13:18:31 +0000
Subject: [PATCH] Moved TransactionUtils from ldap.transaction to
 ldap.transaction.core.

---
 .../ldap/transaction/core/BindOperationRecorder.java           | 1 -
 .../core/LdapCompensatingTransactionOperationFactory.java      | 1 -
 .../transaction/core/ModifyAttributesOperationRecorder.java    | 1 -
 .../ldap/transaction/core/RebindOperationRecorder.java         | 1 -
 .../ldap/transaction/core/RenameOperationRecorder.java         | 1 -
 .../transaction/core/TransactionAwareContextSourceProxy.java   | 1 -
 .../core/TransactionAwareDirContextInvocationHandler.java      | 1 -
 .../ldap/transaction/{ => core}/TransactionUtils.java          | 3 +--
 .../ldap/transaction/core/UnbindOperationRecorder.java         | 1 -
 .../org/springframework/ldap/support/TransactionUtilsTest.java | 2 +-
 10 files changed, 2 insertions(+), 11 deletions(-)
 rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{ => core}/TransactionUtils.java (95%)

diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/BindOperationRecorder.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/BindOperationRecorder.java
index c8f0b9f0..af4ac236 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/BindOperationRecorder.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/BindOperationRecorder.java
@@ -21,7 +21,6 @@ import javax.naming.directory.Attributes;
 import org.springframework.ldap.core.LdapOperations;
 import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
 import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder;
-import org.springframework.ldap.transaction.TransactionUtils;
 
 /**
  * A {@link CompensatingTransactionOperationRecorder} to manage LDAP bind
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactory.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactory.java
index 211758dd..33c61d4f 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactory.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactory.java
@@ -31,7 +31,6 @@ import org.springframework.ldap.core.LdapOperations;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.transaction.CompensatingTransactionOperationFactory;
 import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder;
-import org.springframework.ldap.transaction.TransactionUtils;
 
 /**
  * {@link CompensatingTransactionOperationRecorder} implementation for LDAP
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorder.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorder.java
index 7194c1cd..6f6f8159 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorder.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorder.java
@@ -30,7 +30,6 @@ import org.springframework.ldap.core.AttributesMapper;
 import org.springframework.ldap.core.LdapOperations;
 import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
 import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder;
-import org.springframework.ldap.transaction.TransactionUtils;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RebindOperationRecorder.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RebindOperationRecorder.java
index f3a35688..3b907c63 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RebindOperationRecorder.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RebindOperationRecorder.java
@@ -21,7 +21,6 @@ import javax.naming.directory.Attributes;
 import org.springframework.ldap.core.LdapOperations;
 import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
 import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder;
-import org.springframework.ldap.transaction.TransactionUtils;
 
 /**
  * A {@link CompensatingTransactionOperationRecorder} keeping track of a rebind
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RenameOperationRecorder.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RenameOperationRecorder.java
index 01e31998..3da3712b 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RenameOperationRecorder.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RenameOperationRecorder.java
@@ -22,7 +22,6 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.ldap.core.LdapOperations;
 import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
 import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder;
-import org.springframework.ldap.transaction.TransactionUtils;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxy.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxy.java
index dc02ce1a..a9ed00a3 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxy.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxy.java
@@ -21,7 +21,6 @@ import javax.naming.directory.DirContext;
 
 import org.springframework.ldap.NamingException;
 import org.springframework.ldap.core.ContextSource;
-import org.springframework.ldap.transaction.TransactionUtils;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareDirContextInvocationHandler.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareDirContextInvocationHandler.java
index 7075d7f0..ae2bd7c1 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareDirContextInvocationHandler.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareDirContextInvocationHandler.java
@@ -22,7 +22,6 @@ import java.lang.reflect.Method;
 import javax.naming.directory.DirContext;
 
 import org.springframework.ldap.core.ContextSource;
-import org.springframework.ldap.transaction.TransactionUtils;
 
 /**
  * Proxy implementation for DirContext, making sure that the instance is not
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/TransactionUtils.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionUtils.java
similarity index 95%
rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/TransactionUtils.java
rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionUtils.java
index bc591b30..68cd13a3 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/TransactionUtils.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.transaction;
+package org.springframework.ldap.transaction.core;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -30,7 +30,6 @@ import org.springframework.ldap.NamingException;
 import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.transaction.CompensatingTransactionOperationManager;
-import org.springframework.ldap.transaction.core.DirContextHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
 
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationRecorder.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationRecorder.java
index f9387fb7..fb27a04b 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationRecorder.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationRecorder.java
@@ -20,7 +20,6 @@ import javax.naming.Name;
 import org.springframework.ldap.core.LdapOperations;
 import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
 import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder;
-import org.springframework.ldap.transaction.TransactionUtils;
 
 /**
  * {@link CompensatingTransactionOperationRecorder} to keep track of unbind
diff --git a/spring-ldap/src/test/java/org/springframework/ldap/support/TransactionUtilsTest.java b/spring-ldap/src/test/java/org/springframework/ldap/support/TransactionUtilsTest.java
index 0a9aa50e..39debef0 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/support/TransactionUtilsTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/support/TransactionUtilsTest.java
@@ -10,8 +10,8 @@ import junit.framework.TestCase;
 import org.easymock.MockControl;
 import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.transaction.CompensatingTransactionOperationManager;
-import org.springframework.ldap.transaction.TransactionUtils;
 import org.springframework.ldap.transaction.core.DirContextHolder;
+import org.springframework.ldap.transaction.core.TransactionUtils;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 public class TransactionUtilsTest extends TestCase {