directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r365584 [3/5] - in /directory/trunk: apacheds-server-main/ apacheds/xdocs/users/ ldap-common/src/main/java/org/apache/asn1new/ldap/ ldap-common/src/main/java/org/apache/asn1new/ldap/codec/ ldap-common/src/main/java/org/apache/asn1new/ldap/c...
Date Tue, 03 Jan 2006 09:04:21 GMT
Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/SearchResultEntryGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultEntryGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/SearchResultEntryGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/SearchResultEntryGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultEntryGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultEntryGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/SearchResultEntryGrammar.java Tue Jan  3 01:02:13 2006
@@ -14,25 +14,25 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.grammar;
+package org.apache.ldap.common.asn1.codec.grammar;
 
 import javax.naming.InvalidNameException;
 
 import org.apache.asn1.codec.DecoderException;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ber.grammar.AbstractGrammar;
-import org.apache.asn1new.ber.grammar.GrammarAction;
-import org.apache.asn1new.ber.grammar.GrammarTransition;
-import org.apache.asn1new.ber.grammar.IGrammar;
-import org.apache.asn1new.ber.tlv.TLV;
-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.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.asn1.ber.grammar.IGrammar;
+import org.apache.asn1.ber.grammar.AbstractGrammar;
+import org.apache.asn1.ber.grammar.GrammarTransition;
+import org.apache.asn1.ber.grammar.GrammarAction;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.asn1.ber.tlv.UniversalTag;
+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.codec.primitives.LdapDN;
+import org.apache.ldap.common.asn1.codec.primitives.LdapString;
+import org.apache.ldap.common.asn1.codec.primitives.LdapStringEncodingException;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.asn1.pojo.SearchResultEntry;
 import org.apache.ldap.common.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -93,7 +93,7 @@
                 LdapStatesEnum.SEARCH_RESULT_ENTRY_OBJECT_NAME_TAG,
                 new GrammarAction( "Init SearchResultEntry" )
                 {
-                    public void action( IAsn1Container container ) throws DecoderException
+                    public void action( IAsn1Container container )
                     {
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
@@ -213,7 +213,7 @@
                 LdapStatesEnum.SEARCH_RESULT_ENTRY_TYPE_TAG,
                 new GrammarAction( "Store attributeValue" )
                 {
-                    public void action( IAsn1Container container ) throws DecoderException
+                    public void action( IAsn1Container container )
                     {
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
@@ -333,7 +333,7 @@
                 LdapStatesEnum.SEARCH_RESULT_ENTRY_ATTRIBUTE_VALUE_OR_LIST_TAG,
                 new GrammarAction( "Store Attribute Value value" )
                 {
-                    public void action( IAsn1Container container ) throws DecoderException
+                    public void action( IAsn1Container container ) 
                     {
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )

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

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/SearchResultReferenceGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultReferenceGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/SearchResultReferenceGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/SearchResultReferenceGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultReferenceGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultReferenceGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/SearchResultReferenceGrammar.java Tue Jan  3 01:02:13 2006
@@ -14,22 +14,22 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.grammar;
+package org.apache.ldap.common.asn1.codec.grammar;
 
 import org.apache.asn1.codec.DecoderException;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ber.grammar.AbstractGrammar;
-import org.apache.asn1new.ber.grammar.GrammarAction;
-import org.apache.asn1new.ber.grammar.GrammarTransition;
-import org.apache.asn1new.ber.grammar.IGrammar;
-import org.apache.asn1new.ber.tlv.TLV;
-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.asn1.ber.grammar.IGrammar;
+import org.apache.asn1.ber.grammar.AbstractGrammar;
+import org.apache.asn1.ber.grammar.GrammarTransition;
+import org.apache.asn1.ber.grammar.GrammarAction;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.asn1.ber.tlv.UniversalTag;
+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.codec.primitives.LdapURL;
+import org.apache.ldap.common.asn1.codec.primitives.LdapURLEncodingException;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.asn1.pojo.SearchResultReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/UnBindRequestGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/UnBindRequestGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/UnBindRequestGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/UnBindRequestGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/UnBindRequestGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/UnBindRequestGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/UnBindRequestGrammar.java Tue Jan  3 01:02:13 2006
@@ -14,19 +14,19 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.grammar;
+package org.apache.ldap.common.asn1.codec.grammar;
 
 import org.apache.asn1.codec.DecoderException;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ber.grammar.AbstractGrammar;
-import org.apache.asn1new.ber.grammar.GrammarAction;
-import org.apache.asn1new.ber.grammar.GrammarTransition;
-import org.apache.asn1new.ber.grammar.IGrammar;
-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.pojo.LdapMessage;
-import org.apache.asn1new.ldap.pojo.UnBindRequest;
+import org.apache.asn1.ber.grammar.IGrammar;
+import org.apache.asn1.ber.grammar.AbstractGrammar;
+import org.apache.asn1.ber.grammar.GrammarTransition;
+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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

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

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

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapDN.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapDN.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapDN.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapDN.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapDN.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapDN.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapDN.java Tue Jan  3 01:02:13 2006
@@ -128,7 +128,7 @@
 }
 */
 
-package org.apache.asn1new.ldap.codec.primitives;
+package org.apache.ldap.common.asn1.codec.primitives;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -141,6 +141,8 @@
 import javax.naming.Name;
 
 import org.apache.ldap.common.util.StringTools;
+import org.apache.ldap.common.asn1.codec.primitives.DNParser;
+
 
 /**
  *
@@ -163,11 +165,11 @@
 
     //~ Static fields/initializers -----------------------------------------------------------------
     /** The RDNs that are elements of the DN */
-    private List rdns = new ArrayList(5); 
-    
+    private List rdns = new ArrayList(5);
+
     /** The user provided name */
     private String upName;
-    
+
     /** A null LdapDN */
     public transient static final LdapDN EMPTY_LDAPDN = new LdapDN();
 
@@ -181,7 +183,7 @@
         super();
         upName = "";
     }
-    
+
     /**
      * Parse a String and checks that it is a valid DN <br>
      * <p>
@@ -212,11 +214,11 @@
         {
             this.string = "";
         }
-        
+
         normalize();
         upName = string;
     }
-    
+
     /**
      * Parse a buffer and checks that it is a valid DN <br>
      * <p>
@@ -235,7 +237,7 @@
             upName = new String( bytes, "UTF-8" );
             DNParser.parse( upName, rdns );
             string = toString();
-             
+
             normalize();
         }
         catch ( UnsupportedEncodingException uee )
@@ -243,7 +245,7 @@
             throw new InvalidNameException( "The byte array is not an UTF-8 encoded Unicode String : " + uee.getMessage() );
         }
     }
-    
+
 
     /**
      * Normalize the DN by triming useless spaces and lowercasing names.
@@ -252,19 +254,19 @@
     private void normalize()
     {
         StringBuffer sb = new StringBuffer();
-        
+
         if ( rdns == null )
         {
             string = "";
         }
-        
+
         Iterator elements = rdns.iterator();
         boolean isFirst = true;
-        
+
         while ( elements.hasNext() )
         {
             LdapRDN rdn = (LdapRDN)elements.next();
-            
+
             if ( isFirst )
             {
                 isFirst = false;
@@ -273,12 +275,12 @@
             {
                 sb.append(',');
             }
-            
+
             sb.append( rdn.toString() );
         }
 
         string = sb.toString();
-        
+
         try
         {
             bytes = string.getBytes( "UTF-8" );
@@ -288,7 +290,7 @@
             // We can't reach this point
         }
     }
-    
+
     /**
      * Return the normalized DN as a String,
      * @return A String representing the normalized DN
@@ -303,7 +305,7 @@
         {
             StringBuffer sb = new StringBuffer();
             boolean isFirst = true;
-            
+
             for ( int i = 0; i < rdns.size(); i++ )
             {
                 if ( isFirst )
@@ -314,10 +316,10 @@
                 {
                     sb.append( ',' );
                 }
-                
+
                 sb.append( ( (LdapRDN)rdns.get( i ) ) );
             }
-            
+
             return sb.toString();
         }
     }
@@ -340,7 +342,7 @@
     {
         return rdns.size();
     }
-    
+
     /**
      * Determines whether this name starts with a specified prefix.
      * A name <tt>name</tt> is a prefix if it is equal to
@@ -361,7 +363,7 @@
         if ( name instanceof LdapDN )
         {
             LdapDN nameDN = (LdapDN)name;
-            
+
             if ( nameDN.size() == 0 )
             {
                 return true;
@@ -372,21 +374,21 @@
                 // The name is longer than the current LdapDN.
                 return false;
             }
-            
+
             // Ok, iterate through all the RDN of the name,
             // starting a the end of the current list.
-            
+
             for ( int i = nameDN.size() - 1; i >= 0; i-- )
             {
                 LdapRDN nameRdn = (LdapRDN)(nameDN.rdns.get( nameDN.rdns.size() - i - 1 ));
                 LdapRDN ldapRdn = (LdapRDN)rdns.get( rdns.size() - i - 1 );
-                
+
                 if ( nameRdn.compareTo(ldapRdn) != 0 )
                 {
                     return false;
                 }
             }
-            
+
             return true;
         }
         else
@@ -416,7 +418,7 @@
         if ( name instanceof LdapDN )
         {
             LdapDN nameDN = (LdapDN)name;
-            
+
             if ( nameDN.size() == 0 )
             {
                 return true;
@@ -427,19 +429,19 @@
                 // The name is longer than the current LdapDN.
                 return false;
             }
-            
+
             // Ok, iterate through all the RDN of the name
             for ( int i = 0; i < nameDN.size(); i++ )
             {
                 LdapRDN nameRdn = (LdapRDN)(nameDN.rdns.get( i ));
                 LdapRDN ldapRdn = (LdapRDN)rdns.get( i );
-                
+
                 if ( nameRdn.compareTo(ldapRdn) != 0 )
                 {
                     return false;
                 }
             }
-            
+
             return true;
         }
         else
@@ -448,7 +450,7 @@
             return name == null;
         }
     }
-    
+
     /**
      * Determines whether this name is empty.
      * An empty name is one with zero components.
@@ -459,7 +461,7 @@
     {
         return ( rdns.size() == 0 );
     }
-    
+
     /**
      * Retrieves a component of this name.
      *
@@ -479,11 +481,11 @@
         else
         {
             LdapRDN rdn = (LdapRDN)rdns.get( rdns.size() - posn - 1 );
-        
+
             return rdn.toString();
         }
     }
-    
+
     /**
      * Retrieves the components of this name as an enumeration
      * of strings.  The effect on the enumeration of updates to
@@ -500,7 +502,7 @@
          * right to left with increasing index values.  LdapName.get() does the
          * index translation on m_list for us. 
          */
-        return new Enumeration() 
+        return new Enumeration()
         {
             private int pos ;
 
@@ -511,7 +513,7 @@
 
             public Object nextElement()
             {
-                if ( pos >= rdns.size() ) 
+                if ( pos >= rdns.size() )
                 {
                     throw new NoSuchElementException() ;
                 }
@@ -522,7 +524,7 @@
             }
         };
     }
-    
+
     /**
      * Creates a name whose components consist of a prefix of the
      * components of this name.  Subsequent changes to
@@ -542,14 +544,14 @@
         {
             return EMPTY_LDAPDN;
         }
-        
+
         if ( ( posn < 0 ) || ( posn > rdns.size() ) )
         {
             throw new ArrayIndexOutOfBoundsException("The posn(" + posn + ") should be in the range [0, " + rdns.size() + "]");
         }
-        
+
         LdapDN newLdapDN = new LdapDN();
-        
+
         for (int i = rdns.size() - posn; i < rdns.size(); i++ )
         {
             // Don't forget to clone the rdns !
@@ -559,7 +561,7 @@
         newLdapDN.normalize();
         newLdapDN.string = newLdapDN.toString();
         newLdapDN.upName = newLdapDN.string;
-        
+
         return newLdapDN;
     }
 
@@ -583,14 +585,14 @@
         {
             return EMPTY_LDAPDN;
         }
-        
+
         if ( ( posn < 0 ) || ( posn > rdns.size() ) )
         {
             throw new ArrayIndexOutOfBoundsException("The posn(" + posn + ") should be in the range [0, " + rdns.size() + "]");
         }
-        
+
         LdapDN newLdapDN = new LdapDN();
-        
+
         for (int i = 0; i < size() - posn; i++ )
         {
             // Don't forget to clone the rdns !
@@ -617,7 +619,7 @@
     public Name addAll( Name suffix ) throws InvalidNameException
     {
         addAll( rdns.size(), suffix );
-        
+
         return this;
     }
 
@@ -649,15 +651,15 @@
             {
                 return this;
             }
-            
+
             // Concatenate the rdns
             rdns.addAll( size() - posn, ((LdapDN)name).rdns );
 
             // Regenerate the normalized name and the original string
             normalize();
-            
+
             upName = toString();
-            
+
             return this;
         }
         else
@@ -680,7 +682,7 @@
     {
         // We have to parse the nameComponent which is given as an argument
         LdapRDN newRdn = new LdapRDN( comp );
-        
+
         rdns.add( 0, newRdn );
         normalize();
 
@@ -711,18 +713,18 @@
     {
         if ( ( posn < 0 ) || ( posn > size() ) )
         {
-            throw new ArrayIndexOutOfBoundsException("The posn(" + posn + ") should be in the range [0, " + rdns.size() + "]"); 
+            throw new ArrayIndexOutOfBoundsException("The posn(" + posn + ") should be in the range [0, " + rdns.size() + "]");
         }
 
         // We have to parse the nameComponent which is given as an argument
         LdapRDN newRdn = new LdapRDN( comp );
-        
+
         int realPos = size() - posn;
         rdns.add( realPos, newRdn );
         normalize();
-        
+
         upName = toString();
-        
+
         return this;
     }
 
@@ -748,18 +750,18 @@
         {
             return EMPTY_LDAPDN;
         }
-        
+
         if ( ( posn < 0 ) || ( posn >= rdns.size() ) )
         {
             throw new ArrayIndexOutOfBoundsException("The posn(" + posn + ") should be in the range [0, " + rdns.size() + "]");
         }
-        
+
         int realPos = size() - posn - 1;
         LdapRDN rdn = (LdapRDN)rdns.remove( realPos );
         normalize();
-        
+
         upName = toString();
-        
+
         return rdn;
     }
 
@@ -777,12 +779,12 @@
         try
         {
             LdapDN dn = (LdapDN)super.clone();
-            
+
             for ( int i = 0; i < rdns.size(); i++ )
             {
                 dn.rdns.set( i, ((LdapRDN)rdns.get( i ) ).clone() );
             }
-            
+
             return dn;
         }
         catch ( CloneNotSupportedException cnse )
@@ -799,7 +801,7 @@
         if ( obj instanceof String )
         {
             return toString().equals( obj ) ;
-        } 
+        }
         else if ( obj instanceof LdapDN )
         {
             LdapDN name = ( LdapDN ) obj ;
@@ -809,7 +811,7 @@
                 return false ;
             }
 
-            for ( int i = 0; i < size(); i++ ) 
+            for ( int i = 0; i < size(); i++ )
             {
                 if ( ( (LdapRDN)name.rdns.get( i ) ).compareTo( rdns.get( i ) ) == LdapRDN.NOT_EQUALS)
                 {
@@ -819,8 +821,8 @@
 
             // All components matched so we return true
             return true ;
-        } 
-        else 
+        }
+        else
         {
             return false ;
         }
@@ -852,26 +854,26 @@
         if ( obj instanceof LdapDN )
         {
             LdapDN ldapDN = (LdapDN)obj;
-            
+
             if ( ldapDN.size() != size() )
             {
                 return NOT_EQUALS;
             }
-            
+
             Iterator dn1Iter = rdns.iterator();
             Iterator dn2Iter = ldapDN.rdns.iterator();
-            
+
             while ( dn1Iter.hasNext() && dn2Iter.hasNext() )
             {
                 LdapRDN rdn1 = (LdapRDN)dn1Iter.next();
                 LdapRDN rdn2 = (LdapRDN)dn2Iter.next();
-                
+
                 if ( rdn1.compareTo( rdn2 ) == LdapRDN.NOT_EQUALS )
                 {
                     return NOT_EQUALS;
                 }
             }
-            
+
             return EQUALS;
         }
         else

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

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapRDN.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapRDN.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapRDN.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapRDN.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapRDN.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapRDN.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapRDN.java Tue Jan  3 01:02:13 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.primitives;
+package org.apache.ldap.common.asn1.codec.primitives;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -27,6 +27,8 @@
 
 import org.apache.commons.collections.MultiHashMap;
 import org.apache.ldap.common.util.StringTools;
+import org.apache.ldap.common.asn1.codec.primitives.AttributeTypeAndValue;
+
 
 /**
  * This class store the name-component part or the following BNF grammar (as of RFC2253, par. 3, 
@@ -86,42 +88,42 @@
  */
 public class LdapRDN extends LdapString implements Cloneable, Comparable
 {
-    /** 
+    /**
      * Stores all couple type = value. We may have more than one type,
      * if the '+' character appears in the AttributeTypeAndValue. The key is
      * the type, the value is a AttributeTypeAndValue.
      */
     private MultiHashMap atavs;
-    
-    /** 
+
+    /**
      * A simple AttributeTypeAndValue is used to store the LdapRDN for the simple
      * case where we only have a single type=value. This will be 99.99%
      * the case. This avoids the creation of a HashMap.
      */
     private AttributeTypeAndValue atav;
-    
+
     private transient int nbAtavs;
-    
+
     /** Value returned by the compareTo method if values are not equals */
     public final static int NOT_EQUALS = -1;
 
     /** Value returned by the compareTo method if values are equals */
     public final static int EQUALS = 0;
-    
+
     /**
      * A empty constructor.
      */
     public LdapRDN()
     {
         super();
-        
+
         // Don't waste space... This is not so often we have multiple
         // name-components in a RDN... So we won't initialize the Map.
         atavs = null;
         atav = null;
         nbAtavs = 0;
     }
-    
+
     /**
      * A constructor that parse a String RDN
      * 
@@ -131,7 +133,7 @@
     public LdapRDN( String rdn ) throws InvalidNameException
     {
         super();
-        
+
         if ( StringTools.isNotEmpty( rdn ) )
         {
             try
@@ -149,7 +151,7 @@
             normalize();
         }
     }
-    
+
     /**
      * A constructor that parse a RDN from a byte array. This method
      * is called when whe get a LdapMessage which contains a byte
@@ -158,11 +160,11 @@
      * @param rdn The byte array containing the RDN to parse
      * @throws InvalidNameException If the RDN is invalid
      */
-    
+
     public LdapRDN( byte[] bytes ) throws InvalidNameException
     {
         super();
-        
+
         try
         {
             RDNParser.parse( new String( bytes, "UTF-8" ), this );
@@ -173,7 +175,7 @@
             throw new InvalidNameException( "The byte array is not an UTF-8 encoded Unicode String : " + uee.getMessage() );
         }
     }
-    
+
     /**
      * A constructor that constructs a RDN from a type and a value
      * @param type The type of the RDN
@@ -183,7 +185,7 @@
     public LdapRDN( String type, String value ) throws InvalidNameException
     {
         super();
-        
+
         // Don't waste space... This is not so often we have multiple
         // name-components in a RDN... So we won't initialize the Map.
         atavs = null;
@@ -206,25 +208,25 @@
                 // An empty RDN
                 string = "";
                 break;
-                
+
             case 1:
                 // We have a single AttributeTypeAndValue
                 // We will trim and lowercase type and value.
                 string = StringTools.lowerCase( StringTools.trim( atav.getType() ) ) +
                                 '=' + StringTools.trim( atav.getValue() );
                 break;
-                
+
             default :
                 // We have more than one AttributeTypeAndValue
                 StringBuffer sb = new StringBuffer();
 
                 Iterator elems = atavs.values().iterator();
                 boolean isFirst = true;
-                
+
                 while ( elems.hasNext() )
                 {
-                    AttributeTypeAndValue ata = (AttributeTypeAndValue)elems.next();
-                    
+                    AttributeTypeAndValue ata = ( AttributeTypeAndValue )elems.next();
+
                     if ( isFirst )
                     {
                         isFirst = false;
@@ -233,11 +235,11 @@
                     {
                         sb.append( '+' );
                     }
-                    
-                    
+
+
                     sb.append( ata.normalize() );
                 }
-                
+
                 string = sb.toString();
                 break;
         }
@@ -264,7 +266,7 @@
         // First, let's normalize the type
         String normalizedType = StringTools.lowerCase( StringTools.trim( type ) );
         String normalizedValue = StringTools.trim( value );
-        
+
         switch ( nbAtavs )
         {
             case 0 :
@@ -272,13 +274,13 @@
                 atav = new AttributeTypeAndValue( normalizedType, normalizedValue );
                 nbAtavs = 1;
                 break;
-                
+
             case 1 :
                 // We already have an atav. We have to put it in the HashMap
                 // before adding a new one.
                 // First, create the HashMap,
                 atavs = new MultiHashMap();
-                
+
                 // and store the existing AttributeTypeAndValue into it.
                 atavs.put( atav.getType(), atav );
                 atav = null;
@@ -288,16 +290,16 @@
 
                 nbAtavs = 2;
                 break;
-                
+
             default :
                 // add a new AttributeTypeAndValue
                 atavs.put( normalizedType, new AttributeTypeAndValue( normalizedType, normalizedValue ) );
 
                 nbAtavs++;
                 break;
-                    
+
         }
-        
+
         if ( StringTools.isEmpty( string ) )
         {
             string = normalizedType + '=' + normalizedValue;
@@ -320,15 +322,15 @@
         {
             return;
         }
-        
+
         // First, let's normalize the type
         String normalizedType = StringTools.lowerCase( StringTools.trim( type ) );
-        
+
         switch ( nbAtavs )
         {
             case 0 :
                 throw new InvalidNameException( "Cannot remove a AttributeTypeAndValue form an empty RDN" );
-                
+
             case 1 :
                 if ( normalizedType.equals( atav.getType() ) )
                 {
@@ -340,9 +342,9 @@
                 {
                     throw new InvalidNameException( "Name '" + normalizedType + "' is not valid for the RDN '" + this.toString() + "'");
                 }
-                
+
                 break;
-                
+
             default :
                 if ( atavs.containsKey( normalizedType ) )
                 {
@@ -354,12 +356,12 @@
                 {
                     throw new InvalidNameException( "Name '" + normalizedType + "' is not valid for the RDN '" + this.toString() + "'");
                 }
-            
+
                 break;
-            
+
         }
     }
-    
+
     /**
      * Clear the RDN, removing all the AttributeTypeAndValues.
      */
@@ -371,7 +373,7 @@
         string = "";
         bytes = EMPTY_BYTES;
     }
-    
+
     /**
      * Get the Value of the AttributeTypeAndValue which type is given as an argument.
      * 
@@ -382,12 +384,12 @@
     {
         // First, let's normalize the type
         String normalizedType = StringTools.lowerCase( StringTools.trim( type ) );
-        
+
         switch ( nbAtavs )
         {
             case 0:
                 return "";
-                
+
             case 1:
                 if ( StringTools.equals( atav.getType(), normalizedType ) )
                 {
@@ -397,14 +399,14 @@
                 {
                     return "";
                 }
-                
+
             default :
                 if ( atavs.containsKey( normalizedType ) )
                 {
                     List avas = (ArrayList)atavs.get( normalizedType );
                     StringBuffer sb = new StringBuffer();
                     boolean isFirst = true;
-                    
+
                     for ( int i = 0; i < avas.size(); i++ )
                     {
                         if ( isFirst )
@@ -415,10 +417,10 @@
                         {
                             sb.append( ',' );
                         }
-                        
+
                         sb.append( ( (AttributeTypeAndValue)avas.get( i ) ).getValue() );
                     }
-                    
+
                     return sb.toString();
                 }
                 else
@@ -445,7 +447,7 @@
         {
             case 0:
                 return null;
-                
+
             case 1:
                 if ( atav.getType().equals( normalizedType ) )
                 {
@@ -455,12 +457,12 @@
                 {
                     return null;
                 }
-                
+
             default :
                 if ( atavs.containsKey( normalizedType ) )
                 {
                     List values =  (ArrayList)atavs.get( normalizedType );
-                    
+
                     return (AttributeTypeAndValue)values.get( 0 );
                 }
                 else
@@ -469,7 +471,7 @@
                 }
         }
     }
-    
+
     /**
      * Clone the LdapRDN
      */
@@ -478,23 +480,23 @@
         try
         {
             LdapRDN rdn = (LdapRDN)super.clone();
-            
+
             // The AttributeTypeAndValue is immutable. We won't clone it
-            
+
             if ( atavs != null )
             {
                 rdn.atavs = new MultiHashMap( nbAtavs );
-                
+
                 Iterator values = atavs.values().iterator();
-                
+
                 while ( values.hasNext() )
                 {
                     AttributeTypeAndValue ava = (AttributeTypeAndValue)values.next();
-                    
+
                     rdn.atavs.put( ava.getType(), ava );
                 }
             }
-            
+
             return rdn;
         }
         catch ( CloneNotSupportedException cnse )
@@ -502,7 +504,7 @@
             throw new Error( "Assertion failure" );
         }
     }
