From 8b99097cb1655540b6c33b75f2420bf4e2547309 Mon Sep 17 00:00:00 2001
From: Ulrik Sandberg <ulrik.sandberg@jayway.com>
Date: Sat, 11 Oct 2008 11:03:33 +0000
Subject: [PATCH] Removed package dependency cycle.

---
 .../core/support/SingleContextSource.java     |  3 +--
 .../ldap/support/LdapUtils.java               | 18 ++++++++++++++++++
 .../compensating/LdapTransactionUtils.java    | 19 -------------------
 .../TransactionAwareContextSourceProxy.java   |  4 ++--
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/SingleContextSource.java b/mvn-build/core/src/main/java/org/springframework/ldap/core/support/SingleContextSource.java
index e9716875..0a4fe592 100644
--- a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/SingleContextSource.java
+++ b/mvn-build/core/src/main/java/org/springframework/ldap/core/support/SingleContextSource.java
@@ -14,7 +14,6 @@ import org.springframework.ldap.NamingException;
 import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.DirContextProxy;
 import org.springframework.ldap.support.LdapUtils;
-import org.springframework.ldap.transaction.compensating.LdapTransactionUtils;
 
 /**
  * A {@link ContextSource} implementation using returning
@@ -104,7 +103,7 @@ public class SingleContextSource implements ContextSource {
 	private DirContext getNonClosingDirContextProxy(DirContext context) {
 		return (DirContext) Proxy.newProxyInstance(DirContextProxy.class
 				.getClassLoader(), new Class[] {
-				LdapTransactionUtils.getActualTargetClass(context),
+				LdapUtils.getActualTargetClass(context),
 				DirContextProxy.class },
 				new SingleContextSource.NonClosingDirContextInvocationHandler(
 						context));
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/support/LdapUtils.java b/mvn-build/core/src/main/java/org/springframework/ldap/support/LdapUtils.java
index ba03e977..80c453e8 100644
--- a/mvn-build/core/src/main/java/org/springframework/ldap/support/LdapUtils.java
+++ b/mvn-build/core/src/main/java/org/springframework/ldap/support/LdapUtils.java
@@ -17,6 +17,7 @@
 package org.springframework.ldap.support;
 
 import javax.naming.directory.DirContext;
+import javax.naming.ldap.LdapContext;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -206,4 +207,21 @@ public final class LdapUtils {
 		// fallback
 		return new org.springframework.ldap.UncategorizedLdapException(ex);
 	}
+
+	/**
+	 * Get the actual class of the supplied DirContext instance; LdapContext or
+	 * DirContext.
+	 * 
+	 * @param context
+	 *            the DirContext instance to check.
+	 * @return LdapContext.class if context is an LdapContext, DirContext.class
+	 *         otherwise.
+	 */
+	public static Class getActualTargetClass(DirContext context) {
+	    if (context instanceof LdapContext) {
+	        return LdapContext.class;
+	    }
+	
+	    return DirContext.class;
+	}
 }
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java b/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java
index 4f56746c..408e4294 100644
--- a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java
+++ b/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java
@@ -17,8 +17,6 @@
 package org.springframework.ldap.transaction.compensating;
 
 import javax.naming.Name;
-import javax.naming.directory.DirContext;
-import javax.naming.ldap.LdapContext;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.ldap.core.DistinguishedName;
@@ -101,21 +99,4 @@ public final class LdapTransactionUtils {
                 .equals(methodName, UNBIND_METHOD_NAME));
 
     }
-
-    /**
-     * Get the actual class of the supplied DirContext instance; LdapContext or
-     * DirContext.
-     * 
-     * @param context
-     *            the DirContext instance to check.
-     * @return LdapContext.class if context is an LdapContext, DirContext.class
-     *         otherwise.
-     */
-    public static Class getActualTargetClass(DirContext context) {
-        if (context instanceof LdapContext) {
-            return LdapContext.class;
-        }
-
-        return DirContext.class;
-    }
 }
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxy.java b/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxy.java
index 97df4ff2..ab856606 100644
--- a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxy.java
+++ b/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxy.java
@@ -22,7 +22,7 @@ import javax.naming.directory.DirContext;
 import org.springframework.ldap.NamingException;
 import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.DirContextProxy;
-import org.springframework.ldap.transaction.compensating.LdapTransactionUtils;
+import org.springframework.ldap.support.LdapUtils;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
@@ -70,7 +70,7 @@ public class TransactionAwareContextSourceProxy implements ContextSource {
         return (DirContext) Proxy
                 .newProxyInstance(DirContextProxy.class.getClassLoader(),
                         new Class[] {
-                                LdapTransactionUtils
+                                LdapUtils
                                         .getActualTargetClass(context),
                                 DirContextProxy.class },
                         new TransactionAwareDirContextInvocationHandler(