From 9326a80b53609667cb51b0e95b5a4201817607f0 Mon Sep 17 00:00:00 2001
From: Ulrik Sandberg <ulrik.sandberg@jayway.com>
Date: Tue, 9 Jan 2007 22:55:20 +0000
Subject: [PATCH] Preparing to replace the exceptions.

---
 .../ContextSourceTransactionManagerIntegrationTest.java       | 2 +-
 .../ldap/support/transaction/DummyDaoImpl.java                | 1 -
 .../ldap/support/control/VirtualListViewRequestControl.java   | 2 +-
 .../ldap/support/transaction/DirContextHolder.java            | 4 +---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManagerIntegrationTest.java b/sandbox/src/itest/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManagerIntegrationTest.java
index 04b02baf..852c99c3 100644
--- a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManagerIntegrationTest.java
+++ b/sandbox/src/itest/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManagerIntegrationTest.java
@@ -5,10 +5,10 @@ import javax.naming.directory.Attributes;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.ldap.EntryNotFoundException;
 import org.springframework.ldap.LdapServerManager;
 import org.springframework.ldap.core.AttributesMapper;
 import org.springframework.ldap.core.LdapTemplate;
+import org.springframework.ldap.support.EntryNotFoundException;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
 public class ContextSourceTransactionManagerIntegrationTest extends
diff --git a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyDaoImpl.java b/sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyDaoImpl.java
index 77d7ee06..666e2830 100644
--- a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyDaoImpl.java
+++ b/sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyDaoImpl.java
@@ -1,6 +1,5 @@
 package org.springframework.ldap.support.transaction;
 
-import org.springframework.ldap.core.LdapOperations;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.support.DirContextAdapter;
 import org.springframework.ldap.support.DistinguishedName;
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/control/VirtualListViewRequestControl.java b/sandbox/src/main/java/org/springframework/ldap/support/control/VirtualListViewRequestControl.java
index 9d75c2b3..91e3ccc4 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/control/VirtualListViewRequestControl.java
+++ b/sandbox/src/main/java/org/springframework/ldap/support/control/VirtualListViewRequestControl.java
@@ -24,8 +24,8 @@ import javax.naming.directory.DirContext;
 import javax.naming.ldap.Control;
 import javax.naming.ldap.LdapContext;
 
-import org.springframework.ldap.UncategorizedLdapException;
 import org.springframework.ldap.core.DirContextProcessor;
+import org.springframework.ldap.support.UncategorizedLdapException;
 import org.springframework.util.ReflectionUtils;
 
 import com.sun.jndi.ldap.ctl.SortControl;
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/DirContextHolder.java b/sandbox/src/main/java/org/springframework/ldap/support/transaction/DirContextHolder.java
index 854cb5cc..8695d758 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/DirContextHolder.java
+++ b/sandbox/src/main/java/org/springframework/ldap/support/transaction/DirContextHolder.java
@@ -63,9 +63,7 @@ public class DirContextHolder extends ResourceHolderSupport {
     }
 
     /**
-     * Get the DirContext associated with the current transaction.
-     * 
-     * @return
+     * Return the DirContext associated with the current transaction.
      */
     public DirContext getCtx() {
         return ctx;