You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2005/12/09 11:58:03 UTC

svn commit: r355447 - in /directory/shared/ldap/branches/DN-refactoring/apache2-provider/src: main/java/org/apache/asn1new/ldap/ main/java/org/apache/asn1new/ldap/codec/grammar/ main/java/org/apache/asn1new/ldap/codec/primitives/ main/java/org/apache/a...

Author: elecharny
Date: Fri Dec  9 02:57:13 2005
New Revision: 355447

URL: http://svn.apache.org/viewcvs?rev=355447&view=rev
Log:
Moved some classes from ldapber to ldap-common

Removed:
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/primitives/AttributeTypeAndValue.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/primitives/DNParser.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapDN.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapRDN.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapString.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapStringEncodingException.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapURL.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapURLEncodingException.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/primitives/RDNParser.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/utils/DNUtils.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/primitives/DNParserTest.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/primitives/LdapDNTest.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/primitives/LdapRDNTest.java
Modified:
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/TwixTransformer.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/AddRequestGrammar.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/BindRequestGrammar.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/CompareRequestGrammar.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/DelRequestGrammar.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/FilterGrammar.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapControlGrammar.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapResultGrammar.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyDNRequestGrammar.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyRequestGrammar.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchRequestGrammar.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultEntryGrammar.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultReferenceGrammar.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/AddRequest.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/AttributeValueAssertion.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/BindRequest.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/CompareRequest.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/Control.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/DelRequest.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/LdapResult.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyDNRequest.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyRequest.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SaslCredentials.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchRequest.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchResultEntry.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchResultReference.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/ExtensibleMatchFilter.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/PresentFilter.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/SubstringFilter.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchRequestTest.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultReferenceTest.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/primitives/LdapStringTest.java
    directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/primitives/LdapUrlTest.java

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/TwixTransformer.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/TwixTransformer.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/TwixTransformer.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/TwixTransformer.java Fri Dec  9 02:57:13 2005
@@ -30,11 +30,6 @@
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1new.Asn1Object;
 import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.codec.primitives.LdapStringEncodingException;
-import org.apache.asn1new.ldap.codec.primitives.LdapURL;
-import org.apache.asn1new.ldap.codec.primitives.LdapURLEncodingException;
 import org.apache.asn1new.ldap.pojo.AbandonRequest;
 import org.apache.asn1new.ldap.pojo.AddRequest;
 import org.apache.asn1new.ldap.pojo.AddResponse;
@@ -70,6 +65,8 @@
 import org.apache.asn1new.ldap.pojo.filters.PresentFilter;
 import org.apache.asn1new.ldap.pojo.filters.SubstringFilter;
 import org.apache.asn1new.primitives.OID;
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.LdapStringEncodingException;
 import org.apache.ldap.common.filter.AbstractExprNode;
 import org.apache.ldap.common.filter.BranchNode;
 import org.apache.ldap.common.filter.ExprNode;
@@ -108,6 +105,9 @@
 import org.apache.ldap.common.message.UnbindRequestImpl;
 import org.apache.ldap.common.message.spi.Provider;
 import org.apache.ldap.common.message.spi.TransformerSpi;