-    
+
     /**
      * Compares two RDN. They are equals if :
      * - their have the same number of NC (AttributeTypeAndValue)
@@ -521,29 +523,29 @@
             {
                 return NOT_EQUALS;
             }
-            
+
             switch ( nbAtavs )
             {
                 case 0:
                     return EQUALS;
-                    
+
                 case 1:
                     return atav.compareTo( rdn.atav );
-                    
+
                 default :
                     // We have more than one value. We will
                     // go through all of them.
                     Iterator keys = ((MultiHashMap)atavs).keySet().iterator();
-                    
+
                     while ( keys.hasNext() )
                     {
                         String type = (String)keys.next();
-                        
+
                         if ( ((MultiHashMap)rdn.atavs).containsKey( type ) )
                         {
                             List atavList = (List)((MultiHashMap)atavs).get( type );
                             List atavList2 = (List)((MultiHashMap)rdn.atavs).get( type );
-                            
+
                             // Ok, let's go for ugliness : 
                             // We are not supposed to have a lot of multi-valued RDN
                             // with a type that contains multiple values. In fact,
@@ -554,19 +556,19 @@
                             // is higher than 2...
                             Iterator atavIter1 = atavList.iterator();
                             Set atavSet = new HashSet();
-                            
+
                             while ( atavIter1.hasNext() )
                             {
                                 AttributeTypeAndValue atavValue = (AttributeTypeAndValue)atavIter1.next();
                                 atavSet.add( StringTools.lowerCase( atavValue.getValue() ) );
                             }
-                            
+
                             Iterator atavIter2 = atavList2.iterator();
-                            
+
                             while ( atavIter2.hasNext() )
                             {
                                 AttributeTypeAndValue atavValue = (AttributeTypeAndValue)atavIter2.next();
-                                
+
                                 if ( atavSet.contains( StringTools.lowerCase( atavValue.getValue() ) ) )
                                 {
                                     atavSet.remove( StringTools.lowerCase( atavValue.getValue() ) );
@@ -576,7 +578,7 @@
                                     return NOT_EQUALS;
                                 }
                             }
-                            
+
                             // Last, not least, the Set must be empty for
                             // both RDN to be equals
                             if ( atavSet.size() != 0 )
@@ -585,7 +587,7 @@
                             }
                         }
                     }
-                    
+
                     return EQUALS;
             }
         }

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapString.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapString.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapString.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapString.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapString.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapString.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapString.java Tue Jan  3 01:02:13 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.primitives;
+package org.apache.ldap.common.asn1.codec.primitives;
 
 import java.io.UnsupportedEncodingException;
 

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

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

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

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapURL.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapURL.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapURL.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapURL.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapURL.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/primitives/LdapURL.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/LdapURL.java Tue Jan  3 01:02:13 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.primitives;
+package org.apache.ldap.common.asn1.codec.primitives;
 
 import org.apache.asn1.codec.DecoderException;
 
@@ -23,6 +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 java.io.IOException;
 import java.io.UnsupportedEncodingException;

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

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

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/RDNParser.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/primitives/RDNParser.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/RDNParser.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/RDNParser.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/primitives/RDNParser.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/primitives/RDNParser.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/primitives/RDNParser.java Tue Jan  3 01:02:13 2006
@@ -14,12 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.primitives;
+package org.apache.ldap.common.asn1.codec.primitives;
 
 import javax.naming.InvalidNameException;
 
-import org.apache.asn1new.ldap.codec.utils.DNUtils;
+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;
+
 
 /**
  * This class parse the name-component part or the following BNF grammar (as of RFC2253, par. 3, 
@@ -162,7 +164,7 @@
             return pos;
         }
     }
-    
+
     /**
      * Parse this rule : <br>
      * <p>
@@ -180,19 +182,19 @@
     private static int parseAttributeType( char[] chars, int pos )
     {
         // <attributType> ::= [a-zA-Z] <keychars> | <oidPrefix> [0-9] <digits> <oids> | [0-9] <digits> <oids>
-        
+
         if ( StringTools.isAlphaASCII( chars, pos ))
         {
             // <attributType> ::= [a-zA-Z] <keychars> | <oidPrefix> [0-9] <digits> <oids> 
 
             // We have got an Alpha char, it may be the begining of an OID ?
             int oldPos = pos;
-            
-            if ( ( pos = parseOidPrefix( chars, oldPos ) ) != DNUtils.PARSING_ERROR ) 
+
+            if ( ( pos = parseOidPrefix( chars, oldPos ) ) != DNUtils.PARSING_ERROR )
             {
                 return parseOidValue(chars, pos);
             }
-            else 
+            else
             {
                 // It's not an oid, it's a String (ASCII)
                 // <attributType> ::= [a-zA-Z] <keychars>
@@ -307,7 +309,7 @@
                 else
                 {
                     int nbChars = 0;
-                    
+
                     // <stringchar> <pairs-or-strings>
                     if ( ( nbChars = DNUtils.isStringChar( chars, pos )) != DNUtils.PARSING_ERROR )
                     {
@@ -395,18 +397,18 @@
             pos = StringTools.trimLeft( chars, pos );
 
             newPos = parseAttributeValue( chars, pos );
-            
+
             if ( newPos != DNUtils.PARSING_ERROR )
             {
                 if ( rdn != null )
                 {
                     newPos = StringTools.trimRight( chars, newPos );
                     value = new String( chars, pos, newPos - pos );
-                    
+
                     rdn.addAttributeTypeAndValue( type, value );
                 }
             }
-            
+
             pos = newPos;
         }
     }
@@ -426,19 +428,19 @@
         int newPos = 0;
         String type = null;
         String value = null;
-        
+
         pos = StringTools.trimLeft( chars, pos );
-        
+
         if ( ( newPos = parseAttributeType( chars, pos ) ) == DNUtils.PARSING_ERROR )
         {
             return DNUtils.PARSING_ERROR;
         }
-        
+
         if ( rdn != null )
         {
             type = new String( chars, pos, newPos - pos );
         }
-        
+
         pos = StringTools.trimLeft( chars, newPos );
 
         if ( StringTools.isCharASCII( chars, pos, '=' ) == false )
@@ -456,12 +458,12 @@
         {
             return DNUtils.PARSING_ERROR;
         }
-        
+
         if ( rdn != null )
         {
             newPos = StringTools.trimRight( chars, newPos );
             value = new String( chars, pos, newPos - pos );
-            
+
             rdn.addAttributeTypeAndValue( type, value );
         }
 

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/utils/DNUtils.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/utils/DNUtils.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/utils/DNUtils.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/utils/DNUtils.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/utils/DNUtils.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/utils/DNUtils.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/utils/DNUtils.java Tue Jan  3 01:02:13 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.utils;
+package org.apache.ldap.common.asn1.codec.utils;
 
 import org.apache.ldap.common.util.StringTools;
 

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

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/utils/LdapResultEnum.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/utils/LdapResultEnum.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/utils/LdapResultEnum.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/utils/LdapResultEnum.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/utils/LdapResultEnum.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/utils/LdapResultEnum.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/utils/LdapResultEnum.java Tue Jan  3 01:02:13 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.utils;
+package org.apache.ldap.common.asn1.codec.utils;
 
 /**
  * This typesafe-enum represent the different resultCode of a LdapResult.

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

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AbandonRequest.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/AbandonRequest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AbandonRequest.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AbandonRequest.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/AbandonRequest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/AbandonRequest.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AbandonRequest.java Tue Jan  3 01:02:13 2006
@@ -14,14 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.pojo;
+package org.apache.ldap.common.asn1.pojo;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.tlv.Value;
-import org.apache.asn1new.ldap.codec.LdapConstants;
+import org.apache.asn1.ber.tlv.Value;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -123,7 +123,7 @@
         try 
         {
             // The tag
-            buffer.put(LdapConstants.ABANDON_REQUEST_TAG);
+            buffer.put( LdapConstants.ABANDON_REQUEST_TAG);
             
             // The length. It has to be evaluated depending on 
             // the abandoned messageId value.

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AbandonRequest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AddRequest.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/AddRequest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AddRequest.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AddRequest.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/AddRequest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/AddRequest.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AddRequest.java Tue Jan  3 01:02:13 2006
@@ -14,15 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.pojo;
+package org.apache.ldap.common.asn1.pojo;
 
 import org.apache.asn1.codec.EncoderException;
-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.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
+import org.apache.asn1.ber.tlv.Length;
+import org.apache.asn1.ber.tlv.Value;
+import org.apache.asn1.ber.tlv.UniversalTag;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
+import org.apache.ldap.common.asn1.codec.primitives.LdapDN;
+import org.apache.ldap.common.asn1.codec.primitives.LdapString;
 import org.apache.ldap.common.util.AttributeUtils;
 import org.apache.ldap.common.util.StringTools;
 
@@ -257,7 +257,7 @@
                             }
                         }
 
-                        localAttributeLength += 1 + Length.getNbBytes( localValuesLength ) + localValuesLength; 
+                        localAttributeLength += 1 + Length.getNbBytes( localValuesLength ) + localValuesLength;
                     }
                     
                 }

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AddRequest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AddResponse.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/AddResponse.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AddResponse.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AddResponse.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/AddResponse.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/AddResponse.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AddResponse.java Tue Jan  3 01:02:13 2006
@@ -14,14 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.pojo;
+package org.apache.ldap.common.asn1.pojo;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.tlv.Length;
-import org.apache.asn1new.ldap.codec.LdapConstants;
+import org.apache.asn1.ber.tlv.Length;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
+
 
 /**
  * An AddResponse Message. Its syntax is :
@@ -69,7 +70,7 @@
     public int computeLength()
     {
         int ldapResponseLength = super.computeLength();
-        
+
         return 1 + Length.getNbBytes( ldapResponseLength ) + ldapResponseLength;
     }
 
@@ -85,7 +86,7 @@
         {
             throw new EncoderException("Cannot put a PDU in a null buffer !");
         }
-        
+
         try
         {
             // The tag
@@ -94,9 +95,9 @@
         }
         catch ( BufferOverflowException boe )
         {
-            throw new EncoderException("The PDU buffer size is too small !"); 
+            throw new EncoderException("The PDU buffer size is too small !");
         }
-        
+
         // The ldapResult
         return super.encode( buffer);
     }

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AddResponse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AttributeValueAssertion.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/AttributeValueAssertion.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AttributeValueAssertion.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AttributeValueAssertion.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/AttributeValueAssertion.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/AttributeValueAssertion.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AttributeValueAssertion.java Tue Jan  3 01:02:13 2006
@@ -14,10 +14,10 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.pojo;
+package org.apache.ldap.common.asn1.pojo;
 
-import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
+import org.apache.ldap.common.asn1.codec.primitives.LdapString;
 
 
 /**
@@ -118,26 +118,26 @@
         StringBuffer sb = new StringBuffer();
 
         sb.append( attributeDesc.toString() );
-        
+
         switch (filterType)
         {
-        	case LdapConstants.EQUALITY_MATCH_FILTER :
-        	    sb.append( '=' );
-        		break;
-        		
-        	case LdapConstants.LESS_OR_EQUAL_FILTER :
-        	    sb.append( "<=" );
-        		break;
-        		
-        	case LdapConstants.GREATER_OR_EQUAL_FILTER :
-        	    sb.append( ">=" );
-        		break;
-        		
-        	case LdapConstants.APPROX_MATCH_FILTER :
-        	    sb.append( "~=" );
-        		break;
+            case LdapConstants.EQUALITY_MATCH_FILTER :
+                sb.append( '=' );
+                break;
+
+            case LdapConstants.LESS_OR_EQUAL_FILTER :
+                sb.append( "<=" );
+                break;
+
+            case LdapConstants.GREATER_OR_EQUAL_FILTER :
+                sb.append( ">=" );
+                break;
+
+            case LdapConstants.APPROX_MATCH_FILTER :
+                sb.append( "~=" );
+                break;
         }
-        
+
         sb.append( assertionValue.toString() );
 
         return sb.toString();

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/AttributeValueAssertion.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/BindRequest.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/BindRequest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/BindRequest.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/BindRequest.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/BindRequest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/BindRequest.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/BindRequest.java Tue Jan  3 01:02:13 2006
@@ -14,16 +14,16 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.pojo;
+package org.apache.ldap.common.asn1.pojo;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 import org.apache.asn1.codec.EncoderException;
-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.ber.tlv.Length;
+import org.apache.asn1.ber.tlv.Value;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
+import org.apache.ldap.common.asn1.codec.primitives.LdapDN;
 import org.apache.ldap.common.util.StringTools;
 
 
@@ -46,7 +46,7 @@
 
     /** The authentication used to bind the user */
     private LdapAuthentication authentication;
