directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r365584 [2/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/CompareResponseGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/CompareResponseGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/CompareResponseGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/CompareResponseGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/CompareResponseGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/CompareResponseGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/CompareResponseGrammar.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.UniversalTag;
-import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.pojo.CompareResponse;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
+import org.apache.asn1.ber.grammar.IGrammar;
+import org.apache.asn1.ber.grammar.GrammarTransition;
+import org.apache.asn1.ber.grammar.AbstractGrammar;
+import org.apache.asn1.ber.grammar.GrammarAction;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.asn1.ber.tlv.UniversalTag;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
+import org.apache.ldap.common.asn1.codec.LdapMessageContainer;
+import org.apache.ldap.common.asn1.pojo.CompareResponse;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/DelRequestGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/DelRequestGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/DelRequestGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/DelRequestGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/DelRequestGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/DelRequestGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/DelRequestGrammar.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 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.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.pojo.DelRequest;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
+import org.apache.asn1.ber.grammar.AbstractGrammar;
+import org.apache.asn1.ber.grammar.IGrammar;
+import org.apache.asn1.ber.grammar.GrammarAction;
+import org.apache.asn1.ber.grammar.GrammarTransition;
+import org.apache.asn1.ber.tlv.TLV;
+import org.apache.asn1.ber.IAsn1Container;
+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.pojo.DelRequest;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
 import org.apache.ldap.common.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/DelResponseGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/DelResponseGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/DelResponseGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/DelResponseGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/DelResponseGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/DelResponseGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/DelResponseGrammar.java Tue Jan  3 01:02:13 2006
@@ -14,19 +14,18 @@
  *   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.UniversalTag;
-import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.pojo.DelResponse;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
+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.ldap.common.asn1.codec.LdapConstants;
+import org.apache.ldap.common.asn1.codec.LdapMessageContainer;
+import org.apache.ldap.common.asn1.pojo.DelResponse;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -77,7 +76,7 @@
                 LdapStatesEnum.DEL_RESPONSE_VALUE, LdapStatesEnum.DEL_RESPONSE_LDAP_RESULT, 
                 new GrammarAction( "Init DelResponse" )
                 {
-                    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/DelResponseGrammar.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ExtendedRequestGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ExtendedRequestGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ExtendedRequestGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ExtendedRequestGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ExtendedRequestGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ExtendedRequestGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ExtendedRequestGrammar.java Tue Jan  3 01:02:13 2006
@@ -14,20 +14,20 @@
  *   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.primitives.OID;
-import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.pojo.ExtendedRequest;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
+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.asn1.primitives.OID;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
+import org.apache.ldap.common.asn1.codec.LdapMessageContainer;
+import org.apache.ldap.common.asn1.pojo.ExtendedRequest;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ExtendedResponseGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ExtendedResponseGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ExtendedResponseGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ExtendedResponseGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ExtendedResponseGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ExtendedResponseGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ExtendedResponseGrammar.java Tue Jan  3 01:02:13 2006
@@ -14,21 +14,21 @@
  *   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.primitives.OID;
-import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.pojo.ExtendedResponse;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
+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.asn1.primitives.OID;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
+import org.apache.ldap.common.asn1.codec.LdapMessageContainer;
+import org.apache.ldap.common.asn1.pojo.ExtendedResponse;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/FilterGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/FilterGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/FilterGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/FilterGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/FilterGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/FilterGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/FilterGrammar.java Tue Jan  3 01:02:13 2006
@@ -14,35 +14,35 @@
  *   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.ber.tlv.Value;
-import org.apache.asn1new.util.BooleanDecoder;
-import org.apache.asn1new.util.BooleanDecoderException;
-import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.codec.primitives.LdapStringEncodingException;
-import org.apache.asn1new.ldap.pojo.AttributeValueAssertion;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1new.ldap.pojo.SearchRequest;
-import org.apache.asn1new.ldap.pojo.filters.AndFilter;
-import org.apache.asn1new.ldap.pojo.filters.AttributeValueAssertionFilter;
-import org.apache.asn1new.ldap.pojo.filters.ConnectorFilter;
-import org.apache.asn1new.ldap.pojo.filters.ExtensibleMatchFilter;
-import org.apache.asn1new.ldap.pojo.filters.Filter;
-import org.apache.asn1new.ldap.pojo.filters.NotFilter;
-import org.apache.asn1new.ldap.pojo.filters.OrFilter;
-import org.apache.asn1new.ldap.pojo.filters.PresentFilter;
-import org.apache.asn1new.ldap.pojo.filters.SubstringFilter;
+import org.apache.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.asn1.ber.tlv.Value;
+import org.apache.asn1.util.BooleanDecoderException;
+import org.apache.asn1.util.BooleanDecoder;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
+import org.apache.ldap.common.asn1.codec.LdapMessageContainer;
+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.AttributeValueAssertion;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.asn1.pojo.SearchRequest;
+import org.apache.ldap.common.asn1.pojo.filters.AndFilter;
+import org.apache.ldap.common.asn1.pojo.filters.AttributeValueAssertionFilter;
+import org.apache.ldap.common.asn1.pojo.filters.*;
+import org.apache.ldap.common.asn1.pojo.filters.ExtensibleMatchFilter;
+import org.apache.ldap.common.asn1.pojo.filters.Filter;
+import org.apache.ldap.common.asn1.pojo.filters.NotFilter;
+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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -1194,7 +1194,7 @@
                 LdapStatesEnum.FILTER_MATCHING_MATCH_VALUE_VALUE, LdapStatesEnum.FILTER_MATCHING_DN_ATTRIBUTES_OR_END_TAG, 
                 new GrammarAction( "Store matching match value Value" )
                 {
-                    public void action( IAsn1Container container ) throws DecoderException
+                    public void action( IAsn1Container container )
                     {
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                         container;
@@ -1284,9 +1284,9 @@
      *  - it's a final element (ie an element which cannot contains a Filter)
      *  - its current length equals its expected length.
      * 
-     * @param IAsn1Container The container being decoded
+     * @param container The container being decoded
      */
-    private void unstackFilters( IAsn1Container container ) throws DecoderException
+    private void unstackFilters( IAsn1Container container ) 
     {
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
         LdapMessage      ldapMessage          =   ldapMessageContainer.getLdapMessage();

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

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/LdapControlGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapControlGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/LdapControlGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/LdapControlGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapControlGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapControlGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/LdapControlGrammar.java Tue Jan  3 01:02:13 2006
@@ -14,26 +14,26 @@
  *   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.ber.tlv.Value;
-import org.apache.asn1new.util.BooleanDecoder;
-import org.apache.asn1new.util.BooleanDecoderException;
-import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.codec.primitives.LdapStringEncodingException;
-import org.apache.asn1new.ldap.pojo.Control;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1new.primitives.OID;
+import org.apache.asn1.ber.grammar.IGrammar;
+import org.apache.asn1.ber.grammar.AbstractGrammar;
+import org.apache.asn1.ber.grammar.GrammarAction;
+import org.apache.asn1.ber.grammar.GrammarTransition;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.asn1.ber.tlv.UniversalTag;
+import org.apache.asn1.ber.tlv.TLV;
+import org.apache.asn1.ber.tlv.Value;
+import org.apache.asn1.primitives.OID;
+import org.apache.asn1.util.BooleanDecoderException;
+import org.apache.asn1.util.BooleanDecoder;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
+import org.apache.ldap.common.asn1.codec.LdapMessageContainer;
+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.Control;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
 import org.apache.ldap.common.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -96,7 +96,7 @@
                 LdapStatesEnum.CONTROLS_VALUE, LdapStatesEnum.CONTROL_TAG,
                 new GrammarAction( "Init Controls" )
                 {
-                    public void action( IAsn1Container container ) throws DecoderException
+                    public void action( IAsn1Container container ) 
                     {
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
@@ -139,7 +139,7 @@
                 LdapStatesEnum.CONTROL_VALUE, LdapStatesEnum.CONTROL_TYPE_TAG,
                 new GrammarAction( "Add Control" )
                 {
-                    public void action( IAsn1Container container ) throws DecoderException
+                    public void action( IAsn1Container container )
                     {
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
@@ -305,7 +305,7 @@
                 LdapStatesEnum.CONTROL_VALUE_VALUE, LdapStatesEnum.CONTROL_LOOP_OR_END_TAG, 
                 new GrammarAction( "Set Control value" )
                 {
-                    public void action( IAsn1Container container ) throws DecoderException
+                    public void action( IAsn1Container container )
                     {
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;

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

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/LdapMessageGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapMessageGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/LdapMessageGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/LdapMessageGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapMessageGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapMessageGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/LdapMessageGrammar.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.ber.tlv.Value;
-import org.apache.asn1new.util.IntegerDecoder;
-import org.apache.asn1new.util.IntegerDecoderException;
-import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
+import org.apache.asn1.ber.grammar.AbstractGrammar;
+import org.apache.asn1.ber.grammar.IGrammar;
+import org.apache.asn1.ber.grammar.GrammarTransition;
+import org.apache.asn1.ber.grammar.GrammarAction;
+import org.apache.asn1.ber.tlv.UniversalTag;
+import org.apache.asn1.ber.tlv.Value;
+import org.apache.asn1.ber.tlv.TLV;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.asn1.util.IntegerDecoderException;
+import org.apache.asn1.util.IntegerDecoder;
+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.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/LdapResultGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapResultGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/LdapResultGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/LdapResultGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapResultGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapResultGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/LdapResultGrammar.java Tue Jan  3 01:02:13 2006
@@ -14,34 +14,34 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.grammar;
+package org.apache.ldap.common.asn1.codec.grammar;
 
 import java.util.Iterator;
 
 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.ber.tlv.Value;
-import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.codec.primitives.LdapStringEncodingException;
-import org.apache.asn1new.ldap.codec.primitives.LdapURL;
-import org.apache.asn1new.ldap.codec.primitives.LdapURLEncodingException;
-import org.apache.asn1new.ldap.codec.utils.LdapResultEnum;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1new.ldap.pojo.LdapResponse;
-import org.apache.asn1new.ldap.pojo.LdapResult;
-import org.apache.asn1new.util.IntegerDecoder;
-import org.apache.asn1new.util.IntegerDecoderException;
+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.tlv.UniversalTag;
+import org.apache.asn1.ber.tlv.TLV;
+import org.apache.asn1.ber.tlv.Value;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.asn1.util.IntegerDecoder;
+import org.apache.asn1.util.IntegerDecoderException;
+import org.apache.ldap.common.asn1.codec.LdapConstants;
+import org.apache.ldap.common.asn1.codec.LdapMessageContainer;
+import org.apache.ldap.common.asn1.codec.utils.LdapResultEnum;
+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.*;
+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.LdapResponse;
+import org.apache.ldap.common.asn1.pojo.LdapResult;
 import org.apache.ldap.common.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -322,7 +322,7 @@
                 LdapStatesEnum.LDAP_RESULT_REFERRAL_SEQUENCE_TAG,
                 new GrammarAction( "Store Ldap Result error message" )
                 {
-                    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/LdapResultGrammar.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/LdapStatesEnum.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapStatesEnum.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/LdapStatesEnum.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/LdapStatesEnum.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapStatesEnum.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapStatesEnum.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/LdapStatesEnum.java Tue Jan  3 01:02:13 2006
@@ -14,10 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.grammar;
+package org.apache.ldap.common.asn1.codec.grammar;
 
-import org.apache.asn1new.ber.grammar.IGrammar;
-import org.apache.asn1new.ber.grammar.IStates;
+
+import org.apache.asn1.ber.grammar.IStates;
+import org.apache.asn1.ber.grammar.IGrammar;
 
 
 /**
@@ -170,7 +171,7 @@
 
     /** Control value Value */
     public static int CONTROL_VALUE_VALUE = 9;
-    
+
     /** Another Control, or the end */
     public static int CONTROL_LOOP_OR_END_TAG = 10;
 
@@ -400,7 +401,7 @@
 
     /** SearchRequest attributes description Tag loop */
     public static int SEARCH_REQUEST_ATTRIBUTE_DESCRIPTION_LOOP_TAG = 19;
-    
+
     /** The last state */
     public static int LAST_SEARCH_REQUEST_STATE = 20;
 
@@ -430,7 +431,7 @@
 
     /** Filter Not Value */
     public static int FILTER_NOT_VALUE = 6;
-    
+
     // Filter equalityMatch ---------------------------------------------------
     /** Filter equalityMatch Tag */
     public static int FILTER_EQUALITY_MATCH_TAG = 7;
@@ -497,7 +498,7 @@
 
     /** Filter Assertion Value Value */
     public static int FILTER_ASSERTION_VALUE_VALUE = 25;
-    
+
     // Filter Substrings type -------------------------------------------------
     /** Filter Substrings Type Tag */
     public static int FILTER_SUBSTRINGS_TYPE_TAG = 26;
@@ -539,38 +540,38 @@
     // Filter Matching rule assertion -----------------------------------------
     /** Filter Matching rule assertion Tag */
     public static int FILTER_MATCHING_RULE_ASSERTION_TAG = 37;
-    
+
     /** Filter Matching rule assertion Value */
     public static int FILTER_MATCHING_RULE_ASSERTION_VALUE = 38;
-    
+
     // Filter Matching rule ---------------------------------------------------
     /** Filter Matching rule Tag */
     public static int FILTER_MATCHING_RULE_OR_TYPE_TAG = 39;
-    
+
     /** Filter Matching rule Value */
     public static int FILTER_MATCHING_RULE_VALUE = 40;
-    
+
     // Filter Matching type ---------------------------------------------------
     /** Filter Matching type Tag */
     public static int FILTER_MATCHING_TYPE_OR_MATCH_VALUE_TAG = 41;
-    
+
     /** Filter Matching type Value */
     public static int FILTER_MATCHING_TYPE_VALUE = 42;
-    
+
     // Filter Matching matchValue ---------------------------------------------
     /** Filter Matching matchValue Tag */
     public static int FILTER_MATCHING_MATCH_VALUE_TAG = 43;
-    
+
     /** Filter Matching matchValue Value */
     public static int FILTER_MATCHING_MATCH_VALUE_VALUE = 44;
-    
+
     // Filter Matching dnAttributes -------------------------------------------
     /** Filter Matching dnAttributes Tag */
     public static int FILTER_MATCHING_DN_ATTRIBUTES_OR_END_TAG = 45;
-    
+
     /** Filter Matching dnAttributes Value */
     public static int FILTER_MATCHING_DN_ATTRIBUTES_VALUE = 46;
-    
+
     /** The last state */
     public static int LAST_FILTER_STATE = 47;
 
@@ -597,7 +598,7 @@
 
     /** Attributes Value */
     public static int SEARCH_RESULT_ENTRY_ATTRIBUTES_VALUE = 5;
-    
+
     // Partial Attributes List ------------------------------------------------
     /** Partial Attributes List Tag */
     public static int SEARCH_RESULT_ENTRY_PARTIAL_ATTRIBUTE_LIST_TAG = 6;
@@ -656,49 +657,49 @@
 
     /** Modifications Value */
     public static int MODIFY_REQUEST_MODIFICATIONS_VALUE = 5;
-    
+
     // Modification sequence --------------------------------------------------
     /** Modifications sequence Tag */
     public static int MODIFY_REQUEST_MODIFICATION_SEQUENCE_TAG = 6;
 
     /** Modifications sequence Value */
     public static int MODIFY_REQUEST_MODIFICATION_SEQUENCE_VALUE = 7;
-    
+
     // Operation --------------------------------------------------------------
     /** Operation Tag */
     public static int MODIFY_REQUEST_OPERATION_TAG = 8;
 
     /** Operation Value */
     public static int MODIFY_REQUEST_OPERATION_VALUE = 9;
-    
+
     // Modification  ----------------------------------------------------------
     /** Modification Tag */
     public static int MODIFY_REQUEST_MODIFICATION_TAG = 10;
 
     /** Modification Value */
     public static int MODIFY_REQUEST_MODIFICATION_VALUE = 11;
-    
+
     // Type -------------------------------------------------------------------
     /** Type Tag */
     public static int MODIFY_REQUEST_TYPE_TAG = 12;
-    
+
     /** Type Value */
     public static int MODIFY_REQUEST_TYPE_VALUE = 13;
-    
+
     // Vals -------------------------------------------------------------------
     /** Vals Tag */
     public static int MODIFY_REQUEST_VALS_TAG = 14;
-    
+
     /** Vals Value */
     public static int MODIFY_REQUEST_VALS_VALUE = 15;
-    
+
     // Vals -------------------------------------------------------------------
     /** Attribute value Tag */
     public static int MODIFY_REQUEST_ATTRIBUTE_VALUE_TAG = 16;
-    
+
     /** Attribute value Value*/
     public static int MODIFY_REQUEST_ATTRIBUTE_VALUE_VALUE = 17;
-    
+
     /** The loop */
     public static int MODIFY_REQUEST_ATTRIBUTE_VALUE_OR_MODIFICATION_TAG = 18;
 
@@ -721,10 +722,10 @@
 
     /** Search Result Reference Ldap Url Value */
     public static int SEARCH_RESULT_REFERENCE_LDAP_URL_VALUE = 3;
-    
+
     /** Ldap Url Loop Tag */
     public static int SEARCH_RESULT_REFERENCE_LOOP_OR_END_TAG = 4;
-    
+
     /** The last state */
     public static int LAST_SEARCH_RESULT_REFERENCE_STATE_STATE = 5;
 
@@ -751,38 +752,38 @@
 
     /** Attributes Value */
     public static int ADD_REQUEST_ATTRIBUTES_VALUE = 5;
-    
+
     // Attribute -------------------------------------------------------------è
     /** Attribute Tag */
     public static int ADD_REQUEST_ATTRIBUTE_TAG = 6;
 
     /** Attribute Value */
     public static int ADD_REQUEST_ATTRIBUTE_VALUE = 7;
-    
+
     // Attribute type ---------------------------------------------------------
     /** Attribute type Tag */
     public static int ADD_REQUEST_ATTRIBUTES_TYPE_TAG = 8;
 
     /** Attribute type Value */
     public static int ADD_REQUEST_ATTRIBUTES_TYPE_VALUE = 9;
-    
+
     // Attribute vals ---------------------------------------------------------
     /** Attribute vals Tag */
     public static int ADD_REQUEST_ATTRIBUTES_VALS_TAG = 10;
 
     /** Attribute vals Value */
     public static int ADD_REQUEST_ATTRIBUTES_VALS_VALUE = 11;
-    
+
     // Attribute val ----------------------------------------------------------
     /** Attribute val Tag */
     public static int ADD_REQUEST_ATTRIBUTES_VAL_TAG = 10;
 
     /** Attribute val Value */
     public static int ADD_REQUEST_ATTRIBUTES_VAL_VALUE = 11;
-    
+
     /** Attribute val Loop */
     public static int ADD_REQUEST_ATTRIBUTES_VAL_OR_ATTRIBUTE_OR_END = 12;
-    
+
     /** The last state */
     public static int LAST_ADD_REQUEST_STATE = 13;
 
@@ -809,21 +810,21 @@
 
     /** Enw RDN Value */
     public static int MODIFY_DN_REQUEST_NEW_RDN_VALUE = 5;
-    
+
     // Delete old RDN ---------------------------------------------------------
     /** Delete old RDN Tag */
     public static int MODIFY_DN_REQUEST_DELETE_OLD_RDN_TAG = 6;
 
     /** Delete old RDN Value */
     public static int MODIFY_DN_REQUEST_DELETE_OLD_RDN_VALUE = 7;
-    
+
     // New superior -----------------------------------------------------------
     /** New superior Tag */
     public static int MODIFY_DN_REQUEST_NEW_SUPERIOR_TAG = 8;
 
     /** New superior Value */
     public static int MODIFY_DN_REQUEST_NEW_SUPERIOR_VALUE = 9;
-    
+
     /** The last state */
     public static int LAST_MODIFY_DN_REQUEST_STATE = 10;
 
@@ -846,35 +847,35 @@
     // Compare Request --------------------------------------------------------
     /** Compare Tag */
     public static int COMPARE_REQUEST_TAG = 0;
-    
+
     /** Compare Value */
     public static int COMPARE_REQUEST_VALUE = 1;
-    
+
     // Entry ------------------------------------------------------------------
     /** Entry Tag */
     public static int COMPARE_REQUEST_ENTRY_TAG = 2;
-    
+
     /** Entry Value */
     public static int COMPARE_REQUEST_ENTRY_VALUE = 3;
-    
+
     // AVA --------------------------------------------------------------------
     /** AVA Tag */
     public static int COMPARE_REQUEST_AVA_TAG = 4;
-    
+
     /** AVA Value */
     public static int COMPARE_REQUEST_AVA_VALUE = 5;
-    
+
     // Attribute desc ---------------------------------------------------------
     /** Attribute desc Tag */
     public static int COMPARE_REQUEST_ATTRIBUTE_DESC_TAG = 6;
-    
+
     /** Attribute desc Value */
     public static int COMPARE_REQUEST_ATTRIBUTE_DESC_VALUE = 7;
-    
+
     // Assertion value --------------------------------------------------------
     /** Assertion value Tag */
     public static int COMPARE_REQUEST_ASSERTION_VALUE_TAG = 8;
-    
+
     /** Assertion value Value */
     public static int COMPARE_REQUEST_ASSERTION_VALUE_VALUE = 9;
 
@@ -887,54 +888,54 @@
     // Extended Request -------------------------------------------------------
     /** Extended Tag */
     public static int EXTENDED_REQUEST_TAG = 0;
-    
+
     /** Extended Value */
     public static int EXTENDED_REQUEST_VALUE = 1;
-    
+
     // Name -------------------------------------------------------------------
     /** Name Tag */
     public static int EXTENDED_REQUEST_NAME_TAG = 2;
-    
+
     /** Name Value */
     public static int EXTENDED_REQUEST_NAME_VALUE = 3;
-    
+
     // Value ------------------------------------------------------------------
     /** Value Tag */
     public static int EXTENDED_REQUEST_VALUE_TAG = 4;
-    
+
     /** Value Value */
     public static int EXTENDED_REQUEST_VALUE_VALUE = 5;
-    
+
     /** The last state */
     public static int LAST_EXTENDED_REQUEST_STATE = 6;
-    
+
     //=========================================================================
     // Extended Response grammar states 
     //=========================================================================
     // Extended Response ------------------------------------------------------
     /** Extended Response Tag */
     public static int EXTENDED_RESPONSE_TAG = 0;
-    
+
     /** Extended Response Value */
     public static int EXTENDED_RESPONSE_VALUE = 1;
-    
+
     /** Extended Response Ldap Result (we will switch the grammar here) */
     public static int EXTENDED_RESPONSE_LDAP_RESULT = 2;
 
     // Name -------------------------------------------------------------------
     /** Name Value */
     public static int EXTENDED_RESPONSE_NAME_VALUE = 4;
-    
+
     // Response ------------------------------------------------------------------
     /** Response Tag */
     public static int EXTENDED_RESPONSE_RESPONSE_TAG = 5;
-    
+
     /** Response Value */
     public static int EXTENDED_RESPONSE_RESPONSE_VALUE = 6;
-    
+
     /** The last state */
     public static int LAST_EXTENDED_RESPONSE_STATE = 7;
-    
+
     //=========================================================================
     // Grammars declaration.
     //=========================================================================
@@ -985,103 +986,103 @@
 
     /** AddResponse number */
     public static final int ADD_RESPONSE_GRAMMAR = 7;
-    
+
     /** CompareResponse Grammar */
     public static final int COMPARE_RESPONSE_GRAMMAR_SWITCH = 0x0900;
 
     /** CompareResponse number */
     public static final int COMPARE_RESPONSE_GRAMMAR = 8;
-    
+
     /** DelResponse Grammar */
     public static final int DEL_RESPONSE_GRAMMAR_SWITCH = 0x0A00;
 
     /** DelResponse number */
     public static final int DEL_RESPONSE_GRAMMAR = 9;
-    
+
     /** ModifyResponse Grammar */
     public static final int MODIFY_RESPONSE_GRAMMAR_SWITCH = 0x0B00;
 
     /** ModifyResponse number */
     public static final int MODIFY_RESPONSE_GRAMMAR = 10;
-    
+
     /** ModifyDNResponse Grammar */
     public static final int MODIFY_DN_RESPONSE_GRAMMAR_SWITCH = 0x0C00;
 
     /** ModifyDNResponse number */
     public static final int MODIFY_DN_RESPONSE_GRAMMAR = 11;
-    
+
     /** SearchResultDone Grammar */
     public static final int SEARCH_RESULT_DONE_GRAMMAR_SWITCH = 0x0D00;
 
     /** SearchResultDone number */
     public static final int SEARCH_RESULT_DONE_GRAMMAR = 12;
-    
+
     /** SearchRequest Grammar */
     public static final int SEARCH_REQUEST_GRAMMAR_SWITCH = 0x0E00;
 
     /** SearchRequest number */
     public static final int SEARCH_REQUEST_GRAMMAR = 13;
-    
+
     /** Filter Grammar */
     public static final int FILTER_GRAMMAR_SWITCH = 0x0F00;
 
     /** Filter number */
     public static final int FILTER_GRAMMAR = 14;
-    
+
     /** SearchResultEntry Grammar */
     public static final int SEARCH_RESULT_ENTRY_GRAMMAR_SWITCH = 0x1000;
 
     /** SearchResultEntry number */
     public static final int SEARCH_RESULT_ENTRY_GRAMMAR = 15;
-    
+
     /** ModifyRequest Grammar */
     public static final int MODIFY_REQUEST_GRAMMAR_SWITCH = 0x1100;
 
     /** ModifyRequest number */
     public static final int MODIFY_REQUEST_GRAMMAR = 16;
-    
+
     /** SearchResultReference Grammar */
     public static final int SEARCH_RESULT_REFERENCE_GRAMMAR_SWITCH = 0x1200;
 
     /** SearchResultReference number */
     public static final int SEARCH_RESULT_REFERENCE_GRAMMAR = 17;
-    
+
     /** AddRequest Grammar */
     public static final int ADD_REQUEST_GRAMMAR_SWITCH = 0x1300;
 
     /** AddRequest number */
     public static final int ADD_REQUEST_GRAMMAR = 18;
-    
+
     /** ModifyDNRequest Grammar */
     public static final int MODIFY_DN_REQUEST_GRAMMAR_SWITCH = 0x1400;
 
     /** ModifyDNRequest number */
     public static final int MODIFY_DN_REQUEST_GRAMMAR = 19;
-    
+
     /** DelRequest Grammar */
     public static final int DEL_REQUEST_GRAMMAR_SWITCH = 0x1500;
 
     /** DelRequest number */
     public static final int DEL_REQUEST_GRAMMAR = 20;
-    
+
     /** CompareRequest Grammar */
     public static final int COMPARE_REQUEST_GRAMMAR_SWITCH = 0x1600;
 
     /** CompareRequest number */
     public static final int COMPARE_REQUEST_GRAMMAR = 21;
-    
+
     /** ExtendedRequest Grammar */
     public static final int EXTENDED_REQUEST_GRAMMAR_SWITCH = 0x1700;
 
     /** ExtendedRequest number */
     public static final int EXTENDED_REQUEST_GRAMMAR = 22;
-    
+
     /** ExtendedResponse Grammar */
     public static final int EXTENDED_RESPONSE_GRAMMAR_SWITCH = 0x1800;
 
     /** ExtendedResponse number */
     public static final int EXTENDED_RESPONSE_GRAMMAR = 23;
-    
+
     /** The total number of grammars used */
     public static final int NB_GRAMMARS = 24;
 
@@ -1092,9 +1093,9 @@
     private static String[] GrammarSwitchString =
         new String[]
         {
-            "LDAP_MESSAGE_GRAMMAR_SWITCH", 
+            "LDAP_MESSAGE_GRAMMAR_SWITCH",
             "LDAP_RESULT_GRAMMAR_SWITCH",
-            "LDAP_CONTROL_GRAMMAR_SWITCH", 
+            "LDAP_CONTROL_GRAMMAR_SWITCH",
             "BIND_REQUEST_GRAMMAR_SWITCH",
             "BIND_RESPONSE_GRAMMAR_SWITCH",
             "UNBIND_REQUEST_GRAMMAR_SWITCH",
@@ -1125,10 +1126,10 @@
     private static String[] LdapMessageString =
         new String[]
         {
-            "LDAP_MESSAGE_TAG", 
-            "LDAP_MESSAGE_VALUE", 
+            "LDAP_MESSAGE_TAG",
+            "LDAP_MESSAGE_VALUE",
             "LDAP_MESSAGE_ID_TAG",
-            "LDAP_MESSAGE_ID_VALUE", 
+            "LDAP_MESSAGE_ID_VALUE",
             "PROTOCOL_OP_TAG",
             "PROTOCOL_OP_VALUE"
         };
@@ -1137,14 +1138,14 @@
     private static String[] LdapResultString =
         new String[]
         {
-            "LDAP_RESULT_CODE_TAG", 
+            "LDAP_RESULT_CODE_TAG",
             "LDAP_RESULT_CODE_VALUE",
-            "LDAP_RESULT_MATCHED_DN_TAG", 
-            "LDAP_RESULT_MATCHED_DN_VALUE", 
+            "LDAP_RESULT_MATCHED_DN_TAG",
+            "LDAP_RESULT_MATCHED_DN_VALUE",
             "LDAP_RESULT_ERROR_MESSAGE_TAG",
             "LDAP_RESULT_ERROR_MESSAGE_VALUE",
-            "LDAP_RESULT_REFERRAL_SEQUENCE_TAG", 
-            "LDAP_RESULT_REFERRAL_TAG", 
+            "LDAP_RESULT_REFERRAL_SEQUENCE_TAG",
+            "LDAP_RESULT_REFERRAL_TAG",
             "LDAP_RESULT_REFERRAL_VALUE",
             "LDAP_RESULT_REFERRAL_LOOP_TAG"
         };
@@ -1153,15 +1154,15 @@
     private static String[] LdapControlString =
         new String[]
         {
-            "CONTROLS_TAG", 
-            "CONTROLS_VALUE", 
-            "CONTROL_TAG", 
-            "CONTROL_VALUE", 
-            "CONTROL_TYPE_TAG", 
+            "CONTROLS_TAG",
+            "CONTROLS_VALUE",
+            "CONTROL_TAG",
+            "CONTROL_VALUE",
+            "CONTROL_TYPE_TAG",
             "CONTROL_TYPE_VALUE",
-            "CONTROL_LOOP_OR_CRITICAL_OR_VALUE_TAG", 
-            "CONTROL_CRITICALITY_VALUE", 
-            "CONTROL_LOOP_OR_VALUE_TAG", 
+            "CONTROL_LOOP_OR_CRITICAL_OR_VALUE_TAG",
+            "CONTROL_CRITICALITY_VALUE",
+            "CONTROL_LOOP_OR_VALUE_TAG",
             "CONTROL_VALUE_VALUE",
             "CONTROL_LOOP_OR_END_TAG"
         };
@@ -1170,12 +1171,12 @@
     private static String[] BindRequestString =
         new String[]
         {
-            "BIND_REQUEST_TAG", 
+            "BIND_REQUEST_TAG",
             "BIND_REQUEST_VALUE",
-            "BIND_REQUEST_VERSION_TAG", 
-            "BIND_REQUEST_VERSION_VALUE", 
-            "BIND_REQUEST_NAME_TAG", 
-            "BIND_REQUEST_NAME_VALUE", 
+            "BIND_REQUEST_VERSION_TAG",
+            "BIND_REQUEST_VERSION_VALUE",
+            "BIND_REQUEST_NAME_TAG",
+            "BIND_REQUEST_NAME_VALUE",
             "BIND_REQUEST_AUTHENTICATION_CHOICE_TAG",
             "BIND_REQUEST_AUTHENTICATION_SIMPLE_VALUE",
             "BIND_REQUEST_AUTHENTICATION_SASL_VALUE",
@@ -1189,10 +1190,10 @@
     private static String[] BindResponseString =
         new String[]
         {
-            "BIND_RESPONSE_TAG", 
+            "BIND_RESPONSE_TAG",
             "BIND_RESPONSE_VALUE",
             "BIND_RESPONSE_LDAP_RESULT",
-            "BIND_RESPONSE_SERVER_SASL_CREDS_TAG", 
+            "BIND_RESPONSE_SERVER_SASL_CREDS_TAG",
             "BIND_RESPONSE_SERVER_SASL_CREDS_VALUE"
         };
 
@@ -1200,8 +1201,8 @@
     private static String[] UnBindRequestString =
         new String[]
         {
-            "UNBIND_REQUEST_TAG", 
-            "UNBIND_REQUEST_VALUE" 
+            "UNBIND_REQUEST_TAG",
+            "UNBIND_REQUEST_VALUE"
         };
 
     /** A string representation of all the Abandon Request states */
@@ -1216,7 +1217,7 @@
     private static String[] AddResponseString =
         new String[]
         {
-            "ADD_RESPONSE_TAG", 
+            "ADD_RESPONSE_TAG",
             "ADD_RESPONSE_VALUE",
             "ADD_RESPONSE_LDAP_RESULT"
         };
@@ -1225,7 +1226,7 @@
     private static String[] CompareResponseString =
         new String[]
         {
-            "COMPARE_RESPONSE_TAG", 
+            "COMPARE_RESPONSE_TAG",
             "COMPARE_RESPONSE_VALUE",
             "COMPARE_RESPONSE_LDAP_RESULT"
         };
@@ -1234,7 +1235,7 @@
     private static String[] DelResponseString =
         new String[]
         {
-            "DEL_RESPONSE_TAG", 
+            "DEL_RESPONSE_TAG",
             "DEL_RESPONSE_VALUE",
             "DEL_RESPONSE_LDAP_RESULT"
         };
@@ -1243,7 +1244,7 @@
     private static String[] ModifyResponseString =
         new String[]
         {
-            "MODIFY_RESPONSE_TAG", 
+            "MODIFY_RESPONSE_TAG",
             "MODIFY_RESPONSE_VALUE",
             "MODIFY_RESPONSE_LDAP_RESULT"
         };
@@ -1252,7 +1253,7 @@
     private static String[] ModifyDNResponseString =
         new String[]
         {
-            "MODIFY_DN_RESPONSE_TAG", 
+            "MODIFY_DN_RESPONSE_TAG",
             "MODIFY_DN_RESPONSE_VALUE",
             "MODIFY_DN_RESPONSE_LDAP_RESULT"
         };
@@ -1261,7 +1262,7 @@
     private static String[] SearchResultDoneString =
         new String[]
         {
-            "SEARCH_RESULT_DONE_TAG", 
+            "SEARCH_RESULT_DONE_TAG",
             "SEARCH_RESULT_DONE_VALUE",
             "SEARCH_RESULT_DONE_LDAP_RESULT"
         };
@@ -1317,23 +1318,23 @@
             "FILTER_APPROX_MATCH_VALUE",
             "FILTER_EXTENSIBLE_MATCH_TAG",
             "FILTER_EXTENSIBLE_MATCH_VALUE",
-            "FILTER_LOOP_TAG",					
+            "FILTER_LOOP_TAG",
             "FILTER_ATTRIBUTE_DESC_TAG",
             "FILTER_ATTRIBUTE_DESC_VALUE",
             "FILTER_ASSERTION_VALUE_TAG",
             "FILTER_ASSERTION_VALUE_VALUE",
-		    "FILTER_SUBSTRINGS_TYPE_TAG",
-		    "FILTER_SUBSTRINGS_TYPE_VALUE",
-		    "FILTER_SUBSTRINGS_SUBSTRINGS_TAG",
-		    "FILTER_SUBSTRINGS_SUBSTRINGS_VALUE",    
-		    "FILTER_SUBSTRINGS_SUBSTRINGS_CHOICE_TAG",
-		    "FILTER_SUBSTRINGS_SUBSTRINGS_INITIAL_TAG",
-		    "FILTER_SUBSTRINGS_SUBSTRINGS_INITIAL_VALUE",
-		    "FILTER_SUBSTRINGS_SUBSTRINGS_ANY_OR_FINAL_TAG",
-		    "FILTER_SUBSTRINGS_SUBSTRINGS_ANY_VALUE",
-		    "FILTER_SUBSTRINGS_SUBSTRINGS_FINAL_TAG",
-		    "FILTER_SUBSTRINGS_SUBSTRINGS_FINAL_VALUE",
-		    "FILTER_MATCHING_RULE_ASSERTION_TAG",
+            "FILTER_SUBSTRINGS_TYPE_TAG",
+            "FILTER_SUBSTRINGS_TYPE_VALUE",
+            "FILTER_SUBSTRINGS_SUBSTRINGS_TAG",
+            "FILTER_SUBSTRINGS_SUBSTRINGS_VALUE",
+            "FILTER_SUBSTRINGS_SUBSTRINGS_CHOICE_TAG",
+            "FILTER_SUBSTRINGS_SUBSTRINGS_INITIAL_TAG",
+            "FILTER_SUBSTRINGS_SUBSTRINGS_INITIAL_VALUE",
+            "FILTER_SUBSTRINGS_SUBSTRINGS_ANY_OR_FINAL_TAG",
+            "FILTER_SUBSTRINGS_SUBSTRINGS_ANY_VALUE",
+            "FILTER_SUBSTRINGS_SUBSTRINGS_FINAL_TAG",
+            "FILTER_SUBSTRINGS_SUBSTRINGS_FINAL_VALUE",
+            "FILTER_MATCHING_RULE_ASSERTION_TAG",
             "FILTER_MATCHING_RULE_ASSERTION_VALUE",
             "FILTER_MATCHING_RULE_OR_TYPE_TAG",
             "FILTER_MATCHING_RULE_VALUE",
@@ -1344,64 +1345,64 @@
             "FILTER_MATCHING_DN_ATTRIBUTES_OR_END_TAG",
             "FILTER_MATCHING_DN_ATTRIBUTES_VALUE"
         };
-    
+
     /** A string representation of all the search result entry states */
     private static String[] SearchResultEntryString =
         new String[]
         {
-		    "SEARCH_RESULT_ENTRY_TAG",
-		    "SEARCH_RESULT_ENTRY_VALUE",
-		    "SEARCH_RESULT_ENTRY_OBJECT_NAME_TAG",
-		    "SEARCH_RESULT_ENTRY_OBJECT_NAME_VALUE",
-		    "SEARCH_RESULT_ENTRY_ATTRIBUTES_TAG",
-		    "SEARCH_RESULT_ENTRY_ATTRIBUTES_VALUE",
-		    "SEARCH_RESULT_ENTRY_PARTIAL_ATTRIBUTE_LIST_TAG",
-		    "SEARCH_RESULT_ENTRY_PARTIAL_ATTRIBUTE_LIST_VALUE",
-		    "SEARCH_RESULT_ENTRY_TYPE_TAG",
-		    "SEARCH_RESULT_ENTRY_TYPE_VALUE",
-		    "SEARCH_RESULT_ENTRY_VALS_TAG",
-		    "SEARCH_RESULT_ENTRY_VALS_VALUE",
-		    "SEARCH_RESULT_ENTRY_ATTRIBUTE_VALUE_TAG",
-		    "SEARCH_RESULT_ENTRY_ATTRIBUTE_VALUE_VALUE",
-		    "SEARCH_RESULT_ENTRY_ATTRIBUTE_VALUE_OR_LIST_TAG"
+            "SEARCH_RESULT_ENTRY_TAG",
+            "SEARCH_RESULT_ENTRY_VALUE",
+            "SEARCH_RESULT_ENTRY_OBJECT_NAME_TAG",
+            "SEARCH_RESULT_ENTRY_OBJECT_NAME_VALUE",
+            "SEARCH_RESULT_ENTRY_ATTRIBUTES_TAG",
+            "SEARCH_RESULT_ENTRY_ATTRIBUTES_VALUE",
+            "SEARCH_RESULT_ENTRY_PARTIAL_ATTRIBUTE_LIST_TAG",
+            "SEARCH_RESULT_ENTRY_PARTIAL_ATTRIBUTE_LIST_VALUE",
+            "SEARCH_RESULT_ENTRY_TYPE_TAG",
+            "SEARCH_RESULT_ENTRY_TYPE_VALUE",
+            "SEARCH_RESULT_ENTRY_VALS_TAG",
+            "SEARCH_RESULT_ENTRY_VALS_VALUE",
+            "SEARCH_RESULT_ENTRY_ATTRIBUTE_VALUE_TAG",
+            "SEARCH_RESULT_ENTRY_ATTRIBUTE_VALUE_VALUE",
+            "SEARCH_RESULT_ENTRY_ATTRIBUTE_VALUE_OR_LIST_TAG"
         };
-    
+
     /** A string representation of all the modify request states */
     private static String[] ModifyRequestString =
         new String[]
         {
-		    "MODIFY_REQUEST_TAG",
-		    "MODIFY_REQUEST_VALUE",
-		    "MODIFY_REQUEST_OBJECT_TAG",
-		    "MODIFY_REQUEST_OBJECT_VALUE",
-		    "MODIFY_REQUEST_MODIFICATIONS_TAG",
-		    "MODIFY_REQUEST_MODIFICATIONS_VALUE",
-		    "MODIFY_REQUEST_MODIFICATION_SEQUENCE_TAG",
-		    "MODIFY_REQUEST_MODIFICATION_SEQUENCE_VALUE",
-		    "MODIFY_REQUEST_OPERATION_TAG",
-		    "MODIFY_REQUEST_OPERATION_VALUE",
-		    "MODIFY_REQUEST_MODIFICATION_TAG",
-		    "MODIFY_REQUEST_MODIFICATION_VALUE",
-		    "MODIFY_REQUEST_TYPE_TAG",
-		    "MODIFY_REQUEST_TYPE_VALUE",
-		    "MODIFY_REQUEST_VALS_TAG",
-		    "MODIFY_REQUEST_VALS_VALUE",
-		    "MODIFY_REQUEST_ATTRIBUTE_VALUE_TAG",
-		    "MODIFY_REQUEST_ATTRIBUTE_VALUE_VALUE",
-		    "MODIFY_REQUEST_ATTRIBUTE_VALUE_OR_MODIFICATION_TAG"
+            "MODIFY_REQUEST_TAG",
+            "MODIFY_REQUEST_VALUE",
+            "MODIFY_REQUEST_OBJECT_TAG",
+            "MODIFY_REQUEST_OBJECT_VALUE",
+            "MODIFY_REQUEST_MODIFICATIONS_TAG",
+            "MODIFY_REQUEST_MODIFICATIONS_VALUE",
+            "MODIFY_REQUEST_MODIFICATION_SEQUENCE_TAG",
+            "MODIFY_REQUEST_MODIFICATION_SEQUENCE_VALUE",
+            "MODIFY_REQUEST_OPERATION_TAG",
+            "MODIFY_REQUEST_OPERATION_VALUE",
+            "MODIFY_REQUEST_MODIFICATION_TAG",
+            "MODIFY_REQUEST_MODIFICATION_VALUE",
+            "MODIFY_REQUEST_TYPE_TAG",
+            "MODIFY_REQUEST_TYPE_VALUE",
+            "MODIFY_REQUEST_VALS_TAG",
+            "MODIFY_REQUEST_VALS_VALUE",
+            "MODIFY_REQUEST_ATTRIBUTE_VALUE_TAG",
+            "MODIFY_REQUEST_ATTRIBUTE_VALUE_VALUE",
+            "MODIFY_REQUEST_ATTRIBUTE_VALUE_OR_MODIFICATION_TAG"
         };
 
     /** A string representation of all the search result reference states */
     private static String[] SearchResultReferenceString =
         new String[]
         {
-		    "SEARCH_RESULT_REFERENCE_TAG",
-		    "SEARCH_RESULT_REFERENCE_VALUE",
-		    "SEARCH_RESULT_REFERENCE_LDAP_URL_TAG",
-		    "SEARCH_RESULT_REFERENCE_LDAP_URL_VALUE",
-		    "SEARCH_RESULT_REFERENCE_LOOP_OR_END_TAG"
+            "SEARCH_RESULT_REFERENCE_TAG",
+            "SEARCH_RESULT_REFERENCE_VALUE",
+            "SEARCH_RESULT_REFERENCE_LDAP_URL_TAG",
+            "SEARCH_RESULT_REFERENCE_LDAP_URL_VALUE",
+            "SEARCH_RESULT_REFERENCE_LOOP_OR_END_TAG"
         };
-    
+
     /** A string representation of all the add request states */
     private static String[] AddRequestString =
         new String[]
@@ -1422,72 +1423,72 @@
             "ADD_REQUEST_ATTRIBUTES_VAL_VALUE",
             "ADD_REQUEST_ATTRIBUTES_VAL_OR_ATTRIBUTE_OR_END"
         };
-    
+
     /** A string representation of all the ModifyDN request states */
     private static String[] ModifyDNRequestString =
         new String[]
         {
-		    "MODIFY_DN_REQUEST_TAG",
-		    "MODIFY_DN_REQUEST_VALUE",
-		    "MODIFY_DN_REQUEST_ENTRY_TAG",
-		    "MODIFY_DN_REQUEST_ENTRY_VALUE",
-		    "MODIFY_DN_REQUEST_NEW_RDN_TAG",
-		    "MODIFY_DN_REQUEST_NEW_RDN_VALUE",
-		    "MODIFY_DN_REQUEST_DELETE_OLD_RDN_TAG",
-		    "MODIFY_DN_REQUEST_DELETE_OLD_RDN_VALUE",
-		    "MODIFY_DN_REQUEST_NEW_SUPERIOR_TAG",
-		    "MODIFY_DN_REQUEST_NEW_SUPERIOR_VALUE"
+            "MODIFY_DN_REQUEST_TAG",
+            "MODIFY_DN_REQUEST_VALUE",
+            "MODIFY_DN_REQUEST_ENTRY_TAG",
+            "MODIFY_DN_REQUEST_ENTRY_VALUE",
+            "MODIFY_DN_REQUEST_NEW_RDN_TAG",
+            "MODIFY_DN_REQUEST_NEW_RDN_VALUE",
+            "MODIFY_DN_REQUEST_DELETE_OLD_RDN_TAG",
+            "MODIFY_DN_REQUEST_DELETE_OLD_RDN_VALUE",
+            "MODIFY_DN_REQUEST_NEW_SUPERIOR_TAG",
+            "MODIFY_DN_REQUEST_NEW_SUPERIOR_VALUE"
         };
 
     /** A string representation of all the delete request states */
     private static String[] DelRequestString =
         new String[]
         {
-		    "DEL_REQUEST_TAG",
-		    "DEL_REQUEST_VALUE"
+            "DEL_REQUEST_TAG",
+            "DEL_REQUEST_VALUE"
         };
 
     /** A string representation of all the compare request states */
     private static String[] CompareRequestString =
         new String[]
         {
-		    "COMPARE_REQUEST_TAG",
-		    "COMPARE_REQUEST_VALUE",
-		    "COMPARE_REQUEST_ENTRY_TAG",
-		    "COMPARE_REQUEST_ENTRY_VALUE",
-		    "COMPARE_REQUEST_AVA_TAG",
-		    "COMPARE_REQUEST_AVA_VALUE",
-		    "COMPARE_REQUEST_ATTRIBUTE_DESC_TAG",
-		    "COMPARE_REQUEST_ATTRIBUTE_DESC_VALUE",
-		    "COMPARE_REQUEST_ASSERTION_VALUE_TAG",
-		    "COMPARE_REQUEST_ASSERTION_VALUE_VALUE"
+            "COMPARE_REQUEST_TAG",
+            "COMPARE_REQUEST_VALUE",
+            "COMPARE_REQUEST_ENTRY_TAG",
+            "COMPARE_REQUEST_ENTRY_VALUE",
+            "COMPARE_REQUEST_AVA_TAG",
+            "COMPARE_REQUEST_AVA_VALUE",
+            "COMPARE_REQUEST_ATTRIBUTE_DESC_TAG",
+            "COMPARE_REQUEST_ATTRIBUTE_DESC_VALUE",
+            "COMPARE_REQUEST_ASSERTION_VALUE_TAG",
+            "COMPARE_REQUEST_ASSERTION_VALUE_VALUE"
         };
 
     /** A string representation of all the extended request states */
     private static String[] ExtendedRequestString =
         new String[]
         {
-		    "EXTENDED_REQUEST_TAG",
-		    "EXTENDED_REQUEST_VALUE",
-		    "EXTENDED_REQUEST_NAME_TAG",
-		    "EXTENDED_REQUEST_NAME_VALUE",
-		    "EXTENDED_REQUEST_VALUE_TAG",
-		    "EXTENDED_REQUEST_VALUE_VALUE"
+            "EXTENDED_REQUEST_TAG",
+            "EXTENDED_REQUEST_VALUE",
+            "EXTENDED_REQUEST_NAME_TAG",
+            "EXTENDED_REQUEST_NAME_VALUE",
+            "EXTENDED_REQUEST_VALUE_TAG",
+            "EXTENDED_REQUEST_VALUE_VALUE"
         };
 
     /** A string representation of all the extended response states */
     private static String[] ExtendedResponseString =
         new String[]
         {
-		    "EXTENDED_RESPONSE_TAG",
-		    "EXTENDED_RESPONSE_VALUE",
-		    "EXTENDED_RESPONSE_LDAP_RESULT",
-		    "EXTENDED_RESPONSE_NAME_TAG",
-		    "EXTENDED_RESPONSE_NAME_VALUE",
-		    "EXTENDED_RESPONSE_VALUE_TAG",
-		    "EXTENDED_RESPONSE_VALUE_VALUE"
+            "EXTENDED_RESPONSE_TAG",
+            "EXTENDED_RESPONSE_VALUE",
+            "EXTENDED_RESPONSE_LDAP_RESULT",
+            "EXTENDED_RESPONSE_NAME_TAG",
+            "EXTENDED_RESPONSE_NAME_VALUE",
+            "EXTENDED_RESPONSE_VALUE_TAG",
+            "EXTENDED_RESPONSE_VALUE_VALUE"
         };
-    
+
     /** The instance */
     private static LdapStatesEnum instance = new LdapStatesEnum();
 
@@ -1511,10 +1512,10 @@
     {
         return instance;
     }
-    
+
     /**
      * Get the grammar name
-     * @param The grammar code
+     * @param grammar The grammar code
      * @return The grammar name
      */
     public String getGrammarName(int grammar)
@@ -1546,16 +1547,16 @@
             case EXTENDED_REQUEST_GRAMMAR        : return "EXTENDED_REQUEST_GRAMMAR";
             case EXTENDED_RESPONSE_GRAMMAR       : return "EXTENDED_RESPONSE_GRAMMAR";
 
-        	default                              : return "UNKNOWN";
+            default                              : return "UNKNOWN";
         }
     }
 
     /**
      * Get the grammar name
-     * @param The grammar class
+     * @param grammar The grammar class
      * @return The grammar name
      */
-    public String getGrammarName(IGrammar grammar)
+    public String getGrammarName( IGrammar grammar)
     {
         if (grammar instanceof LdapMessageGrammar)
         {
@@ -1569,11 +1570,11 @@
         {
             return "LDAP_CONTROL_GRAMMAR";
         }
-        else if (grammar instanceof BindRequestGrammar)
+        else if (grammar instanceof BindRequestGrammar )
         {
             return "BIND_REQUEST_GRAMMAR";
         }
-        else if (grammar instanceof BindResponseGrammar)
+        else if (grammar instanceof BindResponseGrammar )
         {
             return "BIND_RESPONSE_GRAMMAR";
         }
@@ -1581,11 +1582,11 @@
         {
             return "UNBIND_REQUEST_GRAMMAR";
         }
-        else if (grammar instanceof AbandonRequestGrammar)
+        else if (grammar instanceof AbandonRequestGrammar )
         {
             return "ABANDON_REQUEST_GRAMMAR";
         }
-        else if (grammar instanceof AddResponseGrammar)
+        else if (grammar instanceof AddResponseGrammar )
         {
             return "ADD_RESPONSE_GRAMMAR";
         }
@@ -1629,7 +1630,7 @@
         {
             return "SEARCH_RESULT_REFERENCE_GRAMMAR";
         }
-        else if (grammar instanceof AddRequestGrammar)
+        else if (grammar instanceof AddRequestGrammar )
         {
             return "ADD_REQUEST_GRAMMAR";
         }
@@ -1653,7 +1654,7 @@
         {
             return "EXTENDED_RESPONSE_GRAMMAR";
         }
-        else 
+        else
         {
             return "UNKNOWN GRAMMAR";
         }
@@ -1727,31 +1728,31 @@
 
                 case FILTER_GRAMMAR :
                     return ( ( state == GRAMMAR_END ) ? "FILTER_END_STATE" : FilterString[state] );
-                    
+
                 case SEARCH_RESULT_ENTRY_GRAMMAR :
                     return ( ( state == GRAMMAR_END ) ? "SEARCH_RESULT_ENTRY_END_STATE" : SearchResultEntryString[state] );
-                    
+
                 case MODIFY_REQUEST_GRAMMAR :
                     return ( ( state == GRAMMAR_END ) ? "MODIFY_REQUEST_END_STATE" : ModifyRequestString[state] );
-                    
+
                 case ADD_REQUEST_GRAMMAR :
                     return ( ( state == GRAMMAR_END ) ? "ADD_REQUEST_END_STATE" : AddRequestString[state] );
 
                 case MODIFY_DN_REQUEST_GRAMMAR :
                     return ( ( state == GRAMMAR_END ) ? "MODIFY_DN_REQUEST_END_STATE" : ModifyDNRequestString[state] );
-                                        
+
                 case DEL_REQUEST_GRAMMAR :
                     return ( ( state == GRAMMAR_END ) ? "DEL_REQUEST_END_STATE" : DelRequestString[state] );
-                                        
+
                 case COMPARE_REQUEST_GRAMMAR :
                     return ( ( state == GRAMMAR_END ) ? "COMPARE_REQUEST_END_STATE" : CompareRequestString[state] );
-                                        
+
                 case EXTENDED_REQUEST_GRAMMAR :
                     return ( ( state == GRAMMAR_END ) ? "EXTENDED_REQUEST_END_STATE" : ExtendedRequestString[state] );
-                                        
+
                 case EXTENDED_RESPONSE_GRAMMAR :
                     return ( ( state == GRAMMAR_END ) ? "EXTENDED_RESPONSE_END_STATE" : ExtendedResponseString[state] );
-                                        
+
                 default :
                     return "UNKNOWN";
             }

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

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ModifyDNRequestGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyDNRequestGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ModifyDNRequestGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ModifyDNRequestGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyDNRequestGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyDNRequestGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ModifyDNRequestGrammar.java Tue Jan  3 01:02:13 2006
@@ -14,27 +14,27 @@
  *   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.ber.tlv.Value;
-import org.apache.asn1new.util.BooleanDecoder;
-import org.apache.asn1new.util.BooleanDecoderException;
-import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapRDN;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1new.ldap.pojo.ModifyDNRequest;
+import org.apache.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.asn1.ber.tlv.Value;
+import org.apache.asn1.util.BooleanDecoderException;
+import org.apache.asn1.util.BooleanDecoder;
+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.LdapRDN;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.asn1.pojo.ModifyDNRequest;
 import org.apache.ldap.common.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -86,7 +86,7 @@
                 LdapStatesEnum.MODIFY_DN_REQUEST_VALUE, LdapStatesEnum.MODIFY_DN_REQUEST_ENTRY_TAG,
                 new GrammarAction( "Init Modify DN Request" )
                 {
-                    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/ModifyDNRequestGrammar.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ModifyDNResponseGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyDNResponseGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ModifyDNResponseGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ModifyDNResponseGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyDNResponseGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyDNResponseGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ModifyDNResponseGrammar.java Tue Jan  3 01:02:13 2006
@@ -14,19 +14,18 @@
  *   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.UniversalTag;
-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.ModifyDNResponse;
+import org.apache.asn1.ber.grammar.IGrammar;
+import org.apache.asn1.ber.grammar.GrammarTransition;
+import org.apache.asn1.ber.grammar.AbstractGrammar;
+import org.apache.asn1.ber.grammar.GrammarAction;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.asn1.ber.tlv.UniversalTag;
+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.ModifyDNResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -77,7 +76,7 @@
                 LdapStatesEnum.MODIFY_DN_RESPONSE_VALUE, LdapStatesEnum.MODIFY_DN_RESPONSE_LDAP_RESULT, 
                 new GrammarAction( "Init ModifyDNResponse" )
                 {
-                    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/ModifyDNResponseGrammar.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ModifyRequestGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyRequestGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ModifyRequestGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ModifyRequestGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyRequestGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyRequestGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ModifyRequestGrammar.java Tue Jan  3 01:02:13 2006
@@ -14,27 +14,27 @@
  *   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.util.IntegerDecoder;
-import org.apache.asn1new.util.IntegerDecoderException;
-import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.codec.primitives.LdapStringEncodingException;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1new.ldap.pojo.ModifyRequest;
+import org.apache.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.asn1.util.IntegerDecoder;
+import org.apache.asn1.util.IntegerDecoderException;
+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.ModifyRequest;
 import org.apache.ldap.common.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -85,7 +85,7 @@
                 LdapStatesEnum.MODIFY_REQUEST_VALUE, LdapStatesEnum.MODIFY_REQUEST_OBJECT_TAG,
                 new GrammarAction( "Init ModifyRequest" )
                 {
-                    public void action( IAsn1Container container ) throws DecoderException
+                    public void action( IAsn1Container container )
                     {
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
@@ -178,7 +178,7 @@
                 LdapStatesEnum.MODIFY_REQUEST_MODIFICATION_SEQUENCE_TAG,
                 new GrammarAction( "Init modifications array list" )
                 {
-                    public void action( IAsn1Container container ) throws DecoderException
+                    public void action( IAsn1Container container )
                     {
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
@@ -434,7 +434,7 @@
                 LdapStatesEnum.MODIFY_REQUEST_ATTRIBUTE_VALUE_OR_MODIFICATION_TAG,
                 new GrammarAction( "Store 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/ModifyRequestGrammar.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ModifyResponseGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyResponseGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ModifyResponseGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ModifyResponseGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyResponseGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/ModifyResponseGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/ModifyResponseGrammar.java Tue Jan  3 01:02:13 2006
@@ -14,19 +14,18 @@
  *   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.UniversalTag;
-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.ModifyResponse;
+import org.apache.asn1.ber.grammar.IGrammar;
+import org.apache.asn1.ber.grammar.GrammarTransition;
+import org.apache.asn1.ber.grammar.AbstractGrammar;
+import org.apache.asn1.ber.grammar.GrammarAction;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.asn1.ber.tlv.UniversalTag;
+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.ModifyResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -77,7 +76,7 @@
                 LdapStatesEnum.MODIFY_RESPONSE_VALUE, LdapStatesEnum.MODIFY_RESPONSE_LDAP_RESULT, 
                 new GrammarAction( "Init ModifyResponse" )
                 {
-                    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/ModifyResponseGrammar.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/SearchRequestGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchRequestGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/SearchRequestGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/SearchRequestGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchRequestGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchRequestGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/SearchRequestGrammar.java Tue Jan  3 01:02:13 2006
@@ -14,30 +14,30 @@
  *   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.ber.tlv.Value;
-import org.apache.asn1new.util.BooleanDecoder;
-import org.apache.asn1new.util.BooleanDecoderException;
-import org.apache.asn1new.util.IntegerDecoder;
-import org.apache.asn1new.util.IntegerDecoderException;
-import org.apache.asn1new.ldap.codec.LdapConstants;
-import org.apache.asn1new.ldap.codec.LdapMessageContainer;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.codec.primitives.LdapStringEncodingException;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1new.ldap.pojo.SearchRequest;
+import org.apache.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.asn1.ber.tlv.Value;
+import org.apache.asn1.util.IntegerDecoderException;
+import org.apache.asn1.util.IntegerDecoder;
+import org.apache.asn1.util.BooleanDecoder;
+import org.apache.asn1.util.BooleanDecoderException;
+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.SearchRequest;
 import org.apache.ldap.common.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -91,7 +91,7 @@
                 LdapStatesEnum.SEARCH_REQUEST_VALUE, LdapStatesEnum.SEARCH_REQUEST_BASE_OBJECT_TAG,
                 new GrammarAction( "Init SearchRequest" )
                 {
-                    public void action( IAsn1Container container ) throws DecoderException
+                    public void action( IAsn1Container container ) 
                     {
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
@@ -644,7 +644,7 @@
                 LdapStatesEnum.SEARCH_REQUEST_ATTRIBUTE_DESCRIPTION_TAG,
                 new GrammarAction( "store Attribute Description List 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/SearchRequestGrammar.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/SearchResultDoneGrammar.java (from r365566, directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultDoneGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/SearchResultDoneGrammar.java?p2=directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/SearchResultDoneGrammar.java&p1=directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultDoneGrammar.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultDoneGrammar.java (original)
+++ directory/trunk/ldap-common/src/main/java/org/apache/ldap/common/asn1/codec/grammar/SearchResultDoneGrammar.java Tue Jan  3 01:02:13 2006
@@ -14,19 +14,18 @@
  *   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.UniversalTag;
-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.SearchResultDone;
+import org.apache.asn1.ber.grammar.IGrammar;
+import org.apache.asn1.ber.grammar.GrammarTransition;
+import org.apache.asn1.ber.grammar.AbstractGrammar;
+import org.apache.asn1.ber.grammar.GrammarAction;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.asn1.ber.tlv.UniversalTag;
+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.SearchResultDone;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -77,7 +76,7 @@
                 LdapStatesEnum.SEARCH_RESULT_DONE_VALUE, LdapStatesEnum.SEARCH_RESULT_DONE_LDAP_RESULT, 
                 new GrammarAction( "Init search Result Done" )
                 {
-                    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/SearchResultDoneGrammar.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message