+import org.apache.ldap.common.name.LdapDN;
+import org.apache.ldap.common.url.LdapURL;
+import org.apache.ldap.common.url.LdapURLEncodingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/AddRequestGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/AddRequestGrammar.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/AddRequestGrammar.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/AddRequestGrammar.java Fri Dec  9 02:57:13 2005
@@ -29,11 +29,11 @@
 import org.apache.asn1.codec.util.StringUtils;
 import org.apache.asn1new.ldap.codec.LdapConstants;
 import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.codec.primitives.LdapStringEncodingException;
 import org.apache.asn1new.ldap.pojo.AddRequest;
 import org.apache.asn1new.ldap.pojo.LdapMessage;
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.LdapStringEncodingException;
+import org.apache.ldap.common.name.LdapDN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/BindRequestGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/BindRequestGrammar.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/BindRequestGrammar.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/BindRequestGrammar.java Fri Dec  9 02:57:13 2005
@@ -33,13 +33,13 @@
 //import org.apache.asn1new.primitives.OctetString;
 import org.apache.asn1new.ldap.codec.LdapConstants;
 import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.codec.primitives.LdapStringEncodingException;
 import org.apache.asn1new.ldap.pojo.BindRequest;
 import org.apache.asn1new.ldap.pojo.LdapMessage;
 import org.apache.asn1new.ldap.pojo.SaslCredentials;
 import org.apache.asn1new.ldap.pojo.SimpleAuthentication;
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.LdapStringEncodingException;
+import org.apache.ldap.common.name.LdapDN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/CompareRequestGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/CompareRequestGrammar.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/CompareRequestGrammar.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/CompareRequestGrammar.java Fri Dec  9 02:57:13 2005
@@ -29,11 +29,11 @@
 import org.apache.asn1.codec.util.StringUtils;
 import org.apache.asn1new.ldap.codec.LdapConstants;
 import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.codec.primitives.LdapStringEncodingException;
 import org.apache.asn1new.ldap.pojo.CompareRequest;
 import org.apache.asn1new.ldap.pojo.LdapMessage;
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.LdapStringEncodingException;
+import org.apache.ldap.common.name.LdapDN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/DelRequestGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/DelRequestGrammar.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/DelRequestGrammar.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/DelRequestGrammar.java Fri Dec  9 02:57:13 2005
@@ -27,10 +27,10 @@
 import org.apache.asn1new.ber.tlv.TLV;
 import org.apache.asn1new.ldap.codec.LdapConstants;
 import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
 import org.apache.asn1new.ldap.pojo.DelRequest;
 import org.apache.asn1new.ldap.pojo.LdapMessage;
 import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.name.LdapDN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/FilterGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/FilterGrammar.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/FilterGrammar.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/FilterGrammar.java Fri Dec  9 02:57:13 2005
@@ -30,8 +30,6 @@
 import org.apache.asn1.codec.util.StringUtils;
 import org.apache.asn1new.ldap.codec.LdapConstants;
 import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.codec.primitives.LdapStringEncodingException;
 import org.apache.asn1new.ldap.pojo.AttributeValueAssertion;
 import org.apache.asn1new.ldap.pojo.LdapMessage;
 import org.apache.asn1new.ldap.pojo.SearchRequest;
@@ -44,6 +42,8 @@
 import org.apache.asn1new.ldap.pojo.filters.OrFilter;
 import org.apache.asn1new.ldap.pojo.filters.PresentFilter;
 import org.apache.asn1new.ldap.pojo.filters.SubstringFilter;
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.LdapStringEncodingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapControlGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapControlGrammar.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapControlGrammar.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapControlGrammar.java Fri Dec  9 02:57:13 2005
@@ -30,11 +30,11 @@
 import org.apache.asn1.codec.util.StringUtils;
 import org.apache.asn1new.ldap.codec.LdapConstants;
 import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.codec.primitives.LdapStringEncodingException;
 import org.apache.asn1new.ldap.pojo.Control;
 import org.apache.asn1new.ldap.pojo.LdapMessage;
 import org.apache.asn1new.primitives.OID;
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.LdapStringEncodingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapResultGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapResultGrammar.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapResultGrammar.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapResultGrammar.java Fri Dec  9 02:57:13 2005
@@ -31,11 +31,6 @@
 import org.apache.asn1new.ber.tlv.Value;
 import org.apache.asn1new.ldap.codec.LdapConstants;
 import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.codec.primitives.LdapStringEncodingException;
-import org.apache.asn1new.ldap.codec.primitives.LdapURL;
-import org.apache.asn1new.ldap.codec.primitives.LdapURLEncodingException;
 import org.apache.asn1new.ldap.codec.utils.LdapResultEnum;
 import org.apache.asn1new.ldap.pojo.LdapMessage;
 import org.apache.asn1new.ldap.pojo.LdapResponse;
