IN PROGRESS - issue LDAP-33: Remove package dependency cycle between ldap.core and ldap.support

http://opensource.atlassian.com/projects/spring/browse/LDAP-33
Remove package dependency cycle

spring-ldap/src/main/java/org/springframework/ldap/BadLdapGrammarException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap;
 
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 

spring-ldap/src/main/java/org/springframework/ldap/authentication/AcegiAuthenticationSource.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.authentication;
+package org.springframework.ldap.authentication;
 
 import org.acegisecurity.Authentication;
 import org.acegisecurity.context.SecurityContextHolder;

spring-ldap/src/main/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecorator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.authentication;
+package org.springframework.ldap.authentication;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.InitializingBean;

spring-ldap/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.control;
+package org.springframework.ldap.control;
 
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;

spring-ldap/src/main/java/org/springframework/ldap/control/PagedResult.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.control;
+package org.springframework.ldap.control;
 
 import java.util.List;
 

spring-ldap/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.control;
+package org.springframework.ldap.control;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;

spring-ldap/src/main/java/org/springframework/ldap/control/PagedResultsRequestControl.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.control;
+package org.springframework.ldap.control;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -92,7 +92,7 @@ public class PagedResultsRequestControl extends
     }
 
     /*
-     * @see org.springframework.ldap.support.control.AbstractRequestControlDirContextProcessor#createRequestControl()
+     * @see org.springframework.ldap.control.AbstractRequestControlDirContextProcessor#createRequestControl()
      */
     public Control createRequestControl() {
         try {

spring-ldap/src/main/java/org/springframework/ldap/core/AttributeModificationsAware.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import javax.naming.directory.ModificationItem;
 

spring-ldap/src/main/java/org/springframework/ldap/core/ContextMapper.java

@@ -20,8 +20,6 @@ import javax.naming.Binding;
 import javax.naming.Name;
 import javax.naming.directory.SearchResult;
 
-import org.springframework.ldap.support.DefaultDirObjectFactory;
-import org.springframework.ldap.support.DirContextAdapter;
 
 /**
  * An interface used by LdapTemplate to map LDAP Contexts to beans. Responsible

spring-ldap/src/main/java/org/springframework/ldap/core/DefaultDirObjectFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import java.util.Hashtable;
 
@@ -23,6 +23,7 @@ import javax.naming.Name;
 import javax.naming.directory.Attributes;
 import javax.naming.spi.DirObjectFactory;
 
+
 /**
  * Default implementation of the DirObjectFactory interface. Creates a
  * DirContextAdapter from the supplied arguments.

spring-ldap/src/main/java/org/springframework/ldap/core/DefaultDnParserFactory.java

@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import java.io.StringReader;
 
+import org.springframework.ldap.core.DnParserImpl;
+
 /**
  * A factory for creating DnParser instances. The actual implementation of
  * DnParser is generated using javacc and should not be constructed directly.

spring-ldap/src/main/java/org/springframework/ldap/core/DirContextAdapter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -46,15 +46,17 @@ import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.ldap.support.DefaultNamingExceptionTranslator;
+import org.springframework.ldap.support.NamingExceptionTranslator;
 
 /**
  * Implements the interesting methods of the DirContext interface. In particular
  * it contains utility methods for getting and setting Attributes. Using the
- * {@link org.springframework.ldap.support.DefaultDirObjectFactory} in your
+ * {@link org.springframework.ldap.core.DefaultDirObjectFactory} in your
  * ContextSource you may receive instances of this class from searches and
  * lookups. This can be particularly useful when updating data, since this class
  * implements
- * {@link org.springframework.ldap.support.AttributeModificationsAware},
+ * {@link org.springframework.ldap.core.AttributeModificationsAware},
  * providing a {@link #getModificationItems()} method.
  * 
  * @author Magnus Robertsson
@@ -158,7 +160,7 @@ public class DirContextAdapter implements DirContextOperations {
      * @param mode
      *            Update mode.
      */
-    protected void setUpdateMode(boolean mode) {
+    public void setUpdateMode(boolean mode) {
         this.updateMode = mode;
         if (updateMode) {
             updatedAttrs = new BasicAttributes(true);

spring-ldap/src/main/java/org/springframework/ldap/core/DirContextOperations.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import java.util.SortedSet;
 
 import javax.naming.Name;
 import javax.naming.directory.DirContext;
 
+
 /**
  * Interface for DirContextAdapter to simplify mock testing.
  * 

spring-ldap/src/main/java/org/springframework/ldap/core/DistinguishedName.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import java.util.Collections;
 import java.util.Enumeration;
@@ -28,7 +28,8 @@ import javax.naming.InvalidNameException;
 import javax.naming.Name;
 
 import org.apache.commons.lang.StringUtils;
-import org.springframework.ldap.util.ListComparator;
+import org.springframework.ldap.BadLdapGrammarException;
+import org.springframework.ldap.support.ListComparator;
 
 /**
  * Default implementation of a Name corresponding to an LDAP path. A

spring-ldap/src/main/java/org/springframework/ldap/core/DnParser.java

@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
+
 
 
 /**

spring-ldap/src/main/java/org/springframework/ldap/core/LdapEncoder.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 
 import org.apache.commons.lang.StringUtils;
+import org.springframework.ldap.BadLdapGrammarException;
 
 /**
  * Helper class to encode and decode ldap names and values.

spring-ldap/src/main/java/org/springframework/ldap/core/LdapRdn.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import java.io.Serializable;
 import java.util.Comparator;
@@ -22,7 +22,8 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.springframework.ldap.util.ListComparator;
+import org.springframework.ldap.BadLdapGrammarException;
+import org.springframework.ldap.support.ListComparator;
 
 /**
  * Datatype for a LDAP name, a part of a path.

spring-ldap/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import java.net.URI;
 import java.net.URISyntaxException;

spring-ldap/src/main/java/org/springframework/ldap/core/LdapTemplate.java

@@ -36,8 +36,6 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessException;
 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;
 

spring-ldap/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support;
+package org.springframework.ldap.core.support;
 
 import java.util.Hashtable;
 import java.util.Map;
@@ -30,6 +30,10 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.JdkVersion;
 import org.springframework.ldap.core.AuthenticationSource;
 import org.springframework.ldap.core.ContextSource;
+import org.springframework.ldap.core.DefaultDirObjectFactory;
+import org.springframework.ldap.core.DistinguishedName;
+import org.springframework.ldap.support.DefaultNamingExceptionTranslator;
+import org.springframework.ldap.support.NamingExceptionTranslator;
 
 /**
  * Abstract implementation of the ContextSource interface. By default, returns
@@ -50,9 +54,9 @@ import org.springframework.ldap.core.ContextSource;
  * properties are set, in order to finish up initialization.
  * 
  * @see org.springframework.ldap.core.LdapTemplate
- * @see org.springframework.ldap.support.DefaultDirObjectFactory
- * @see org.springframework.ldap.support.LdapContextSource
- * @see org.springframework.ldap.support.DirContextSource
+ * @see org.springframework.ldap.core.DefaultDirObjectFactory
+ * @see org.springframework.ldap.core.support.LdapContextSource
+ * @see org.springframework.ldap.core.support.DirContextSource
  * 
  * @author Mattias Arthursson
  * @author Adam Skogman

spring-ldap/src/main/java/org/springframework/ldap/core/support/AggregateDirContextProcessor.java

@@ -1,4 +1,4 @@
-package org.springframework.ldap.support;
+package org.springframework.ldap.core.support;
 
 import java.util.Iterator;
 import java.util.LinkedList;

spring-ldap/src/main/java/org/springframework/ldap/core/support/CountNameClassPairCallbackHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support;
+package org.springframework.ldap.core.support;
 
 import javax.naming.NameClassPair;
 

spring-ldap/src/main/java/org/springframework/ldap/core/support/DirContextSource.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core.support;
 
 import java.util.Hashtable;
 
@@ -22,12 +22,13 @@ import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
 
+
 /**
  * ContextSource implementation which creates InitialDirContext instances, for
  * LDAPv2 compatibility. For configuration information, see
- * {@link org.springframework.ldap.support.AbstractContextSource AbstractContextSource}.
+ * {@link org.springframework.ldap.core.support.AbstractContextSource AbstractContextSource}.
  * 
- * @see org.springframework.ldap.support.AbstractContextSource
+ * @see org.springframework.ldap.core.support.AbstractContextSource
  * 
  * @author Mattias Arthursson
  */

spring-ldap/src/main/java/org/springframework/ldap/core/support/LdapContextSource.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core.support;
 
 import java.util.Hashtable;
 
@@ -24,14 +24,15 @@ import javax.naming.ldap.ControlFactory;
 import javax.naming.ldap.InitialLdapContext;
 import javax.naming.ldap.LdapContext;
 
+
 import com.sun.jndi.ldap.ctl.ResponseControlFactory;
 
 /**
  * ContextSource implementation which creates an <code>InitialLdapContext</code>
  * instance. For configuration information, see
- * {@link org.springframework.ldap.support.AbstractContextSource AbstractContextSource}.
+ * {@link org.springframework.ldap.core.support.AbstractContextSource AbstractContextSource}.
  * 
- * @see org.springframework.ldap.support.AbstractContextSource
+ * @see org.springframework.ldap.core.support.AbstractContextSource
  * 
  * @author Mattias Arthursson
  * @author Adam Skogman

spring-ldap/src/main/java/org/springframework/ldap/filter/AbstractFilter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 /**
  * Convenience class that implements most of the methods in the Filter

spring-ldap/src/main/java/org/springframework/ldap/filter/AndFilter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 /**
  * A filter for a logical AND. E.g.:
@@ -28,7 +28,7 @@ package org.springframework.ldap.support.filter;
  * 
  * would result in: <code>(&amp;(objectclass=person)(cn=Some CN))</code>
  * 
- * @see org.springframework.ldap.support.filter.EqualsFilter
+ * @see org.springframework.ldap.filter.EqualsFilter
  * @author Adam Skogman
  * @author Mattias Arthursson
  */
@@ -39,7 +39,7 @@ public class AndFilter extends BinaryLogicalFilter {
     /*
      * (non-Javadoc)
      * 
-     * @see org.springframework.ldap.support.filter.BinaryLogicalFilter#getLogicalOperator()
+     * @see org.springframework.ldap.filter.BinaryLogicalFilter#getLogicalOperator()
      */
     protected String getLogicalOperator() {
         return AMPERSAND;

spring-ldap/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -34,7 +34,7 @@ public abstract class BinaryLogicalFilter extends AbstractFilter {
     protected List queryList = new LinkedList();
 
     /**
-     * @see org.springframework.ldap.support.filter.Filter#encode(java.lang.StringBuffer)
+     * @see org.springframework.ldap.filter.Filter#encode(java.lang.StringBuffer)
      */
     public StringBuffer encode(StringBuffer buff) {
         if (queryList.size() <= 0) {
@@ -73,7 +73,7 @@ public abstract class BinaryLogicalFilter extends AbstractFilter {
     /**
      * Compares each filter in turn
      * 
-     * @see org.springframework.ldap.support.filter.Filter#equals(java.lang.Object)
+     * @see org.springframework.ldap.filter.Filter#equals(java.lang.Object)
      */
     public boolean equals(Object obj) {
         if (obj instanceof BinaryLogicalFilter
@@ -87,7 +87,7 @@ public abstract class BinaryLogicalFilter extends AbstractFilter {
     /**
      * Hashes all contained data
      * 
-     * @see org.springframework.ldap.support.filter.Filter#hashCode()
+     * @see org.springframework.ldap.filter.Filter#hashCode()
      */
     public int hashCode() {
         return HashCodeBuilder.reflectionHashCode(this);

spring-ldap/src/main/java/org/springframework/ldap/filter/CompareFilter.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.springframework.ldap.support.LdapEncoder;
+import org.springframework.ldap.core.LdapEncoder;
 
 /**
  * Abstract superclass for filters to compare values.
@@ -72,7 +72,7 @@ public abstract class CompareFilter extends AbstractFilter {
     }
 
     /*
-     * @see org.springframework.ldap.support.filter.AbstractFilter#encode(java.lang.StringBuffer)
+     * @see org.springframework.ldap.filter.AbstractFilter#encode(java.lang.StringBuffer)
      */
     public StringBuffer encode(StringBuffer buff) {
         buff.append('(');
@@ -85,7 +85,7 @@ public abstract class CompareFilter extends AbstractFilter {
     /**
      * Compares key and value before encoding.
      * 
-     * @see org.springframework.ldap.support.filter.Filter#equals(java.lang.Object)
+     * @see org.springframework.ldap.filter.Filter#equals(java.lang.Object)
      */
     public boolean equals(Object o) {
         if (o instanceof CompareFilter && o.getClass() == this.getClass()) {
@@ -102,7 +102,7 @@ public abstract class CompareFilter extends AbstractFilter {
     /**
      * Calculate the hash code for the attribute and the value.
      * 
-     * @see org.springframework.ldap.support.filter.Filter#hashCode()
+     * @see org.springframework.ldap.filter.Filter#hashCode()
      */
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();

spring-ldap/src/main/java/org/springframework/ldap/filter/EqualsFilter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 
 /**
@@ -49,7 +49,7 @@ public class EqualsFilter extends CompareFilter {
     }
 
     /*
-     * @see org.springframework.ldap.support.filter.CompareFilter#getCompareString()
+     * @see org.springframework.ldap.filter.CompareFilter#getCompareString()
      */
     protected String getCompareString() {
         return EQUALS_SIGN;

spring-ldap/src/main/java/org/springframework/ldap/filter/Filter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 /**
  * Common interface for filters.

spring-ldap/src/main/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 /**
  * A filter to compare >=. LDAP RFC does not allow > comparison. The following

spring-ldap/src/main/java/org/springframework/ldap/filter/LessThanOrEqualsFilter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 /**
  * A filter to compare <=. LDAP RFC does not allow < comparison. The following

spring-ldap/src/main/java/org/springframework/ldap/filter/LikeFilter.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
-import org.springframework.ldap.support.LdapEncoder;
+import org.springframework.ldap.core.LdapEncoder;
 
 /**
  * This filter allows the user to specify wildcards (*) by not escaping them in

spring-ldap/src/main/java/org/springframework/ldap/filter/NotFilter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 import org.apache.commons.lang.Validate;
 
@@ -50,7 +50,7 @@ public class NotFilter extends AbstractFilter {
     }
 
     /**
-     * @see org.springframework.ldap.support.filter.Filter#encode(java.lang.StringBuffer)
+     * @see org.springframework.ldap.filter.Filter#encode(java.lang.StringBuffer)
      */
     public StringBuffer encode(StringBuffer buff) {
 
@@ -65,7 +65,7 @@ public class NotFilter extends AbstractFilter {
     /**
      * Compares key and value before encoding
      * 
-     * @see org.springframework.ldap.support.filter.Filter#equals(java.lang.Object)
+     * @see org.springframework.ldap.filter.Filter#equals(java.lang.Object)
      */
     public boolean equals(Object o) {
 
@@ -80,7 +80,7 @@ public class NotFilter extends AbstractFilter {
     /**
      * hash attribute and value
      * 
-     * @see org.springframework.ldap.support.filter.Filter#hashCode()
+     * @see org.springframework.ldap.filter.Filter#hashCode()
      */
     public int hashCode() {
         return HASH ^ filter.hashCode();

spring-ldap/src/main/java/org/springframework/ldap/filter/OrFilter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 /**
  * Filter for logical OR.
@@ -51,7 +51,7 @@ public class OrFilter extends BinaryLogicalFilter {
     /*
      * (non-Javadoc)
      * 
-     * @see org.springframework.ldap.support.filter.BinaryLogicalFilter#getLogicalOperator()
+     * @see org.springframework.ldap.filter.BinaryLogicalFilter#getLogicalOperator()
      */
     protected String getLogicalOperator() {
         return PIPE_SIGN;

spring-ldap/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.filter;
+package org.springframework.ldap.filter;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang.StringUtils;
-import org.springframework.ldap.support.LdapEncoder;
+import org.springframework.ldap.core.LdapEncoder;
 
 /**
  * This filter automatically converts all whitespace to wildcards (*). The

spring-ldap/src/main/java/org/springframework/ldap/support/DefaultNamingExceptionTranslator.java

@@ -30,6 +30,7 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.DataRetrievalFailureException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.ldap.BadLdapGrammarException;
 
 /**
  * The default implementation of NamingExceptionTranslator.

spring-ldap/src/main/java/org/springframework/ldap/support/ListComparator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.util;
+package org.springframework.ldap.support;
 
 import java.util.Comparator;
 import java.util.List;

spring-ldap/src/main/java/org/springframework/ldap/util/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-
-Internal utility classes.
-
-</body>
-</html>

spring-ldap/src/main/javacc/DnParserImpl.jj

@@ -43,11 +43,7 @@ options {
 
 PARSER_BEGIN(DnParserImpl)
 
-package org.springframework.ldap.support;
-
-import org.springframework.ldap.support.LdapRdn;
-import org.springframework.ldap.support.LdapRdnComponent;
-import org.springframework.ldap.support.DistinguishedName;
+package org.springframework.ldap.core;
 
 public class DnParserImpl implements DnParser{