-    
+
     /** The bind request length */
     private transient int bindRequestLength;
 
@@ -184,17 +184,17 @@
     public int computeLength()
     {
         bindRequestLength = 1 + 1 + 1; // Initialized with version
-        
+
         // The name
         bindRequestLength += 1 + Length.getNbBytes( name.getNbBytes() ) + name.getNbBytes();
-        
+
         // The authentication
         bindRequestLength += authentication.computeLength();
 
         // Return the result.
         return 1 + Length.getNbBytes( bindRequestLength ) + bindRequestLength;
     }
-    
+
     /**
      * Encode the BindRequest message to a PDU.
      * 
@@ -220,7 +220,7 @@
             throw new EncoderException( "Cannot put a PDU in a null buffer !" );
         }
 
-        try 
+        try
         {
             // The BindRequest Tag
             buffer.put( LdapConstants.BIND_REQUEST_TAG );
@@ -229,15 +229,15 @@
         }
         catch ( BufferOverflowException boe )
         {
-            throw new EncoderException("The PDU buffer size is too small !"); 
+            throw new EncoderException("The PDU buffer size is too small !");
         }
 
         // The version
         Value.encode( buffer, version );
-        
+
         // The name
         Value.encode( buffer, name.getBytes() );
-        
+
         // The authentication
         authentication.encode( buffer );
 
@@ -255,7 +255,7 @@
 
         sb.append( "    BindRequest\n" );
         sb.append( "        Version : '" ).append( version ).append( "'\n" );
-        
+
         if ( StringTools.isEmpty( name.toString() ) )
         {
             sb.append( "        Name : anonymous\n" );
@@ -263,7 +263,7 @@
         else
         {
             sb.append( "        Name : '" ).append( name.toString() ).append( "'\n" );
-    
+
             if ( authentication instanceof SimpleAuthentication )
             {
                 sb.append( "        Simple authentication : '" )
@@ -275,7 +275,7 @@
                 sb.append( ( ( SaslCredentials ) authentication ).toString() );
             }
         }
-        
+
         return sb.toString();
     }
 }

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/BindRequest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/BindResponse.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/BindResponse.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/BindResponse.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/BindResponse.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/BindResponse.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/BindResponse.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/BindResponse.java Tue Jan  3 01:02:13 2006
@@ -14,14 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.pojo;
+package org.apache.ldap.common.asn1.pojo;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.tlv.Length;
-import org.apache.asn1new.ldap.codec.LdapConstants;
+import org.apache.asn1.ber.tlv.Length;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
+
 
 /**
  * A BindResponse Message. Its syntax is :
@@ -39,7 +40,7 @@
 
     /** The server credentials */
     private byte[] serverSaslCreds;
