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

---
 .../springframework/ldap/LdapTemplateBindUnbindITest.java | 2 +-
 .../org/springframework/ldap/LdapTemplateModifyITest.java | 2 +-
 .../ldap/LdapTemplateNoBaseSuffixITest.java               | 2 +-
 .../ldap/LdapTemplateRecursiveDeleteITest.java            | 1 +
 .../org/springframework/ldap/LdapTemplateRenameITest.java | 2 +-
 .../java/org/springframework/ldap/core/LdapTemplate.java  | 6 +++---
 .../main/java/org/springframework/ldap/core/package.html  | 8 ++++++++
 .../ldap/support/authentication/package.html              | 4 ++++
 .../ldap/support/control/PagedResultsRequestControl.java  | 2 +-
 .../org/springframework/ldap/support/control/package.html | 4 ++++
 .../org/springframework/ldap/support/filter/package.html  | 4 ++++
 .../main/java/org/springframework/ldap/util/package.html  | 4 ++++
 .../org/springframework/ldap/LdapTemplateListTest.java    | 2 ++
 .../org/springframework/ldap/LdapTemplateLookupTest.java  | 2 ++
 .../org/springframework/ldap/LdapTemplateRenameTest.java  | 4 ++--
 .../java/org/springframework/ldap/LdapTemplateTest.java   | 2 ++
 .../org/springframework/ldap/support/LdapEncoderTest.java | 1 -
 .../org/springframework/ldap/support/LdapRdnTest.java     | 1 -
 18 files changed, 41 insertions(+), 12 deletions(-)
 create mode 100644 spring-ldap/src/main/java/org/springframework/ldap/core/package.html

diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateBindUnbindITest.java b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateBindUnbindITest.java
index 4317fcd4..dfc427df 100644
--- a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateBindUnbindITest.java
+++ b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateBindUnbindITest.java
@@ -21,10 +21,10 @@ import javax.naming.directory.BasicAttribute;
 import javax.naming.directory.BasicAttributes;
 
 
-import org.springframework.ldap.EntryNotFoundException;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.support.DirContextAdapter;
 import org.springframework.ldap.support.DistinguishedName;