@@ -43,6 +38,11 @@
 import org.apache.asn1new.util.IntegerDecoder;
 import org.apache.asn1new.util.IntegerDecoderException;
 import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.LdapStringEncodingException;
+import org.apache.ldap.common.name.LdapDN;
+import org.apache.ldap.common.url.LdapURL;
+import org.apache.ldap.common.url.LdapURLEncodingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyDNRequestGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyDNRequestGrammar.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyDNRequestGrammar.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyDNRequestGrammar.java Fri Dec  9 02:57:13 2005
@@ -32,10 +32,10 @@
 import org.apache.asn1.codec.util.StringUtils;
 import org.apache.asn1new.ldap.codec.LdapConstants;
 import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapRDN;
 import org.apache.asn1new.ldap.pojo.LdapMessage;
 import org.apache.asn1new.ldap.pojo.ModifyDNRequest;
+import org.apache.ldap.common.name.LdapDN;
+import org.apache.ldap.common.name.LdapRDN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyRequestGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyRequestGrammar.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyRequestGrammar.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyRequestGrammar.java Fri Dec  9 02:57:13 2005
@@ -31,11 +31,11 @@
 import org.apache.asn1.codec.util.StringUtils;
 import org.apache.asn1new.ldap.codec.LdapConstants;
 import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.codec.primitives.LdapStringEncodingException;
 import org.apache.asn1new.ldap.pojo.LdapMessage;
 import org.apache.asn1new.ldap.pojo.ModifyRequest;
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.LdapStringEncodingException;
+import org.apache.ldap.common.name.LdapDN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchRequestGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchRequestGrammar.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchRequestGrammar.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchRequestGrammar.java Fri Dec  9 02:57:13 2005
@@ -34,11 +34,11 @@
 import org.apache.asn1.codec.util.StringUtils;
 import org.apache.asn1new.ldap.codec.LdapConstants;
 import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.codec.primitives.LdapStringEncodingException;
 import org.apache.asn1new.ldap.pojo.LdapMessage;
 import org.apache.asn1new.ldap.pojo.SearchRequest;
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.LdapStringEncodingException;
+import org.apache.ldap.common.name.LdapDN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultEntryGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultEntryGrammar.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultEntryGrammar.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultEntryGrammar.java Fri Dec  9 02:57:13 2005
@@ -29,11 +29,11 @@
 import org.apache.asn1.codec.util.StringUtils;
 import org.apache.asn1new.ldap.codec.LdapConstants;
 import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.codec.primitives.LdapStringEncodingException;
 import org.apache.asn1new.ldap.pojo.LdapMessage;
 import org.apache.asn1new.ldap.pojo.SearchResultEntry;
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.LdapStringEncodingException;
+import org.apache.ldap.common.name.LdapDN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultReferenceGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultReferenceGrammar.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultReferenceGrammar.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultReferenceGrammar.java Fri Dec  9 02:57:13 2005
@@ -26,10 +26,10 @@
 import org.apache.asn1new.ber.tlv.UniversalTag;
 import org.apache.asn1new.ldap.codec.LdapConstants;
 import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapURL;
-import org.apache.asn1new.ldap.codec.primitives.LdapURLEncodingException;
 import org.apache.asn1new.ldap.pojo.LdapMessage;
 import org.apache.asn1new.ldap.pojo.SearchResultReference;
+import org.apache.ldap.common.url.LdapURL;
+import org.apache.ldap.common.url.LdapURLEncodingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/AddRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/AddRequest.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/AddRequest.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/AddRequest.java Fri Dec  9 02:57:13 2005
@@ -22,8 +22,8 @@
 import org.apache.asn1new.ber.tlv.Value;
 import org.apache.asn1.codec.util.StringUtils;
 import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.name.LdapDN;
 import org.apache.ldap.common.util.AttributeUtils;
 
 import org.slf4j.Logger;

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/AttributeValueAssertion.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/AttributeValueAssertion.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/AttributeValueAssertion.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/AttributeValueAssertion.java Fri Dec  9 02:57:13 2005
@@ -17,7 +17,7 @@
 package org.apache.asn1new.ldap.pojo;
 
 import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