-    
+
     /** The bind response length */
     private transient int bindResponseLength;
 
@@ -74,14 +75,14 @@
     }
 
     /**
-	 * Set the server sasl credentials
+     * Set the server sasl credentials
      * @param serverSaslCreds The serverSaslCreds to set.
      */
     public void setServerSaslCreds( byte[] serverSaslCreds )
     {
         this.serverSaslCreds = serverSaslCreds;
     }
-    
+
     /**
      * Compute the BindResponse length
      * 
@@ -99,14 +100,14 @@
     public int computeLength()
     {
         int ldapResponseLength = super.computeLength();
-        
+
         bindResponseLength = ldapResponseLength;
-        
+
         if (serverSaslCreds != null)
         {
             bindResponseLength += 1 + Length.getNbBytes( ( (byte[])serverSaslCreds).length ) +  ( (byte[])serverSaslCreds).length ;
         }
-        
+
         return 1 + Length.getNbBytes( bindResponseLength ) + bindResponseLength;
     }
 
@@ -128,12 +129,12 @@
             throw new EncoderException("Cannot put a PDU in a null buffer !");
         }
 
-        try 
+        try
         {
             // The BindResponse Tag
             buffer.put( LdapConstants.BIND_RESPONSE_TAG );
             buffer.put( Length.getBytes( bindResponseLength ) );
-            
+
             // The LdapResult
             super.encode(buffer);
 
@@ -141,9 +142,9 @@
             if ( serverSaslCreds != null )
             {
                 buffer.put( (byte)LdapConstants.SERVER_SASL_CREDENTIAL_TAG );
-                
+
                 buffer.put( Length.getBytes( ( (byte[])serverSaslCreds).length ) );
-                
+
                 if ( ( (byte[])serverSaslCreds).length != 0 )
                 {
                     buffer.put( (byte[])serverSaslCreds );
@@ -152,9 +153,9 @@
         }
         catch ( BufferOverflowException boe )
         {
-            throw new EncoderException("The PDU buffer size is too small !"); 
+            throw new EncoderException("The PDU buffer size is too small !");
         }
-            
+
         return buffer;
     }
 
@@ -169,7 +170,7 @@
 
         sb.append( "    BindResponse\n" );
         sb.append( super.toString() );
-        
+
         if ( serverSaslCreds != null )
         {
             sb.append( "        Server sasl credentials : '" ).append( serverSaslCreds.toString() ).append( "'\n" );

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/BindResponse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/CompareRequest.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/CompareRequest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/CompareRequest.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/CompareRequest.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/CompareRequest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/CompareRequest.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/CompareRequest.java Tue Jan  3 01:02:13 2006
@@ -14,18 +14,18 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.pojo;
+package org.apache.ldap.common.asn1.pojo;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 import org.apache.asn1.codec.EncoderException;
-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.LdapConstants;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
+import org.apache.asn1.ber.tlv.Length;
+import org.apache.asn1.ber.tlv.UniversalTag;
+import org.apache.asn1.ber.tlv.Value;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
+import org.apache.ldap.common.asn1.codec.primitives.LdapDN;
+import org.apache.ldap.common.asn1.codec.primitives.LdapString;
 import org.apache.ldap.common.util.StringTools;
 
 
@@ -57,10 +57,10 @@
 
     /** The value to be compared */
     private Object assertionValue;
