directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r365817 [3/4] - in /directory/trunk/ldap-common: ./ src/main/java/org/apache/ldap/common/asn1/ src/main/java/org/apache/ldap/common/asn1/codec/ src/main/java/org/apache/ldap/common/asn1/codec/grammar/ src/main/java/org/apache/ldap/common/as...
Date Wed, 04 Jan 2006 04:11:55 GMT
Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/search/controls/PSearchControlGrammar.java (from r365811, directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/psearch/PSearchControlGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/search/controls/PSearchControlGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/search/controls/PSearchControlGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/psearch/PSearchControlGrammar.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/psearch/PSearchControlGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/search/controls/PSearchControlGrammar.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.pojo.psearch;
+package org.apache.ldap.common.codec.search.controls;
 
 import org.apache.asn1.ber.IAsn1Container;
 import org.apache.asn1.ber.grammar.AbstractGrammar;
@@ -28,7 +28,7 @@
 import org.apache.asn1.util.BooleanDecoderException;
 import org.apache.asn1.util.IntegerDecoder;
 import org.apache.asn1.util.IntegerDecoderException;
-import org.apache.ldap.common.asn1.codec.grammar.LdapStatesEnum;
+import org.apache.ldap.common.codec.LdapStatesEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/search/controls/PSearchControlGrammar.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/search/controls/PSearchControlStatesEnum.java (from r365811, directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/psearch/PSearchControlStatesEnum.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/search/controls/PSearchControlStatesEnum.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/search/controls/PSearchControlStatesEnum.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/psearch/PSearchControlStatesEnum.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/psearch/PSearchControlStatesEnum.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/search/controls/PSearchControlStatesEnum.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.pojo.psearch;
+package org.apache.ldap.common.codec.search.controls;
 
 
 import org.apache.asn1.ber.grammar.IStates;

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/search/controls/PSearchControlStatesEnum.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/unbind/UnBindRequest.java (from r365811, directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/UnBindRequest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/unbind/UnBindRequest.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/unbind/UnBindRequest.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/UnBindRequest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/UnBindRequest.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/unbind/UnBindRequest.java Tue Jan  3 20:10:09 2006
@@ -14,14 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.pojo;
+package org.apache.ldap.common.codec.unbind;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 import org.apache.asn1.codec.EncoderException;
-import org.apache.ldap.common.asn1.codec.LdapConstants;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.codec.LdapConstants;
+import org.apache.ldap.common.codec.LdapMessage;
 
 
 /**

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/unbind/UnBindRequest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/unbind/UnBindRequestGrammar.java (from r365811, directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/UnBindRequestGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/unbind/UnBindRequestGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/unbind/UnBindRequestGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/UnBindRequestGrammar.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/UnBindRequestGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/unbind/UnBindRequestGrammar.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec.grammar;
+package org.apache.ldap.common.codec.unbind;
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.ber.grammar.IGrammar;
@@ -23,10 +23,10 @@
 import org.apache.asn1.ber.grammar.GrammarAction;
 import org.apache.asn1.ber.IAsn1Container;
 import org.apache.asn1.ber.tlv.TLV;
-import org.apache.ldap.common.asn1.codec.LdapConstants;
-import org.apache.ldap.common.asn1.codec.LdapMessageContainer;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
-import org.apache.ldap.common.asn1.pojo.UnBindRequest;
+import org.apache.ldap.common.codec.LdapConstants;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.LdapStatesEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/unbind/UnBindRequestGrammar.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/AttributeTypeAndValue.java (from r365811, directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/AttributeTypeAndValue.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/AttributeTypeAndValue.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/AttributeTypeAndValue.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/AttributeTypeAndValue.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/AttributeTypeAndValue.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/AttributeTypeAndValue.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec.primitives;
+package org.apache.ldap.common.codec.util;
 
 import javax.naming.InvalidNameException;
 

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/DNParser.java (from r365811, directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/DNParser.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/DNParser.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/DNParser.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/DNParser.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/DNParser.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/DNParser.java Tue Jan  3 20:10:09 2006
@@ -14,14 +14,13 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec.primitives;
+package org.apache.ldap.common.codec.util;
 
 import java.util.List;
 
 import javax.naming.InvalidNameException;
 import javax.naming.Name;
 
-import org.apache.ldap.common.asn1.codec.utils.DNUtils;
 import org.apache.ldap.common.util.StringTools;
 
 import javax.naming.NameParser ;

Added: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/DNUtils.java
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/DNUtils.java?rev=365817&view=auto
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/DNUtils.java (added)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/DNUtils.java Tue Jan  3 20:10:09 2006
@@ -0,0 +1,618 @@
+/*
+ *   Copyright 2005 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package org.apache.ldap.common.codec.util;
+
+import org.apache.ldap.common.util.StringTools;
+
+/**
+ * Utility class used by the LdapDN Parser.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class DNUtils
+{
+    //~ Static fields/initializers -----------------------------------------------------------------
+
+    /** <safe-init-char>    ::= [0x01-0x09] | 0x0B | 0x0C | [0x0E-0x1F] | [0x21-0x39] | 0x3B | [0x3D-0x7F] */
+    private static final boolean[] SAFE_INIT_CHAR =
+    {
+        false, true, true, true, true, true, true, true, true, true, false, true, true, false,
+        true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+        true, true, true, false, true, true, true, true, true, true, true, true, true, true, true,
+        true, true, true, true, true, true, true, true, true, true, true, true, true, true, false,
+        true, false, true, true, true, true, true, true, true, true, true, true, true, true, true,
+        true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+        true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+        true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+        true, true, true, true, true, true, true, true, true
+    };
+
+    /** <safe-char>        ::= [0x01-0x09] | 0x0B | 0x0C | [0x0E-0x7F] */
+    private static final boolean[] SAFE_CHAR =
+    {
+        false, true, true, true, true, true, true, true, true, true, false, true, true, false,
+        true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+        true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+        true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+        true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+        true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+        true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+        true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+        true, true, true, true, true, true, true, true, true
+    };
+
+    /** <base64-char>    ::= 0x2B | 0x2F | [0x30-0x39] | 0x3D | [0x41-0x5A] | [0x61-0x7A] */
+    private static final boolean[] BASE64_CHAR =
+    {
+        false, false, false, false, false, false, false, false, false, false, false, false, false,
+        false, false, false, false, false, false, false, false, false, false, false, false, false,
+        false, false, false, false, false, false, false, false, false, false, false, false, false,
+        false, false, false, false, true, false, false, false, true, true, true, true, true, true,
+        true, true, true, true, true, false, false, false, true, false, false, false, true, true,
+        true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+        true, true, true, true, true, true, true, true, true, false, false, false, false, false,
+        false, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+        true, true, true, true, true, true, true, true, true, true, true, true, false, false,
+        false, false, false
+    };
+
+    /** '"'  | '#'  | '+'  | ','  | [0-9] | ';'  | '<'  | '='  | '>'  | [A-F] | '\' | [a-f] 
+     * 0x22 | 0x23 | 0x2B | 0x2C | [0x30-0x39] | 0x3B | 0x3C | 0x3D | 0x3E | [0x41-0x46] | 0x5C | [0x61-0x66] */
+    private static final boolean[] PAIR_CHAR =
+    {
+        false, false, false, false, false, false, false, false, false, false, false, false, false,
+        false, false, false, false, false, false, false, false, false, false, false, false, false,
+        false, false, false, false, false, false, false, false, true, true, false, false, false,
+        false, false, false, false, true, true, false, false, false, true, true, true, true, true,
+        true, true, true, true, true, false, true, true, true, true, false, false, true, true,
+        true, true, true, true, false, false, false, false, false, false, false, false, false,
+        false, false, false, false, false, false, false, false, false, false, false, false, true,
+        false, false, false, false, true, true, true, true, true, true, false, false, false, false,
+        false, false, false, false, false, false, false, false, false, false, false, false, false,
+        false, false, false, false, false, false, false, false
+    };
+
+    /** "oid." static */
+    public static final char[] OID_LOWER = new char[] { 'o', 'i', 'd', '.' };
+
+    /** "OID." static */
+    public static final char[] OID_UPPER = new char[] { 'O', 'I', 'D', '.' };
+    
+    /** "oid." static */
+    public static final byte[] OID_LOWER_BYTES = new byte[] { 'o', 'i', 'd', '.' };
+
+    /** "OID." static */
+    public static final byte[] OID_UPPER_BYTES = new byte[] { 'O', 'I', 'D', '.' };
+
+    /** A value if we got an error while parsing */
+    public static final int PARSING_ERROR = -1;
+
+    /** If an hex pair contains only one char, this value is returned */ 
+    public static final int BAD_HEX_PAIR = -2;
+    
+    /** A constant representing one char length */
+    public static final int ONE_CHAR = 1;
+
+    /** A constant representing two chars length */
+    public static final int TWO_CHARS = 2;
+
+    /** A constant representing one byte length */
+    public static final int ONE_BYTE = 1;
+
+    /** A constant representing two bytes length */
+    public static final int TWO_BYTES = 2;
+
+    //~ Methods ------------------------------------------------------------------------------------
+
+    /**
+     * Walk the buffer while characters are Safe String characters :
+     *  <safe-string>    ::= <safe-init-char> <safe-chars>
+     *  <safe-init-char> ::= [0x01-0x09] | 0x0B | 0x0C | [0x0E-0x1F] | [0x21-0x39] | 0x3B | [0x3D-0x7F]
+     *  <safe-chars>     ::= <safe-char> <safe-chars> |
+     *  <safe-char>      ::= [0x01-0x09] | 0x0B | 0x0C | [0x0E-0x7F]
+     *
+     * @param byteArray The buffer which contains the data
+     * @param index Current position in the buffer
+     *
+     * @return The position of the first character which is not a Safe Char
+     */
+    public static int parseSafeString( byte[] byteArray, int index )
+    {
+        if ( ( byteArray == null ) || ( byteArray.length == 0 ) || ( index < 0 ) ||
+                ( index >= byteArray.length ) )
+        {
+            return -1;
+        }
+        else
+        {
+            byte c = byteArray[index];
+
+            if ( ( c > 127 ) || ( SAFE_INIT_CHAR[c] == false ) )
+            {
+                return -1;
+            }
+
+            index++;
+
+            while ( index < byteArray.length )
+            {
+                c = byteArray[index];
+
+                if ( ( c > 127 ) || ( SAFE_CHAR[c] == false ) )
+                {
+                    break;
+                }
+
+                index++;
+            }
+
+            return index;
+        }
+    }
+
+    /**
+     * Walk the buffer while characters are Alpha characters :
+     *  <alpha>    ::= [0x41-0x5A] | [0x61-0x7A]
+     * 
+     * @param byteArray The buffer which contains the data
+     * @param index Current position in the buffer
+     *
+     * @return The position of the first character which is not an Alpha Char
+     */
+    public static int parseAlphaASCII( byte[] byteArray, int index )
+    {
+        if ( ( byteArray == null ) || ( byteArray.length == 0 ) || ( index < 0 ) ||
+                ( index >= byteArray.length ) )
+        {
+            return -1;
+        }
+        else
+        {
+            byte c = byteArray[index++];
+
+            if ( ( c > 127 ) || ( StringTools.ALPHA[c] == false ) )
+            {
+                return -1;
+            }
+            else
+            {
+                return index;
+            }
+        }
+    }
+
+    /**
+     * Walk the buffer while characters are Alpha characters :
+     *  <alpha>    ::= [0x41-0x5A] | [0x61-0x7A]
+     * 
+     * @param charArray The buffer which contains the data
+     * @param index Current position in the buffer
+     *
+     * @return The position of the first character which is not an Alpha Char
+     */
+    public static int parseAlphaASCII( char[] charArray, int index )
+    {
+        if ( ( charArray == null ) || ( charArray.length == 0 ) || ( index < 0 ) ||
+                ( index >= charArray.length ) )
+        {
+            return PARSING_ERROR;
+        }
+        else
+        {
+            char c = charArray[index++];
+
+            if ( ( c > 127 ) || ( StringTools.ALPHA[c] == false ) )
+            {
+                return PARSING_ERROR;
+            }
+            else
+            {
+                return index;
+            }
+        }
+    }
+
+    /**
+     * Check if the current character is a Pair Char
+     *  <pairchar>    ::= ',' | '=' | '+' | '<' | '>' | '#' | ';' | '\' | '"' | [0-9a-fA-F] [0-9a-fA-F]
+     *  
+     * @param byteArray The buffer which contains the data
+     * @param index Current position in the buffer
+     *
+     * @return <code>true</code> if the current character is a Pair Char
+     */
+    public static boolean isPairChar( byte[] byteArray, int index )
+    {
+        if ( ( byteArray == null ) || ( byteArray.length == 0 ) || ( index < 0 ) ||
+                ( index >= byteArray.length ) )
+        {
+            return false;
+        }
+        else
+        {
+            byte c = byteArray[index];
+
+            if ( ( c > 127 ) || ( PAIR_CHAR[c] == false ) )
+            {
+                return false;
+            }
+            else
+            {
+                if ( StringTools.isHex( byteArray, index++ ) )
+                {
+                    return StringTools.isHex( byteArray, index );
+                }
+                else
+                {
+                    return true;
+                }
+            }
+        }
+    }
+
+    /**
+     * Check if the current character is a Pair Char
+     *  <pairchar>    ::= ',' | '=' | '+' | '<' | '>' | '#' | ';' | '\' | '"' | [0-9a-fA-F] [0-9a-fA-F]
+     *  
+     * @param charArray The buffer which contains the data
+     * @param index Current position in the buffer
+     *
+     * @return <code>true</code> if the current character is a Pair Char
+     */
+    public static boolean isPairChar( char[] charArray, int index )
+    {
+        if ( ( charArray == null ) || ( charArray.length == 0 ) || ( index < 0 ) ||
+                ( index >= charArray.length ) )
+        {
+            return false;
+        }
+        else
+        {
+            char c = charArray[index];
+
+            if ( ( c > 127 ) || ( PAIR_CHAR[c] == false ) )
+            {
+                return false;
+            }
+            else
+            {
+                if ( StringTools.isHex( charArray, index++ ) )
+                {
+                    return StringTools.isHex( charArray, index );
+                }
+                else
+                {
+                    return true;
+                }
+            }
+        }
+    }
+
+    /**
+     * Check if the current character is a String Char.
+     * Chars are Unicode, not ASCII.
+     *  <stringchar>    ::= [0x00-0xFFFF] - [,=+<>#;\"\n\r]
+     * @param byteArray The buffer which contains the data
+     * @param index Current position in the buffer
+     *
+     * @return The current char if it is a String Char, or '#' (this is
+     * simpler than throwing an exception :)
+     */
+    public static int isStringChar( byte[] byteArray, int index )
+    {
+        if ( ( byteArray == null ) || ( byteArray.length == 0 ) || ( index < 0 ) ||
+                ( index >= byteArray.length ) )
+        {
+            return -1;
+        }
+        else
+        {
+            byte c = byteArray[index];
+
+            if ( ( c == 0x0A ) ||
+                    ( c == 0x0D ) ||
+                    ( c == '"' ) ||
+                    ( c == '#' ) ||
+                    ( c == '+' ) ||
+                    ( c == ',' ) ||
+                    ( c == ';' ) ||
+                    ( c == '<' ) ||
+                    ( c == '=' ) ||
+                    ( c == '>' ) )
+            {
+                return -1;
+            }
+            else
+            {
+                return StringTools.countBytesPerChar(byteArray, index);
+            }
+        }
+    }
+
+    /**
+     * Check if the current character is a String Char.
+     * Chars are Unicode, not ASCII.
+     *  <stringchar>    ::= [0x00-0xFFFF] - [,=+<>#;\"\n\r]
+     * @param charArray The buffer which contains the data
+     * @param index Current position in the buffer
+     *
+     * @return The current char if it is a String Char, or '#' (this is
+     * simpler than throwing an exception :)
+     */
+    public static int isStringChar( char[] charArray, int index )
+    {
+        if ( ( charArray == null ) || ( charArray.length == 0 ) || ( index < 0 ) ||
+                ( index >= charArray.length ) )
+        {
+            return PARSING_ERROR;
+        }
+        else
+        {
+            char c = charArray[index];
+
+            if ( ( c == 0x0A ) ||
+                    ( c == 0x0D ) ||
+                    ( c == '"' ) ||
+                    ( c == '#' ) ||
+                    ( c == '+' ) ||
+                    ( c == ',' ) ||
+                    ( c == ';' ) ||
+                    ( c == '<' ) ||
+                    ( c == '=' ) ||
+                    ( c == '>' ) )
+            {
+                return PARSING_ERROR;
+            }
+            else
+            {
+                return ONE_CHAR;
+            }
+        }
+    }
+
+    /**
+     * Check if the current character is a Quote Char
+     * We are testing Unicode chars
+     *  <quotechar>    ::= [0x00-0xFFFF] - [\"]
+     * 
+     * @param byteArray The buffer which contains the data
+     * @param index Current position in the buffer
+     *
+     * @return <code>true</code> if the current character is a Quote Char
+     */
+    public static int isQuoteChar( byte[] byteArray, int index )
+    {
+        if ( ( byteArray == null ) || ( byteArray.length == 0 ) || ( index < 0 ) ||
+                ( index >= byteArray.length ) )
+        {
+            return -1;
+        }
+        else
+        {
+            byte c = byteArray[index];
+
+            if ( ( c == '\\' ) || ( c == '"' ) )
+            {
+                return -1;
+            }
+            else
+            {
+                return StringTools.countBytesPerChar(byteArray, index);
+            }
+        }
+    }
+
+    /**
+     * Check if the current character is a Quote Char
+     * We are testing Unicode chars
+     *  <quotechar>    ::= [0x00-0xFFFF] - [\"]
+     * 
+     * @param charArray The buffer which contains the data
+     * @param index Current position in the buffer
+     *
+     * @return <code>true</code> if the current character is a Quote Char
+     */
+    public static int isQuoteChar( char[] charArray, int index )
+    {
+        if ( ( charArray == null ) || ( charArray.length == 0 ) || ( index < 0 ) ||
+                ( index >= charArray.length ) )
+        {
+            return PARSING_ERROR;
+        }
+        else
+        {
+            char c = charArray[index];
+
+            if ( ( c == '\\' ) || ( c == '"' ) )
+            {
+                return PARSING_ERROR;
+            }
+            else
+            {
+                return ONE_CHAR;
+            }
+        }
+    }
+
+    /**
+     * Parse an hex pair
+     *   <hexpair>    ::= <hex> <hex>
+     *
+     * @param byteArray The buffer which contains the data
+     * @param index Current position in the buffer
+     *
+     * @return The new position, -1 if the buffer does not contain an HexPair, -2 if the
+     * buffer contains an hex byte but not two.
+     */
+    public static int parseHexPair( byte[] byteArray, int index )
+    {
+        if ( StringTools.isHex( byteArray, index ) )
+        {
+            if ( StringTools.isHex( byteArray, index + 1 ) )
+            {
+                return index + 2;
+            }
+            else
+            {
+                return -2;
+            }
+        }
+        else
+        {
+            return -1;
+        }
+    }
+
+    /**
+     * Parse an hex pair
+     *   <hexpair>    ::= <hex> <hex>
+     *
+     * @param charArray The buffer which contains the data
+     * @param index Current position in the buffer
+     *
+     * @return The new position, -1 if the buffer does not contain an HexPair, -2 if the
+     * buffer contains an hex byte but not two.
+     */
+    public static int parseHexPair( char[] charArray, int index )
+    {
+        if ( StringTools.isHex( charArray, index ) )
+        {
+            if ( StringTools.isHex( charArray, index + 1 ) )
+            {
+                return index + TWO_CHARS;
+            }
+            else
+            {
+                return BAD_HEX_PAIR;
+            }
+        }
+        else
+        {
+            return PARSING_ERROR;
+        }
+    }
+
+    /**
+     * Parse an hex string, which is a list of hex pairs
+     *  <hexstring>    ::= <hexpair> <hexpairs>
+     *  <hexpairs>    ::= <hexpair> <hexpairs> | e
+     *
+     * @param byteArray The buffer which contains the data
+     * @param index Current position in the buffer
+     *
+     * @return Return the first position which is not an hex pair, or -1 if there is no
+     * hexpair at the beginning or if an hexpair is invalid (if we have only one hex instead of 2)
+     */
+    public static int parseHexString( byte[] byteArray, int index )
+    {
+        int result = parseHexPair( byteArray, index );
+
+        if ( result < 0 )
+        {
+            return -1;
+        }
+        else
+        {
+            index += 2;
+        }
+
+        while ( ( result = parseHexPair( byteArray, index ) ) >= 0 )
+        {
+            index += 2;
+        }
+
+        return ( ( result == -2 ) ? -1 : index );
+    }
+
+    /**
+     * Parse an hex string, which is a list of hex pairs
+     *  <hexstring>    ::= <hexpair> <hexpairs>
+     *  <hexpairs>    ::= <hexpair> <hexpairs> | e
+     *
+     * @param charArray The buffer which contains the data
+     * @param index Current position in the buffer
+     *
+     * @return Return the first position which is not an hex pair, or -1 if there is no
+     * hexpair at the beginning or if an hexpair is invalid (if we have only one hex instead of 2)
+     */
+    public static int parseHexString( char[] charArray, int index )
+    {
+        int result = parseHexPair( charArray, index );
+
+        if ( result < 0 )
+        {
+            return PARSING_ERROR;
+        }
+        else
+        {
+            index += TWO_CHARS;
+        }
+
+        while ( ( result = parseHexPair( charArray, index ) ) >= 0 )
+        {
+            index += TWO_CHARS;
+        }
+
+        return ( ( result == BAD_HEX_PAIR ) ? PARSING_ERROR : index );
+    }
+
+    /**
+     * Walk the buffer while characters are Base64 characters : 
+     *     <base64-string>      ::= <base64-char> <base64-chars>
+     *  <base64-chars>       ::= <base64-char> <base64-chars> |
+     *  <base64-char>        ::= 0x2B | 0x2F | [0x30-0x39] | 0x3D | [0x41-0x5A] | [0x61-0x7A]
+     *
+     * @param byteArray The buffer which contains the data
+     * @param index Current position in the buffer
+     *
+     * @return The position of the first character which is not a Base64 Char
+     */
+    public static int parseBase64String( byte[] byteArray, int index )
+    {
+        if ( ( byteArray == null ) || ( byteArray.length == 0 ) || ( index < 0 ) ||
+                ( index >= byteArray.length ) )
+        {
+            return -1;
+        }
+        else
+        {
+            byte c = byteArray[index];
+
+            if ( ( c > 127 ) || ( BASE64_CHAR[c] == false ) )
+            {
+                return -1;
+            }
+
+            index++;
+
+            while ( index < byteArray.length )
+            {
+                c = byteArray[index];
+
+                if ( ( c > 127 ) || ( BASE64_CHAR[c] == false ) )
+                {
+                    break;
+                }
+
+                index++;
+            }
+
+            return index;
+        }
+    }
+
+}

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapDN.java (from r365811, directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapDN.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapDN.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapDN.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapDN.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapDN.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapDN.java Tue Jan  3 20:10:09 2006
@@ -128,7 +128,7 @@
 }
 */
 
-package org.apache.ldap.common.asn1.codec.primitives;
+package org.apache.ldap.common.codec.util;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -141,7 +141,7 @@
 import javax.naming.Name;
 
 import org.apache.ldap.common.util.StringTools;
-import org.apache.ldap.common.asn1.codec.primitives.DNParser;
+import org.apache.ldap.common.codec.util.DNParser;
 
 
 /**

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapDN.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapRDN.java (from r365811, directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapRDN.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapRDN.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapRDN.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapRDN.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapRDN.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapRDN.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec.primitives;
+package org.apache.ldap.common.codec.util;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -27,7 +27,7 @@
 
 import org.apache.commons.collections.MultiHashMap;
 import org.apache.ldap.common.util.StringTools;
-import org.apache.ldap.common.asn1.codec.primitives.AttributeTypeAndValue;
+import org.apache.ldap.common.codec.util.AttributeTypeAndValue;
 
 
 /**

Added: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapResultEnum.java
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapResultEnum.java?rev=365817&view=auto
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapResultEnum.java (added)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapResultEnum.java Tue Jan  3 20:10:09 2006
@@ -0,0 +1,200 @@
+/*
+ *   Copyright 2005 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License";
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package org.apache.ldap.common.codec.util;
+
+/**
+ * This typesafe-enum represent the different resultCode of a LdapResult.
+ * 
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class LdapResultEnum
+{
+    //~ Static fields/initializers -----------------------------------------------------------------
+
+    public static final int SUCCESS                   = 0 ;
+    public static final int OPERATIONS_ERROR          = 1 ;
+    public static final int PROTOCOL_ERROR            = 2 ;
+    public static final int TIME_LIMIT_EXCEEDED       = 3 ;
+    public static final int SIZE_LIMIT_EXCEEDED       = 4 ;
+    public static final int COMPARE_FALSE             = 5 ;
+    public static final int COMPARE_TRUE              = 6 ;
+    public static final int AUTH_METHOD_NOT_SUPPORTED = 7 ;
+    public static final int STRONG_AUTH_REQUIRED      = 8 ;
+
+    // -- 9 reserved --
+    public static final int RESERVED_9                     = 9 ;
+
+    public static final int REFERRAL                       = 10 ; // -- new
+    public static final int ADMIN_LIMIT_EXCEEDED           = 11 ; //  -- new
+    public static final int UNAVAILABLE_CRITICAL_EXTENSION = 12 ; //  -- new
+    public static final int CONFIDENTIALITY_REQUIRED  	   = 13 ; //  -- new
+    public static final int SASL_BIND_IN_PROGRESS     = 14 ; //  -- new
+    public static final int NO_SUCH_ATTRIBUTE         = 16 ;
+    public static final int UNDEFINED_ATTRIBUTE_TYPE  = 17 ;
+    public static final int INAPPROPRIATE_MATCHING    = 18 ;
+    public static final int CONSTRAINT_VIOLATION      = 19 ;
+    public static final int ATTRIBUTE_OR_VALUE_EXISTS = 20 ;
+    public static final int INVALID_ATTRIBUTE_SYNTAX = 21 ;
+
+    // -- 22-31 unused --
+    public static final int UNUSED_22         = 22 ;
+    public static final int UNUSED_23         = 23 ;
+    public static final int UNUSED_24         = 24 ;
+    public static final int UNUSED_25         = 25 ;
+    public static final int UNUSED_26         = 26 ;
+    public static final int UNUSED_27         = 27 ;
+    public static final int UNUSED_28         = 28 ;
+    public static final int UNUSED_29         = 29 ;
+    public static final int UNUSED_30         = 30 ;
+    public static final int UNUSED_31         = 31 ;
+
+    public static final int NO_SUCH_OBJECT    = 32 ;
+    public static final int ALIAS_PROBLEM     = 33 ;
+    public static final int INVALID_DN_SYNTAX = 34 ;
+
+    // Reserved
+    public static final int RESERVED_FOR_UNDEFINED_IS_LEAF = 35 ;
+    
+    public static final int ALIAS_DEREFERENCING_PROBLEM = 36 ;
+
+    //-- 37-47 unused --
+    public static final int UNUSED_37                    = 37 ;
+    public static final int UNUSED_38                    = 38 ;
+    public static final int UNUSED_39                    = 39 ;
+    public static final int UNUSED_40                    = 40 ;
+    public static final int UNUSED_41                    = 41 ;
+    public static final int UNUSED_42                    = 42 ;
+    public static final int UNUSED_43                    = 43 ;
+    public static final int UNUSED_44                    = 44 ;
+    public static final int UNUSED_45                    = 45 ;
+    public static final int UNUSED_46                    = 46 ;
+    public static final int UNUSED_47                    = 47 ;
+
+    public static final int INAPPROPRIATE_AUTHENTICATION = 48 ;
+    public static final int INVALID_CREDENTIALS          = 49 ;
+    public static final int INSUFFICIENT_ACCESS_RIGHTS   = 50 ;
+    public static final int BUSY                         = 51 ;
+    public static final int UNAVAILABLE                  = 52 ;
+    public static final int UNWILLING_TO_PERFORM         = 53 ;
+    public static final int LOOP_DETECT                  = 54 ;
+
+    // -- 55-63 unused --
+    public static final int UNUSED_55                    = 55 ;
+    public static final int UNUSED_56                    = 56 ;
+    public static final int UNUSED_57                    = 57 ;
+    public static final int UNUSED_58                    = 58 ;
+    public static final int UNUSED_59                    = 59 ;
+    public static final int UNUSED_60                    = 60 ;
+    public static final int UNUSED_61                    = 61 ;
+    public static final int UNUSED_62                    = 62 ;
+    public static final int UNUSED_63                    = 63 ;
+
+    public static final int NAMING_VIOLATION             = 64 ;
+    public static final int OBJECT_CLASS_VIOLATION       = 65 ;
+    public static final int NOT_ALLOWED_ON_NON_LEAF      = 66 ;
+    public static final int NOT_ALLOWED_ON_RDN           = 67 ;
+    public static final int ENTRY_ALREADY_EXISTS         = 68 ;
+    public static final int OBJECT_CLASS_MODS_PROHIBITED = 69 ;
+
+    // -- 70 reserved for CLDAP --
+    public static final int RESERVED_FOR_CLDAP    = 70 ;
+
+    public static final int AFFECTS_MULTIPLE_DSAS = 71 ; // -- new
+
+    // -- 72-79 unused --
+    public static final int UNUSED_72 = 72 ;
+    public static final int UNUSED_73 = 73 ;
+    public static final int UNUSED_74 = 74 ;
+    public static final int UNUSED_75 = 75 ;
+    public static final int UNUSED_76 = 76 ;
+    public static final int UNUSED_77 = 77 ;
+    public static final int UNUSED_78 = 78 ;
+    public static final int UNUSED_79 = 79 ;
+
+    public static final int OTHER = 80 ;
+
+    // -- 81-90 reserved for APIs --
+    public static final int RESERVED_FOR_APIS_81 = 81 ;
+    public static final int RESERVED_FOR_APIS_82 = 82 ;
+    public static final int RESERVED_FOR_APIS_83 = 83 ;
+    public static final int RESERVED_FOR_APIS_84 = 84 ;
+    public static final int RESERVED_FOR_APIS_85 = 85 ;
+    public static final int RESERVED_FOR_APIS_86 = 86 ;
+    public static final int RESERVED_FOR_APIS_87 = 87 ;
+    public static final int RESERVED_FOR_APIS_88 = 88 ;
+    public static final int RESERVED_FOR_APIS_89 = 89 ;
+    public static final int RESERVED_FOR_APIS_90 = 90 ;
+    
+    public static final String errorCode(int resultCode) 
+    {
+        switch (resultCode)
+        {
+        	case RESERVED_9 : return "Reserved (9)";
+        	case UNUSED_22  : return "Unused (22)";
+        	case UNUSED_23  : return "Unused (23)";
+        	case UNUSED_24  : return "Unused (24)";
+        	case UNUSED_25  : return "Unused (25)";
+        	case UNUSED_26  : return "Unused (26)";
+        	case UNUSED_27  : return "Unused (27)";
+        	case UNUSED_28  : return "Unused (28)";
+        	case UNUSED_29  : return "Unused (29)";
+        	case UNUSED_30  : return "Unused (30)";
+        	case UNUSED_31  : return "Unused (31)";
+        	case RESERVED_FOR_UNDEFINED_IS_LEAF : return "Reserved for undefined is leaf (35)";
+			case UNUSED_37 : return "unused (37)";
+			case UNUSED_38 : return "unused (38)";
+			case UNUSED_39 : return "unused (39)";
+			case UNUSED_40 : return "unused (40)";
+			case UNUSED_41 : return "unused (41)";
+			case UNUSED_42 : return "unused (42)";
+			case UNUSED_43 : return "unused (43)";
+			case UNUSED_44 : return "unused (44)";
+			case UNUSED_45 : return "unused (45)";
+			case UNUSED_46 : return "unused (46)";
+			case UNUSED_47 : return "unused (47)";
+			case UNUSED_55 : return "unused (55)";
+			case UNUSED_56 : return "unused (56)";
+			case UNUSED_57 : return "unused (57)";
+			case UNUSED_58 : return "unused (58)";
+			case UNUSED_59 : return "unused (59)";
+			case UNUSED_60 : return "unused (60)";
+			case UNUSED_61 : return "unused (61)";
+			case UNUSED_62 : return "unused (62)";
+			case UNUSED_63 : return "unused (63)";
+			case RESERVED_FOR_CLDAP : return "RESERVED_FOR_CLDAP (70)";
+			case UNUSED_72 : return "unused (72)";
+			case UNUSED_73 : return "unused (73)";
+			case UNUSED_74 : return "unused (74)";
+			case UNUSED_75 : return "unused (75)";
+			case UNUSED_76 : return "unused (76)";
+			case UNUSED_77 : return "unused (77)";
+			case UNUSED_78 : return "unused (78)";
+			case UNUSED_79 : return "unused (79)";
+			case RESERVED_FOR_APIS_81 : return "RESERVED_FOR_APIS (81)";
+			case RESERVED_FOR_APIS_82 : return "RESERVED_FOR_APIS (82)";
+			case RESERVED_FOR_APIS_83 : return "RESERVED_FOR_APIS (83)";
+			case RESERVED_FOR_APIS_84 : return "RESERVED_FOR_APIS (84)";
+			case RESERVED_FOR_APIS_85 : return "RESERVED_FOR_APIS (85)";
+			case RESERVED_FOR_APIS_86 : return "RESERVED_FOR_APIS (86)";
+			case RESERVED_FOR_APIS_87 : return "RESERVED_FOR_APIS (87)";
+			case RESERVED_FOR_APIS_88 : return "RESERVED_FOR_APIS (88)";
+			case RESERVED_FOR_APIS_89 : return "RESERVED_FOR_APIS (89)";
+			case RESERVED_FOR_APIS_90 : return "RESERVED_FOR_APIS (90)";
+        	default : return "UNKOWN";
+        }
+    }
+}

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapString.java (from r365811, directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapString.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapString.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapString.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapString.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapString.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapString.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec.primitives;
+package org.apache.ldap.common.codec.util;
 
 import java.io.UnsupportedEncodingException;
 

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapString.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapStringEncodingException.java (from r365811, directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapStringEncodingException.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapStringEncodingException.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapStringEncodingException.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapStringEncodingException.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapStringEncodingException.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapStringEncodingException.java Tue Jan  3 20:10:09 2006
@@ -15,7 +15,7 @@
  *
  */
 
-package org.apache.ldap.common.asn1.codec.primitives;
+package org.apache.ldap.common.codec.util;
 
 /**
  * Thrown when a LdapStringEncodingDecoder has encountered a failure condition during 

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapStringEncodingException.java
------------------------------------------------------------------------------
    svn:executable = *

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapURL.java (from r365811, directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapURL.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapURL.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapURL.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapURL.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapURL.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapURL.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec.primitives;
+package org.apache.ldap.common.codec.util;
 
 import org.apache.asn1.codec.DecoderException;
 
@@ -23,8 +23,8 @@
 
 import org.apache.ldap.common.filter.FilterParserImpl;
 import org.apache.ldap.common.util.StringTools;
-import org.apache.ldap.common.asn1.codec.primitives.LdapDN;
-import org.apache.ldap.common.asn1.codec.primitives.LdapString;
+import org.apache.ldap.common.codec.util.LdapDN;
+import org.apache.ldap.common.codec.util.LdapString;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapURL.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapURLEncodingException.java (from r365811, directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapURLEncodingException.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapURLEncodingException.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapURLEncodingException.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapURLEncodingException.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapURLEncodingException.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/LdapURLEncodingException.java Tue Jan  3 20:10:09 2006
@@ -15,7 +15,7 @@
  *
  */
 
-package org.apache.ldap.common.asn1.codec.primitives;
+package org.apache.ldap.common.codec.util;
 
 /**
  * Thrown when a LdapStringEncodingDecoder has encountered a failure condition during 

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/RDNParser.java (from r365811, directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/RDNParser.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/RDNParser.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/RDNParser.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/RDNParser.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/RDNParser.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/codec/util/RDNParser.java Tue Jan  3 20:10:09 2006
@@ -14,13 +14,12 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec.primitives;
+package org.apache.ldap.common.codec.util;
 
 import javax.naming.InvalidNameException;
 
-import org.apache.ldap.common.asn1.codec.utils.DNUtils;
 import org.apache.ldap.common.util.StringTools;
-import org.apache.ldap.common.asn1.codec.primitives.LdapRDN;
+import org.apache.ldap.common.codec.util.LdapRDN;
 
 
 /**

Modified: directory/trunk/ldap-common/src/test/java/org/apache/ldap/asn1/pojo/psearch/PSearchControlTest.java
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/asn1/pojo/psearch/PSearchControlTest.java?rev=365817&r1=365816&r2=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/asn1/pojo/psearch/PSearchControlTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/asn1/pojo/psearch/PSearchControlTest.java Tue Jan  3 20:10:09 2006
@@ -22,9 +22,9 @@
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.ber.Asn1Decoder;
-import org.apache.ldap.common.asn1.codec.LdapDecoder;
-import org.apache.ldap.common.asn1.pojo.psearch.PSearchControl;
-import org.apache.ldap.common.asn1.pojo.psearch.PSearchControlContainer;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.search.controls.PSearchControl;
+import org.apache.ldap.common.codec.search.controls.PSearchControlContainer;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/LdapDecoderTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/LdapDecoderTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/LdapDecoderTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/LdapDecoderTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/LdapDecoderTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/LdapDecoderTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/LdapDecoderTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
@@ -23,10 +23,12 @@
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
 import org.apache.asn1.ber.tlv.TLVStateEnum;
-import org.apache.ldap.common.asn1.pojo.SimpleAuthentication;
 import org.apache.ldap.common.util.StringTools;
-import org.apache.ldap.common.asn1.pojo.BindRequest;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.bind.BindRequest;
+import org.apache.ldap.common.codec.bind.SimpleAuthentication;
 
 import java.nio.ByteBuffer;
 

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/LdapDecoderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/abandon/AbandonRequestTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/AbandonRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/abandon/AbandonRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/abandon/AbandonRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/AbandonRequestTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/AbandonRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/abandon/AbandonRequestTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.abandon;
 
 import java.nio.ByteBuffer;
 
@@ -22,8 +22,10 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.AbandonRequest;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.abandon.AbandonRequest;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/abandon/AbandonRequestTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/add/AddRequestTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/AddRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/add/AddRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/add/AddRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/AddRequestTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/AddRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/add/AddRequestTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.add;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
@@ -29,8 +29,10 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.AddRequest;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.add.AddRequest;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/add/AddRequestTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/add/AddResponseTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/AddResponseTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/add/AddResponseTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/add/AddResponseTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/AddResponseTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/AddResponseTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/add/AddResponseTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.add;
 
 import java.nio.ByteBuffer;
 
@@ -22,8 +22,10 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.AddResponse;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.add.AddResponse;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/add/AddResponseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/bind/BindRequestTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/BindRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/bind/BindRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/bind/BindRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/BindRequestTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/BindRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/bind/BindRequestTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.bind;
 
 import java.nio.ByteBuffer;
 
@@ -22,10 +22,12 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.BindRequest;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
-import org.apache.ldap.common.asn1.pojo.SaslCredentials;
-import org.apache.ldap.common.asn1.pojo.SimpleAuthentication;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.bind.BindRequest;
+import org.apache.ldap.common.codec.bind.SaslCredentials;
+import org.apache.ldap.common.codec.bind.SimpleAuthentication;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/bind/BindRequestTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/bind/BindResponseTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/BindResponseTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/bind/BindResponseTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/bind/BindResponseTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/BindResponseTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/BindResponseTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/bind/BindResponseTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.bind;
 
 import java.nio.ByteBuffer;
 
@@ -22,8 +22,10 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.BindResponse;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.bind.BindResponse;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/bind/BindResponseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/compare/CompareRequestTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/CompareRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/compare/CompareRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/compare/CompareRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/CompareRequestTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/CompareRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/compare/CompareRequestTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.compare;
 
 import java.nio.ByteBuffer;
 
@@ -24,8 +24,10 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.CompareRequest;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.compare.CompareRequest;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/compare/CompareRequestTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/compare/CompareResponseTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/CompareResponseTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/compare/CompareResponseTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/compare/CompareResponseTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/CompareResponseTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/CompareResponseTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/compare/CompareResponseTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.compare;
 
 import java.nio.ByteBuffer;
 
@@ -22,8 +22,10 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.CompareResponse;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.compare.CompareResponse;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/compare/CompareResponseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/del/DelRequestTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/DelRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/del/DelRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/del/DelRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/DelRequestTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/DelRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/del/DelRequestTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.del;
 
 import java.nio.ByteBuffer;
 
@@ -24,8 +24,10 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.DelRequest;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.del.DelRequest;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/del/DelRequestTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/del/DelResponseTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/DelResponseTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/del/DelResponseTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/del/DelResponseTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/DelResponseTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/DelResponseTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/del/DelResponseTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.del;
 
 import java.nio.ByteBuffer;
 
@@ -22,8 +22,10 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.DelResponse;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.del.DelResponse;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/del/DelResponseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/extended/ExtendedRequestTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ExtendedRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/extended/ExtendedRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/extended/ExtendedRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ExtendedRequestTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ExtendedRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/extended/ExtendedRequestTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.extended;
 
 import java.nio.ByteBuffer;
 
@@ -24,8 +24,10 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.ExtendedRequest;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.extended.ExtendedRequest;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/extended/ExtendedRequestTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/extended/ExtendedResponseTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ExtendedResponseTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/extended/ExtendedResponseTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/extended/ExtendedResponseTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ExtendedResponseTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ExtendedResponseTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/extended/ExtendedResponseTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.extended;
 
 import java.nio.ByteBuffer;
 
@@ -24,8 +24,10 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.ExtendedResponse;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.extended.ExtendedResponse;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/extended/ExtendedResponseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modify/ModifyRequestTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modify/ModifyRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modify/ModifyRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyRequestTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modify/ModifyRequestTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.modify;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -30,8 +30,10 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
-import org.apache.ldap.common.asn1.pojo.ModifyRequest;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.modify.ModifyRequest;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modify/ModifyRequestTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modify/ModifyResponseTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyResponseTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modify/ModifyResponseTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modify/ModifyResponseTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyResponseTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyResponseTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modify/ModifyResponseTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.modify;
 
 import java.nio.ByteBuffer;
 
@@ -22,8 +22,10 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
-import org.apache.ldap.common.asn1.pojo.ModifyResponse;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.modify.ModifyResponse;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modify/ModifyResponseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modifyDn/ModifyDNRequestTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyDNRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modifyDn/ModifyDNRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modifyDn/ModifyDNRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyDNRequestTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyDNRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modifyDn/ModifyDNRequestTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.modifyDn;
 
 import java.nio.ByteBuffer;
 
@@ -24,8 +24,10 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
-import org.apache.ldap.common.asn1.pojo.ModifyDNRequest;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.modifyDn.ModifyDNRequest;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modifyDn/ModifyDNRequestTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modifyDn/ModifyDNResponseTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyDNResponseTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modifyDn/ModifyDNResponseTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modifyDn/ModifyDNResponseTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyDNResponseTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyDNResponseTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modifyDn/ModifyDNResponseTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.modifyDn;
 
 import java.nio.ByteBuffer;
 
@@ -22,8 +22,10 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
-import org.apache.ldap.common.asn1.pojo.ModifyDNResponse;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.modifyDn.ModifyDNResponse;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/modifyDn/ModifyDNResponseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchRequestTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchRequestTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchRequestTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.search;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -25,18 +25,21 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.codec.primitives.LdapString;
-import org.apache.ldap.common.asn1.pojo.SearchRequest;
-import org.apache.ldap.common.asn1.pojo.filters.AttributeValueAssertionFilter;
-import org.apache.ldap.common.asn1.pojo.filters.NotFilter;
-import org.apache.ldap.common.asn1.pojo.filters.*;
-import org.apache.ldap.common.asn1.pojo.filters.OrFilter;
-import org.apache.ldap.common.asn1.pojo.filters.PresentFilter;
-import org.apache.ldap.common.asn1.pojo.filters.SubstringFilter;
 import org.apache.ldap.common.util.StringTools;
-import org.apache.ldap.common.asn1.pojo.AttributeValueAssertion;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
-import org.apache.ldap.common.asn1.pojo.*;
+import org.apache.ldap.common.codec.AttributeValueAssertion;
+import org.apache.ldap.common.codec.Control;
+import org.apache.ldap.common.codec.LdapConstants;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.search.AndFilter;
+import org.apache.ldap.common.codec.search.AttributeValueAssertionFilter;
+import org.apache.ldap.common.codec.search.NotFilter;
+import org.apache.ldap.common.codec.search.OrFilter;
+import org.apache.ldap.common.codec.search.PresentFilter;
+import org.apache.ldap.common.codec.search.SearchRequest;
+import org.apache.ldap.common.codec.search.SubstringFilter;
+import org.apache.ldap.common.codec.util.LdapString;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchRequestTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchResultDoneTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultDoneTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchResultDoneTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchResultDoneTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultDoneTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultDoneTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchResultDoneTest.java Tue Jan  3 20:10:09 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.search;
 
 import java.nio.ByteBuffer;
 
@@ -22,8 +22,10 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
-import org.apache.ldap.common.asn1.pojo.SearchResultDone;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.search.SearchResultDone;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchResultDoneTest.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message