+import org.springframework.ldap.support.EntryNotFoundException;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
 /**
diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateModifyITest.java b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateModifyITest.java
index c7a274b1..04ca3e8d 100644
--- a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateModifyITest.java
+++ b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateModifyITest.java
@@ -25,10 +25,10 @@ import javax.naming.directory.ModificationItem;
 
 
 import org.springframework.dao.DataAccessException;
-import org.springframework.ldap.UncategorizedLdapException;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.support.DirContextAdapter;
 import org.springframework.ldap.support.DistinguishedName;
+import org.springframework.ldap.support.UncategorizedLdapException;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
 /**
diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java
index da80244a..cbe90d21 100644
--- a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java
+++ b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java
@@ -16,10 +16,10 @@
 
 package org.springframework.ldap;
 
-import org.springframework.ldap.EntryNotFoundException;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.support.CountNameClassPairCallbackHandler;
 import org.springframework.ldap.support.DirContextAdapter;
+import org.springframework.ldap.support.EntryNotFoundException;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
 /**
diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateRecursiveDeleteITest.java b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateRecursiveDeleteITest.java
index 304fddda..970d14eb 100644
--- a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateRecursiveDeleteITest.java
+++ b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateRecursiveDeleteITest.java
@@ -21,6 +21,7 @@ import javax.naming.Name;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.support.DirContextAdapter;
 import org.springframework.ldap.support.DistinguishedName;
+import org.springframework.ldap.support.EntryNotFoundException;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
 /**
diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateRenameITest.java b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateRenameITest.java
index c7e551d7..4655620d 100644
--- a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateRenameITest.java
+++ b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateRenameITest.java
@@ -19,10 +19,10 @@ package org.springframework.ldap;
 import javax.naming.Name;
 
 
-import org.springframework.ldap.EntryNotFoundException;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.support.DirContextAdapter;
 import org.springframework.ldap.support.DistinguishedName;
+import org.springframework.ldap.support.EntryNotFoundException;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
 /**
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/core/LdapTemplate.java b/spring-ldap/src/main/java/org/springframework/ldap/core/LdapTemplate.java
index a7aae1d9..e0b932ca 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/core/LdapTemplate.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/LdapTemplate.java
@@ -35,11 +35,11 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessException;
-import org.springframework.ldap.DefaultNamingExceptionTranslator;
-import org.springframework.ldap.EntryNotFoundException;
-import org.springframework.ldap.NamingExceptionTranslator;
+import org.springframework.ldap.support.DefaultNamingExceptionTranslator;
 import org.springframework.ldap.support.DirContextAdapter;
 import org.springframework.ldap.support.DistinguishedName;
+import org.springframework.ldap.support.EntryNotFoundException;
+import org.springframework.ldap.support.NamingExceptionTranslator;
 
 /**
  * Executes core LDAP functionality and helps to avoid common errors, relieving
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/core/package.html b/spring-ldap/src/main/java/org/springframework/ldap/core/package.html
new file mode 100644
index 00000000..2cb85563
--- /dev/null
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/package.html
@@ -0,0 +1,8 @@
+<html>
+<body>
+
+Core package of the JNDI/LDAP support.
+Provides a LdapTemplate class and various callback interfaces.
+
+</body>
+</html>
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/authentication/package.html b/spring-ldap/src/main/java/org/springframework/ldap/support/authentication/package.html
index d15fe6bc..4e314da9 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/authentication/package.html
+++ b/spring-ldap/src/main/java/org/springframework/ldap/support/authentication/package.html
@@ -1,3 +1,7 @@
+<html>
 <body>
+
 Support classes for custom authentication.
+
 </body>
+</html>
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/control/PagedResultsRequestControl.java b/spring-ldap/src/main/java/org/springframework/ldap/support/control/PagedResultsRequestControl.java
index dcc19d45..51d898b5 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/control/PagedResultsRequestControl.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/support/control/PagedResultsRequestControl.java
@@ -25,7 +25,7 @@ import javax.naming.directory.DirContext;
 import javax.naming.ldap.Control;
 import javax.naming.ldap.LdapContext;
 
-import org.springframework.ldap.UncategorizedLdapException;
+import org.springframework.ldap.support.UncategorizedLdapException;
 import org.springframework.util.ReflectionUtils;
 
 import com.sun.jndi.ldap.ctl.PagedResultsControl;
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/control/package.html b/spring-ldap/src/main/java/org/springframework/ldap/support/control/package.html
index e8351194..af3c0892 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/control/package.html
+++ b/spring-ldap/src/main/java/org/springframework/ldap/support/control/package.html
@@ -1,3 +1,7 @@
+<html>
 <body>
+
 Support classes for custom request control context processors.
+
 </body>
+</html>
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/package.html b/spring-ldap/src/main/java/org/springframework/ldap/support/filter/package.html
index e05a77ed..5b26891b 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/support/filter/package.html
+++ b/spring-ldap/src/main/java/org/springframework/ldap/support/filter/package.html
@@ -1,4 +1,6 @@
+<html>
 <body>
+
 Utility classes for dynamically building LDAP
 filters. Filters can be nested and wrapped around each other:
 <pre>
@@ -13,4 +15,6 @@ System.out.println(orFilter.encode());
 would result in:
 
 <pre>(|(&(objectclass=person)(cn=Some CN))(objectclass=organizationalUnit))</pre>
+
 </body>
+</html>
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/util/package.html b/spring-ldap/src/main/java/org/springframework/ldap/util/package.html
index b01effef..1bb28e68 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/util/package.html
+++ b/spring-ldap/src/main/java/org/springframework/ldap/util/package.html
@@ -1,3 +1,7 @@
+<html>
 <body>
+
 Internal utility classes.
+
 </body>
+</html>
diff --git a/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateListTest.java b/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateListTest.java
index ab3a28a0..f280e3af 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateListTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateListTest.java
@@ -34,6 +34,8 @@ import org.springframework.ldap.core.ContextMapper;
 import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.core.NameClassPairCallbackHandler;
+import org.springframework.ldap.support.EntryNotFoundException;
+import org.springframework.ldap.support.NamingExceptionTranslator;
 
 /**
  * Unit tests for the <code>list</code> operations in {@link LdapTemplate}.
diff --git a/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateLookupTest.java b/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateLookupTest.java
index d15afa94..810d33d5 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateLookupTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateLookupTest.java
@@ -32,6 +32,8 @@ import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.support.DirContextAdapter;
 import org.springframework.ldap.support.DistinguishedName;
+import org.springframework.ldap.support.EntryNotFoundException;
+import org.springframework.ldap.support.NamingExceptionTranslator;
 
 public class LdapTemplateLookupTest extends TestCase {
 
diff --git a/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateRenameTest.java b/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateRenameTest.java
index 55a53761..57e6448d 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateRenameTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateRenameTest.java
@@ -27,10 +27,10 @@ import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.ldap.NamingExceptionTranslator;
-import org.springframework.ldap.UncategorizedLdapException;
 import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.LdapTemplate;
+import org.springframework.ldap.support.NamingExceptionTranslator;
+import org.springframework.ldap.support.UncategorizedLdapException;
 
 /**
  * Unit tests for the rename operations in the LdapTemplate class.
diff --git a/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateTest.java b/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateTest.java
index 227941cb..8b76fc4f 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateTest.java
@@ -44,6 +44,8 @@ import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.core.NameClassPairCallbackHandler;
 import org.springframework.ldap.core.SearchExecutor;
 import org.springframework.ldap.support.DistinguishedName;
+import org.springframework.ldap.support.EntryNotFoundException;
+import org.springframework.ldap.support.NamingExceptionTranslator;
 
 public class LdapTemplateTest extends TestCase {
 
diff --git a/spring-ldap/src/test/java/org/springframework/ldap/support/LdapEncoderTest.java b/spring-ldap/src/test/java/org/springframework/ldap/support/LdapEncoderTest.java
index 3afbd3c5..b20cf366 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/support/LdapEncoderTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/support/LdapEncoderTest.java
@@ -16,7 +16,6 @@
 
 package org.springframework.ldap.support;
 
-import org.springframework.ldap.BadLdapGrammarException;
 import org.springframework.ldap.support.LdapEncoder;
 
 import junit.framework.TestCase;
diff --git a/spring-ldap/src/test/java/org/springframework/ldap/support/LdapRdnTest.java b/spring-ldap/src/test/java/org/springframework/ldap/support/LdapRdnTest.java
index 5994ad3c..5892c6e8 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/support/LdapRdnTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/support/LdapRdnTest.java
@@ -18,7 +18,6 @@ package org.springframework.ldap.support;
 
 import junit.framework.TestCase;
 
-import org.springframework.ldap.BadLdapGrammarException;
 
 import com.gargoylesoftware.base.testing.EqualsTester;