-    
+
     /** The compare request length */
     private transient int compareRequestLength;
-    
+
     /** The attribute value assertion length */
     private transient int avaLength;
 
@@ -176,7 +176,7 @@
         // The attribute value assertion
         avaLength =
             1 + Length.getNbBytes( attributeDesc.getNbBytes() ) + attributeDesc.getNbBytes();
-        
+
         if ( assertionValue instanceof String )
         {
             int assertionValueLength = StringTools.getBytesUtf8( (String)assertionValue ).length;
@@ -215,12 +215,12 @@
             throw new EncoderException( "Cannot put a PDU in a null buffer !" );
         }
 
-        try 
+        try
         {
             // The CompareRequest Tag
             buffer.put( LdapConstants.COMPARE_REQUEST_TAG );
             buffer.put( Length.getBytes( compareRequestLength ) ) ;
-            
+
             // The entry
             Value.encode( buffer, entry.getBytes() );
 
@@ -230,12 +230,12 @@
         }
         catch ( BufferOverflowException boe )
         {
-            throw new EncoderException("The PDU buffer size is too small !"); 
+            throw new EncoderException("The PDU buffer size is too small !");
         }
 
         // The attributeDesc
         Value.encode( buffer, attributeDesc.getString() );
-        
+
         // The assertionValue
         if ( assertionValue instanceof String )
         {

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/CompareRequest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/CompareResponse.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/CompareResponse.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/CompareResponse.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/CompareResponse.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/CompareResponse.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/CompareResponse.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/CompareResponse.java Tue Jan  3 01:02:13 2006
@@ -14,14 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.pojo;
+package org.apache.ldap.common.asn1.pojo;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.tlv.Length;
-import org.apache.asn1new.ldap.codec.LdapConstants;
+import org.apache.asn1.ber.tlv.Length;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
+
 
 /**
  * An CompareResponse Message. Its syntax is :
@@ -69,7 +70,7 @@
     public int computeLength()
     {
         int ldapResponseLength = super.computeLength();
-        
+
         return 1 + Length.getNbBytes( ldapResponseLength ) + ldapResponseLength;
     }
 
@@ -85,7 +86,7 @@
         {
             throw new EncoderException("Cannot put a PDU in a null buffer !");
         }
-        
+
         try
         {
             // The tag
@@ -94,9 +95,9 @@
         }
         catch ( BufferOverflowException boe )
         {
-            throw new EncoderException("The PDU buffer size is too small !"); 
+            throw new EncoderException("The PDU buffer size is too small !");
         }
-        
+
         // The ldapResult
         return super.encode( buffer);
     }

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/CompareResponse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/Control.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/Control.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/Control.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/Control.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/Control.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/Control.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/Control.java Tue Jan  3 01:02:13 2006
@@ -14,17 +14,17 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.pojo;
+package org.apache.ldap.common.asn1.pojo;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
-import org.apache.asn1new.Asn1Object;
 import org.apache.asn1.codec.EncoderException;
-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.Asn1Object;
+import org.apache.asn1.ber.tlv.UniversalTag;
+import org.apache.asn1.ber.tlv.Length;
+import org.apache.asn1.ber.tlv.Value;
+import org.apache.ldap.common.asn1.codec.primitives.LdapString;
 import org.apache.ldap.common.util.StringTools;
 
 
@@ -147,7 +147,7 @@
         controlLength = 1 + Length.getNbBytes( controlTypeLengh ) + controlTypeLengh;  
         
         // The criticality, only if true
-        if (criticality == true)
+        if (criticality)
         {
             controlLength += 1 + 1 + 1; // Always 3 for a boolean
         }
@@ -170,7 +170,7 @@
      *   [0x01 0x01 criticality]
      *   [0x04 LL value]
      *   
-     * @param object The encoded PDU
+     * @param buffer The encoded PDU
      * @return A ByteBuffer that contaons the PDU
      * @throws EncoderException If anything goes wrong.
      */
@@ -193,7 +193,7 @@
         Value.encode( buffer, controlType.getBytes() );
 
         // The control criticality, if true
-        if ( criticality == true )
+        if ( criticality )
         {
             Value.encode( buffer, criticality );
         }

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/Control.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/DelRequest.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/DelRequest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/DelRequest.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/DelRequest.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/DelRequest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/DelRequest.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/DelRequest.java Tue Jan  3 01:02:13 2006
@@ -14,15 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.pojo;
+package org.apache.ldap.common.asn1.pojo;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 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.asn1.ber.tlv.Length;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
+import org.apache.ldap.common.asn1.codec.primitives.LdapDN;
 
 
 /**
@@ -96,7 +96,7 @@
         // The entry
         return 1 + Length.getNbBytes( entry.getNbBytes() ) + entry.getNbBytes();
     }
-    
+
     /**
      * Encode the DelRequest message to a PDU.
      * 
@@ -114,7 +114,7 @@
             throw new EncoderException("Cannot put a PDU in a null buffer !");
         }
 
-        try 
+        try
         {
             // The DelRequest Tag
             buffer.put( LdapConstants.DEL_REQUEST_TAG );
@@ -125,9 +125,9 @@
         }
         catch ( BufferOverflowException boe )
         {
-            throw new EncoderException("The PDU buffer size is too small !"); 
+            throw new EncoderException("The PDU buffer size is too small !");
         }
-            
+
         return buffer;
     }
 

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/DelRequest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/DelResponse.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/DelResponse.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/DelResponse.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/DelResponse.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/DelResponse.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/DelResponse.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/DelResponse.java Tue Jan  3 01:02:13 2006
@@ -14,14 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.pojo;
+package org.apache.ldap.common.asn1.pojo;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.tlv.Length;
-import org.apache.asn1new.ldap.codec.LdapConstants;
+import org.apache.asn1.ber.tlv.Length;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
+
 
 /**
  * An DelResponse Message. Its syntax is :
@@ -67,7 +68,7 @@
     public int computeLength()
     {
         int ldapResponseLength = super.computeLength();
-        
+
         return 1 + Length.getNbBytes( ldapResponseLength ) + ldapResponseLength;
     }
 
@@ -83,7 +84,7 @@
         {
             throw new EncoderException("Cannot put a PDU in a null buffer !");
         }
-        
+
         try
         {
             // The tag
@@ -92,9 +93,9 @@
         }
         catch ( BufferOverflowException boe )
         {
-            throw new EncoderException("The PDU buffer size is too small !"); 
+            throw new EncoderException("The PDU buffer size is too small !");
         }
-        
+
         // The ldapResult
         return super.encode( buffer);
     }

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/DelResponse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/ExtendedRequest.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/ExtendedRequest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/ExtendedRequest.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/ExtendedRequest.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/ExtendedRequest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/pojo/ExtendedRequest.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/ExtendedRequest.java Tue Jan  3 01:02:13 2006
@@ -14,15 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.pojo;
+package org.apache.ldap.common.asn1.pojo;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.tlv.Length;
-import org.apache.asn1new.primitives.OID;
-import org.apache.asn1new.ldap.codec.LdapConstants;
+import org.apache.asn1.primitives.OID;
+import org.apache.asn1.ber.tlv.Length;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
 
 
 /**
@@ -42,7 +42,7 @@
 
     /** The value */
     private byte[] requestValue;
-    
+
     /** The extended request length */
     private transient int extendedRequestLength;
 
@@ -126,12 +126,12 @@
     public int computeLength()
     {
         extendedRequestLength = 1 + Length.getNbBytes( requestName.getOIDLength() ) + requestName.getOIDLength();
-        
+
         if ( requestValue != null)
         {
             extendedRequestLength += 1 + Length.getNbBytes( ( (byte[])requestValue).length ) + ( (byte[])requestValue).length;
         }
-        
+
         return 1 + Length.getNbBytes( extendedRequestLength ) + extendedRequestLength;
     }
 
@@ -153,21 +153,21 @@
             throw new EncoderException("Cannot put a PDU in a null buffer !");
         }
 