+import org.apache.ldap.common.LdapString;
 
 
 /**

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/BindRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/BindRequest.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/BindRequest.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/BindRequest.java Fri Dec  9 02:57:13 2005
@@ -23,8 +23,8 @@
 import org.apache.asn1new.ber.tlv.Length;
 import org.apache.asn1new.ber.tlv.Value;
 import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
 import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.name.LdapDN;
 
 
 /**

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/CompareRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/CompareRequest.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/CompareRequest.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/CompareRequest.java Fri Dec  9 02:57:13 2005
@@ -24,9 +24,9 @@
 import org.apache.asn1new.ber.tlv.UniversalTag;
 import org.apache.asn1new.ber.tlv.Value;
 import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
 import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.name.LdapDN;
 
 
 /**

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/Control.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/Control.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/Control.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/Control.java Fri Dec  9 02:57:13 2005
@@ -24,8 +24,8 @@
 import org.apache.asn1new.ber.tlv.Length;
 import org.apache.asn1new.ber.tlv.UniversalTag;
 import org.apache.asn1new.ber.tlv.Value;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
 import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.LdapString;
 
 
 /**

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/DelRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/DelRequest.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/DelRequest.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/DelRequest.java Fri Dec  9 02:57:13 2005
@@ -22,7 +22,7 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1new.ber.tlv.Length;
 import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
+import org.apache.ldap.common.name.LdapDN;
 
 
 /**

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/LdapResult.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/LdapResult.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/LdapResult.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/LdapResult.java Fri Dec  9 02:57:13 2005
@@ -22,10 +22,10 @@
 import org.apache.asn1new.ber.tlv.UniversalTag;
 import org.apache.asn1new.ber.tlv.Value;
 import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.codec.primitives.LdapURL;
 import org.apache.asn1new.ldap.codec.utils.LdapResultEnum;
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.name.LdapDN;
+import org.apache.ldap.common.url.LdapURL;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyDNRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyDNRequest.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyDNRequest.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyDNRequest.java Fri Dec  9 02:57:13 2005
@@ -23,8 +23,8 @@
 import org.apache.asn1new.ber.tlv.Length;
 import org.apache.asn1new.ber.tlv.Value;
 import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapRDN;
+import org.apache.ldap.common.name.LdapDN;
+import org.apache.ldap.common.name.LdapRDN;
 
 /**
  * A ModifyDNRequest Message. Its syntax is :

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyRequest.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyRequest.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyRequest.java Fri Dec  9 02:57:13 2005
@@ -22,8 +22,8 @@
 import org.apache.asn1new.ber.tlv.Value;
 import org.apache.asn1.codec.util.StringUtils;
 import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.name.LdapDN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SaslCredentials.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SaslCredentials.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SaslCredentials.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SaslCredentials.java Fri Dec  9 02:57:13 2005
@@ -23,7 +23,7 @@
 import org.apache.asn1new.ber.tlv.Length;
 import org.apache.asn1new.ber.tlv.Value;
 import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
+import org.apache.ldap.common.LdapString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchRequest.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchRequest.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchRequest.java Fri Dec  9 02:57:13 2005
@@ -21,10 +21,10 @@
 import org.apache.asn1new.ber.tlv.UniversalTag;
 import org.apache.asn1new.ber.tlv.Value;
 import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
 import org.apache.asn1new.ldap.pojo.filters.Filter;
 import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.name.LdapDN;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.BufferOverflowException;

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchResultEntry.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchResultEntry.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchResultEntry.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchResultEntry.java Fri Dec  9 02:57:13 2005
@@ -22,8 +22,8 @@
 import org.apache.asn1new.ber.tlv.Value;
 import org.apache.asn1.codec.util.StringUtils;
 import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.name.LdapDN;
 import org.apache.ldap.common.util.AttributeUtils;
 
 import java.nio.BufferOverflowException;

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchResultReference.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchResultReference.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchResultReference.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchResultReference.java Fri Dec  9 02:57:13 2005
@@ -20,7 +20,7 @@
 import org.apache.asn1new.ber.tlv.Length;
 import org.apache.asn1new.ber.tlv.Value;
 import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapURL;
+import org.apache.ldap.common.url.LdapURL;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/ExtensibleMatchFilter.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/ExtensibleMatchFilter.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/ExtensibleMatchFilter.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/ExtensibleMatchFilter.java Fri Dec  9 02:57:13 2005
@@ -24,8 +24,8 @@
 import org.apache.asn1new.ber.tlv.UniversalTag;
 import org.apache.asn1new.ber.tlv.Value;
 import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
 import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.LdapString;
 
 
 /**

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/PresentFilter.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/PresentFilter.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/PresentFilter.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/PresentFilter.java Fri Dec  9 02:57:13 2005
@@ -22,7 +22,7 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1new.ber.tlv.Length;
 import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
+import org.apache.ldap.common.LdapString;
 
 
 /**

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/SubstringFilter.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/SubstringFilter.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/SubstringFilter.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/SubstringFilter.java Fri Dec  9 02:57:13 2005
@@ -26,7 +26,7 @@
 import org.apache.asn1new.ber.tlv.UniversalTag;
 import org.apache.asn1new.ber.tlv.Value;
 import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
+import org.apache.ldap.common.LdapString;
 
 
 /**

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchRequestTest.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchRequestTest.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchRequestTest.java Fri Dec  9 02:57:13 2005
@@ -25,7 +25,6 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1new.ber.Asn1Decoder;
 import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
 import org.apache.asn1new.ldap.pojo.AttributeValueAssertion;
 import org.apache.asn1new.ldap.pojo.Control;
 import org.apache.asn1new.ldap.pojo.LdapMessage;
@@ -37,6 +36,7 @@
 import org.apache.asn1new.ldap.pojo.filters.PresentFilter;
 import org.apache.asn1new.ldap.pojo.filters.SubstringFilter;
 import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.LdapString;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultReferenceTest.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultReferenceTest.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultReferenceTest.java Fri Dec  9 02:57:13 2005
@@ -26,11 +26,11 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1new.ber.Asn1Decoder;
 import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.codec.primitives.LdapURL;
-import org.apache.asn1new.ldap.codec.primitives.LdapURLEncodingException;
 import org.apache.asn1new.ldap.pojo.LdapMessage;
 import org.apache.asn1new.ldap.pojo.SearchResultReference;
 import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.url.LdapURL;
+import org.apache.ldap.common.url.LdapURLEncodingException;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/primitives/LdapStringTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/primitives/LdapStringTest.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/primitives/LdapStringTest.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/primitives/LdapStringTest.java Fri Dec  9 02:57:13 2005
@@ -18,6 +18,9 @@
 
 import java.io.UnsupportedEncodingException;
 
+import org.apache.ldap.common.LdapString;
+import org.apache.ldap.common.LdapStringEncodingException;
+
 import junit.framework.Assert;
 import junit.framework.TestCase;
 

Modified: directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/primitives/LdapUrlTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/primitives/LdapUrlTest.java?rev=355447&r1=355446&r2=355447&view=diff
==============================================================================
--- directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/primitives/LdapUrlTest.java (original)
+++ directory/shared/ldap/branches/DN-refactoring/apache2-provider/src/test/org/apache/asn1new/ldap/codec/primitives/LdapUrlTest.java Fri Dec  9 02:57:13 2005
@@ -19,7 +19,8 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.asn1new.ldap.codec.primitives.LdapURL;
+import org.apache.ldap.common.url.LdapURL;
+import org.apache.ldap.common.url.LdapURLEncodingException;
 
 /**
  * Test the class LdapURL