-        try 
+        try
         {
             // The BindResponse Tag
             buffer.put( LdapConstants.EXTENDED_REQUEST_TAG );
             buffer.put( Length.getBytes( extendedRequestLength ) );
-            
+
             // The requestName, if any
             if ( requestName == null )
             {
                 throw new EncoderException("The request name must not be null");
             }
-            
+
             buffer.put( (byte)LdapConstants.EXTENDED_REQUEST_NAME_TAG );
             buffer.put( Length.getBytes( requestName.getOIDLength() ) );
-                
+
             if ( requestName.getOIDLength() != 0 )
             {
                 buffer.put( requestName.getOID() );
@@ -177,9 +177,9 @@
             if ( requestValue != null )
             {
                 buffer.put( (byte)LdapConstants.EXTENDED_REQUEST_VALUE_TAG );
-                
+
                 buffer.put( Length.getBytes( requestValue.length ) );
-                
+
                 if ( requestValue.length != 0 )
                 {
                     buffer.put( requestValue );
@@ -188,9 +188,9 @@
         }
         catch ( BufferOverflowException boe )
         {
-            throw new EncoderException("The PDU buffer size is too small !"); 
+            throw new EncoderException("The PDU buffer size is too small !");
         }
-            
+
         return buffer;
     }
 
@@ -205,7 +205,7 @@
 
         sb.append( "    Extended request\n" );
         sb.append( "        Request name : '" ).append( requestName.toString() ).append( "'\n" );
-        
+
         if ( requestValue != null )
         {
             sb.append( "        Request value : '" ).append( requestValue.toString() ).append( "'\n" );

Propchange: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/pojo/ExtendedRequest.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message