Return-Path: Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org Received: (qmail 75129 invoked from network); 12 Feb 2005 20:29:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 12 Feb 2005 20:29:06 -0000 Received: (qmail 53767 invoked by uid 500); 12 Feb 2005 20:29:05 -0000 Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org Received: (qmail 53646 invoked by uid 500); 12 Feb 2005 20:29:04 -0000 Mailing-List: contact directory-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: directory-dev@incubator.apache.org Delivered-To: mailing list directory-cvs@incubator.apache.org Received: (qmail 53578 invoked by uid 99); 12 Feb 2005 20:29:03 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sat, 12 Feb 2005 12:29:00 -0800 Received: (qmail 74970 invoked by uid 65534); 12 Feb 2005 20:28:59 -0000 Message-ID: <20050212202859.74968.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Sat, 12 Feb 2005 20:28:59 -0000 Subject: svn commit: r153541 [2/3] - in incubator/directory/ldap/trunk/apache-provider/src: java/org/apache/ldap/common/berlib/asn1/ java/org/apache/ldap/common/berlib/asn1/decoder/ java/org/apache/ldap/common/berlib/asn1/decoder/abandon/ java/org/apache/ldap/common/berlib/asn1/decoder/add/ java/org/apache/ldap/common/berlib/asn1/decoder/bind/ java/org/apache/ldap/common/berlib/asn1/decoder/compare/ java/org/apache/ldap/common/berlib/asn1/decoder/delete/ java/org/apache/ldap/common/berlib/asn1/decoder/extended/ java/org/apache/ldap/common/berlib/asn1/decoder/modify/ java/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ java/org/apache/ldap/common/berlib/asn1/decoder/search/ java/org/apache/ldap/common/berlib/asn1/decoder/unbind/ java/org/apache/ldap/common/berlib/asn1/encoder/ java/org/apache/ldap/common/berlib/asn1/encoder/abandon/ java/org/apache/ldap/common/berlib/asn1/encoder/add/ java/org/apache/ldap/common/berlib/asn1/encoder/bind/ java/org/apache/ldap/common/berlib/asn1/encoder/compare/ java/org/apache/ldap/common/berlib/asn1/encoder/delete/ java/org/apache/ldap/common/berlib/asn1/encoder/extended/ java/org/apache/ldap/common/berlib/asn1/encoder/modify/ java/org/apache/ldap/common/berlib/asn1/encoder/modifyDn/ java/org/apache/ldap/common/berlib/asn1/encoder/search/ java/org/apache/ldap/common/berlib/asn1/encoder/unbind/ test/org/apache/ldap/common/berlib/asn1/decoder/add/ test/org/apache/ldap/common/berlib/asn1/decoder/bind/ test/org/apache/ldap/common/berlib/asn1/decoder/extended/ test/org/apache/ldap/common/berlib/asn1/decoder/modify/ test/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ test/org/apache/ldap/common/berlib/asn1/decoder/search/ test/org/apache/ldap/common/berlib/asn1/encoder/ To: directory-cvs@incubator.apache.org From: vtence@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchDnAttributesRule.ja= va URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/Extensibl= eMatchDnAttributesRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/ExtensibleMatchDnAttributesRule.java (or= iginal) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/ExtensibleMatchDnAttributesRule.java Sat= Feb 12 12:28:39 2005 @@ -17,9 +17,8 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.asn1.ber.digester.rules.PrimitiveBooleanRule; import org.apache.asn1.ber.digester.rules.PrimitiveBooleanRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchMatchingRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/Extensibl= eMatchMatchingRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/ExtensibleMatchMatchingRule.java (origin= al) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/ExtensibleMatchMatchingRule.java Sat Feb= 12 12:28:39 2005 @@ -17,11 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/Extensibl= eMatchRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/ExtensibleMatchRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/ExtensibleMatchRule.java Sat Feb 12 12:2= 8:39 2005 @@ -17,15 +17,12 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.AbstractRule; - +import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.filter.ExtensibleNode; -import org.apache.asn1.ber.digester.AbstractRule; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchTypeRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/Extensibl= eMatchTypeRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/ExtensibleMatchTypeRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/ExtensibleMatchTypeRule.java Sat Feb 12 = 12:28:39 2005 @@ -17,13 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.decoder.search.ExtensibleMatchRu= le; -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchValueRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/Extensibl= eMatchValueRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/ExtensibleMatchValueRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/ExtensibleMatchValueRule.java Sat Feb 12= 12:28:39 2005 @@ -17,13 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.decoder.search.ExtensibleMatchRu= le; -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/GreaterOrEqualRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/GreaterOr= EqualRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/GreaterOrEqualRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/GreaterOrEqualRule.java Sat Feb 12 12:28= :39 2005 @@ -17,13 +17,11 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; -import org.apache.asn1.ber.TypeClass; - import org.apache.ldap.common.filter.SimpleNode; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/LessOrEqualRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/LessOrEqu= alRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/LessOrEqualRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/LessOrEqualRule.java Sat Feb 12 12:28:39= 2005 @@ -17,14 +17,11 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; - import org.apache.ldap.common.filter.SimpleNode; -import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; -import org.apache.asn1.ber.TypeClass; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/NotRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/NotRule.j= ava?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/NotRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/NotRule.java Sat Feb 12 12:28:39 2005 @@ -17,15 +17,13 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.TypeClass; -import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.filter.BranchNode; -import org.apache.asn1.ber.digester.AbstractRule; import org.apache.asn1.ber.digester.AbstractRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.filter.BranchNode; +import org.apache.ldap.common.filter.ExprNode; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/OrRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/OrRule.ja= va?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/OrRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/OrRule.java Sat Feb 12 12:28:39 2005 @@ -17,16 +17,13 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.TypeClass; -import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.filter.BranchNode; -import org.apache.asn1.ber.digester.AbstractRule; import org.apache.asn1.ber.digester.AbstractRule; -import org.apache.asn1.ber.TypeClass; +import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.filter.BranchNode; +import org.apache.ldap.common.filter.ExprNode; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/PresentRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/PresentRu= le.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/PresentRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/PresentRule.java Sat Feb 12 12:28:39 2005 @@ -17,15 +17,12 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; - +import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.filter.PresenceNode; -import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/RequestedAttributesRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/Requested= AttributesRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/RequestedAttributesRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/RequestedAttributesRule.java Sat Feb 12 = 12:28:39 2005 @@ -17,12 +17,11 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.ldap.common.message.SearchRequestImpl; -import org.apache.asn1.ber.primitives.UniversalTag; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/RequestedAttributesStateChangeRule= .java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/Requested= AttributesStateChangeRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/RequestedAttributesStateChangeRule.java = (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/RequestedAttributesStateChangeRule.java = Sat Feb 12 12:28:39 2005 @@ -18,7 +18,6 @@ =20 =20 import org.apache.asn1.ber.TypeClass; -import org.apache.ldap.common.berlib.asn1.decoder.search.BaseSearchRequest= Rule; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/ScopeRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ScopeRule= .java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/ScopeRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/ScopeRule.java Sat Feb 12 12:28:39 2005 @@ -17,15 +17,12 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - import org.apache.asn1.ber.TypeClass; -import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.asn1.ber.primitives.PrimitiveUtils; - +import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.ldap.common.message.ScopeEnum; -import org.apache.ldap.common.berlib.asn1.decoder.search.BaseSearchRequest= Rule; -import org.apache.asn1.ber.primitives.PrimitiveUtils; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/SearchRequestRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchReq= uestRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SearchRequestRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SearchRequestRule.java Sat Feb 12 12:28:= 39 2005 @@ -19,9 +19,6 @@ =20 import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.AbstractRule; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.decoder.search.SearchRequestProc= essing; import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.message.SearchRequestImpl; =20 Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/SearchResponseDoneRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchRes= ponseDoneRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SearchResponseDoneRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SearchResponseDoneRule.java Sat Feb 12 1= 2:28:39 2005 @@ -19,7 +19,6 @@ =20 import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.decoder.ResultResponseRule; -import org.apache.ldap.common.berlib.asn1.LdapTag; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryAttributesRule.= java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchRes= ponseEntryAttributesRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SearchResponseEntryAttributesRule.java (= original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SearchResponseEntryAttributesRule.java S= at Feb 12 12:28:39 2005 @@ -17,15 +17,12 @@ package org.apache.ldap.common.berlib.asn1.decoder.search ; =20 =20 -import org.apache.asn1.ber.TagEnum ; +import org.apache.asn1.ber.TagEnum; import org.apache.asn1.ber.TypeClass; -import org.apache.asn1.ber.TypeClass ; -import org.apache.asn1.ber.digester.AbstractRule ; -import org.apache.asn1.ber.primitives.UniversalTag ; - -import org.apache.ldap.common.message.LockableAttributesImpl ; -import org.apache.ldap.common.message.SearchResponseEntryImpl ; +import org.apache.asn1.ber.digester.AbstractRule; import org.apache.asn1.ber.primitives.UniversalTag; +import org.apache.ldap.common.message.LockableAttributesImpl; +import org.apache.ldap.common.message.SearchResponseEntryImpl; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryDnRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchRes= ponseEntryDnRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SearchResponseEntryDnRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SearchResponseEntryDnRule.java Sat Feb 1= 2 12:28:39 2005 @@ -17,13 +17,11 @@ package org.apache.ldap.common.berlib.asn1.decoder.search ; =20 =20 -import java.nio.ByteBuffer ; - -import org.apache.ldap.common.message.SearchResponseEntry ; - -import org.apache.asn1.ber.primitives.UniversalTag ; -import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule ; +import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; import org.apache.asn1.ber.primitives.UniversalTag; +import org.apache.ldap.common.message.SearchResponseEntry; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchRes= ponseEntryRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SearchResponseEntryRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SearchResponseEntryRule.java Sat Feb 12 = 12:28:39 2005 @@ -17,11 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.search ; =20 =20 -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.AbstractRule; - -import org.apache.ldap.common.message.SearchResponseEntryImpl ; +import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.message.SearchResponseEntryImpl; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/SearchResponseReferenceRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchRes= ponseReferenceRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SearchResponseReferenceRule.java (origin= al) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SearchResponseReferenceRule.java Sat Feb= 12 12:28:39 2005 @@ -17,11 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.search ; =20 =20 +import org.apache.asn1.ber.TypeClass; +import org.apache.asn1.ber.digester.AbstractRule; import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.asn1.ber.TypeClass ; -import org.apache.asn1.ber.digester.AbstractRule ; - -import org.apache.ldap.common.message.SearchResponseReferenceImpl ; +import org.apache.ldap.common.message.SearchResponseReferenceImpl; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/SearchResponseReferralRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchRes= ponseReferralRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SearchResponseReferralRule.java (origina= l) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SearchResponseReferralRule.java Sat Feb = 12 12:28:39 2005 @@ -17,15 +17,12 @@ package org.apache.ldap.common.berlib.asn1.decoder.search ; =20 =20 -import org.apache.ldap.common.message.ReferralImpl ; -import org.apache.ldap.common.message.SearchResponseReferenceImpl ; - -import org.apache.asn1.ber.TagEnum ; -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.asn1.ber.TypeClass ; -import org.apache.asn1.ber.digester.AbstractRule ; +import org.apache.asn1.ber.TagEnum; +import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.AbstractRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.message.ReferralImpl; +import org.apache.ldap.common.message.SearchResponseReferenceImpl; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/SizeLimitRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SizeLimit= Rule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SizeLimitRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SizeLimitRule.java Sat Feb 12 12:28:39 2= 005 @@ -17,14 +17,11 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - import org.apache.asn1.ber.TypeClass; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.primitives.PrimitiveUtils; import org.apache.asn1.ber.primitives.PrimitiveUtils; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.ldap.common.berlib.asn1.decoder.search.BaseSearchRequest= Rule; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/SubstringMatchAnyRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/Substring= MatchAnyRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SubstringMatchAnyRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SubstringMatchAnyRule.java Sat Feb 12 12= :28:39 2005 @@ -17,11 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/SubstringMatchFinalRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/Substring= MatchFinalRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SubstringMatchFinalRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SubstringMatchFinalRule.java Sat Feb 12 = 12:28:39 2005 @@ -17,11 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/SubstringMatchInitialRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/Substring= MatchInitialRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SubstringMatchInitialRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SubstringMatchInitialRule.java Sat Feb 1= 2 12:28:39 2005 @@ -17,11 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/SubstringMatchRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/Substring= MatchRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SubstringMatchRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/SubstringMatchRule.java Sat Feb 12 12:28= :39 2005 @@ -17,15 +17,13 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.util.ArrayList; -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.AbstractRule; - +import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.filter.SubstringNode; -import org.apache.asn1.ber.digester.AbstractRule; + +import java.nio.ByteBuffer; +import java.util.ArrayList; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/TerminateFilterStateRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/Terminate= FilterStateRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/TerminateFilterStateRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/TerminateFilterStateRule.java Sat Feb 12= 12:28:39 2005 @@ -19,7 +19,6 @@ =20 import org.apache.asn1.ber.TypeClass; import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.berlib.asn1.decoder.search.BaseSearchRequest= Rule; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/TimeLimitRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/TimeLimit= Rule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/TimeLimitRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/TimeLimitRule.java Sat Feb 12 12:28:39 2= 005 @@ -17,14 +17,11 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - import org.apache.asn1.ber.TypeClass; -import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.asn1.ber.primitives.PrimitiveUtils; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.TypeClass; -import org.apache.ldap.common.berlib.asn1.decoder.search.BaseSearchRequest= Rule; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/search/TypesOnlyRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/TypesOnly= Rule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/TypesOnlyRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/search/TypesOnlyRule.java Sat Feb 12 12:28:39 2= 005 @@ -17,17 +17,14 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; =20 =20 -import java.nio.ByteBuffer; - +import org.apache.asn1.ber.TagEnum; +import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.AbstractRule; -import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.asn1.ber.primitives.PrimitiveUtils; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.TypeClass; -import org.apache.asn1.ber.TagEnum; -import org.apache.asn1.ber.TypeClass; import org.apache.ldap.common.message.SearchRequestImpl; -import org.apache.ldap.common.berlib.asn1.decoder.search.SearchRequestProc= essing; + +import java.nio.ByteBuffer; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/decoder/unbind/UnbindRequestRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/decoder/unbind/UnbindReq= uestRule.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/unbind/UnbindRequestRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/decoder/unbind/UnbindRequestRule.java Sat Feb 12 12:28:= 39 2005 @@ -17,11 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.unbind ; =20 =20 -import org.apache.ldap.common.message.UnbindRequest ; -import org.apache.ldap.common.message.UnbindRequestImpl ; - -import org.apache.asn1.ber.TypeClass ; -import org.apache.asn1.ber.digester.AbstractRule ; +import org.apache.asn1.ber.TypeClass; +import org.apache.asn1.ber.digester.AbstractRule; +import org.apache.ldap.common.message.UnbindRequest; +import org.apache.ldap.common.message.UnbindRequestImpl; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/AttributeEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/AttributeEncoder= .java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/AttributeEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/AttributeEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,16 +17,14 @@ package org.apache.ldap.common.berlib.asn1.encoder; =20 =20 +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; =20 -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.Attribute; =20 =20 Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/AttributesEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/AttributesEncode= r=2Ejava?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/AttributesEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/AttributesEncoder.java Sat Feb 12 12:28:39 2005 @@ -16,19 +16,15 @@ */ package org.apache.ldap.common.berlib.asn1.encoder; =20 -import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Tuple; -import org.apache.ldap.common.berlib.asn1.encoder.AttributeEncoder; +import org.apache.asn1.ber.TupleNode; +import org.apache.asn1.ber.primitives.UniversalTag; =20 -import javax.naming.directory.Attributes; -import javax.naming.directory.Attribute; import javax.naming.NamingEnumeration; +import javax.naming.directory.Attribute; +import javax.naming.directory.Attributes; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/EncoderUtils.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/EncoderUtils.jav= a?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/EncoderUtils.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/EncoderUtils.java Sat Feb 12 12:28:39 2005 @@ -17,13 +17,12 @@ package org.apache.ldap.common.berlib.asn1.encoder; =20 =20 -import org.apache.asn1.ber.*; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.primitives.PrimitiveUtils; import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.TagEnum; import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; +import org.apache.asn1.ber.primitives.PrimitiveUtils; +import org.apache.asn1.ber.primitives.UniversalTag; =20 import java.nio.ByteBuffer; =20 Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/LdapResultEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/LdapResultEncode= r=2Ejava?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/LdapResultEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/LdapResultEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,11 +17,9 @@ package org.apache.ldap.common.berlib.asn1.encoder; =20 =20 -import org.apache.asn1.ber.*; -import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.ldap.common.message.LdapResult; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/ModificationItemEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/ModificationItem= Encoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/ModificationItemEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/ModificationItemEncoder.java Sat Feb 12 12:28:3= 9 2005 @@ -16,18 +16,14 @@ */ package org.apache.ldap.common.berlib.asn1.encoder; =20 -import org.apache.asn1.ber.TupleNode; -import org.apache.asn1.ber.Tuple; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; -import org.apache.ldap.common.berlib.asn1.encoder.AttributeEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; +import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.TupleNode; +import org.apache.asn1.ber.primitives.UniversalTag; =20 -import javax.naming.directory.ModificationItem; import javax.naming.directory.DirContext; +import javax.naming.directory.ModificationItem; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/ReferralEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/ReferralEncoder.= java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/ReferralEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/ReferralEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,14 +17,11 @@ package org.apache.ldap.common.berlib.asn1.encoder; =20 =20 -import org.apache.asn1.ber.TupleNode; -import org.apache.asn1.ber.Tuple; -import org.apache.asn1.ber.Length; import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.TupleNode; import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.LdapTag; - import org.apache.ldap.common.message.Referral; =20 import java.util.Iterator; Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/SnickersLdapEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/SnickersLdapEnco= der.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/SnickersLdapEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/SnickersLdapEncoder.java Sat Feb 12 12:28:39 20= 05 @@ -17,47 +17,55 @@ package org.apache.ldap.common.berlib.asn1.encoder; =20 =20 -import org.apache.asn1.codec.EncoderException; -import org.apache.asn1.codec.stateful.StatefulEncoder; -import org.apache.ldap.common.message.*; -import org.apache.asn1.ber.TupleNode; -import org.apache.asn1.ber.TupleEncodingVisitor; import org.apache.asn1.ber.DeterminateLengthVisitor; import org.apache.asn1.ber.TupleEncodingVisitor; import org.apache.asn1.ber.TupleNode; -import org.apache.ldap.common.berlib.asn1.encoder.bind.BindRequestEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.bind.BindResponseEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.search.SearchResponseEnt= ryEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.search.SearchResponseRef= erenceEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.unbind.UnbindRequestEnco= der; -import org.apache.ldap.common.berlib.asn1.encoder.delete.DeleteRequestEnco= der; -import org.apache.ldap.common.berlib.asn1.encoder.delete.DeleteResponseEnc= oder; +import org.apache.asn1.codec.EncoderException; +import org.apache.asn1.codec.stateful.EncoderCallback; +import org.apache.asn1.codec.stateful.EncoderMonitor; +import org.apache.asn1.codec.stateful.StatefulEncoder; +import org.apache.ldap.common.berlib.asn1.encoder.abandon.AbandonRequestEn= coder; import org.apache.ldap.common.berlib.asn1.encoder.add.AddRequestEncoder; import org.apache.ldap.common.berlib.asn1.encoder.add.AddResponseEncoder; +import org.apache.ldap.common.berlib.asn1.encoder.bind.BindRequestEncoder; +import org.apache.ldap.common.berlib.asn1.encoder.bind.BindResponseEncoder; import org.apache.ldap.common.berlib.asn1.encoder.compare.CompareRequestEn= coder; import org.apache.ldap.common.berlib.asn1.encoder.compare.CompareResponseE= ncoder; +import org.apache.ldap.common.berlib.asn1.encoder.delete.DeleteRequestEnco= der; +import org.apache.ldap.common.berlib.asn1.encoder.delete.DeleteResponseEnc= oder; import org.apache.ldap.common.berlib.asn1.encoder.extended.ExtendedRequest= Encoder; import org.apache.ldap.common.berlib.asn1.encoder.extended.ExtendedRespons= eEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.abandon.AbandonRequestEn= coder; import org.apache.ldap.common.berlib.asn1.encoder.modify.ModifyRequestEnco= der; import org.apache.ldap.common.berlib.asn1.encoder.modify.ModifyResponseEnc= oder; import org.apache.ldap.common.berlib.asn1.encoder.modifyDn.ModifyDnRequest= Encoder; import org.apache.ldap.common.berlib.asn1.encoder.modifyDn.ModifyDnRespons= eEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.unbind.UnbindRequestEnco= der; import org.apache.ldap.common.berlib.asn1.encoder.search.SearchRequestEnco= der; import org.apache.ldap.common.berlib.asn1.encoder.search.SearchResponseDon= eEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.search.*; -import org.apache.ldap.common.berlib.asn1.encoder.modifyDn.ModifyDnRequest= Encoder; -import org.apache.ldap.common.berlib.asn1.encoder.modifyDn.ModifyDnRespons= eEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.extended.ExtendedRequest= Encoder; -import org.apache.ldap.common.berlib.asn1.encoder.delete.DeleteRequestEnco= der; -import org.apache.ldap.common.berlib.asn1.encoder.delete.DeleteResponseEnc= oder; -import org.apache.ldap.common.berlib.asn1.encoder.bind.BindRequestEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.add.AddRequestEncoder; -import org.apache.asn1.codec.stateful.EncoderCallback; -import org.apache.asn1.codec.stateful.EncoderMonitor; -import org.apache.asn1.codec.stateful.*; -import org.apache.asn1.codec.EncoderException; +import org.apache.ldap.common.berlib.asn1.encoder.search.SearchResponseEnt= ryEncoder; +import org.apache.ldap.common.berlib.asn1.encoder.search.SearchResponseRef= erenceEncoder; +import org.apache.ldap.common.berlib.asn1.encoder.unbind.UnbindRequestEnco= der; +import org.apache.ldap.common.message.AbandonRequest; +import org.apache.ldap.common.message.AddRequest; +import org.apache.ldap.common.message.AddResponse; +import org.apache.ldap.common.message.BindRequest; +import org.apache.ldap.common.message.BindResponse; +import org.apache.ldap.common.message.CompareRequest; +import org.apache.ldap.common.message.CompareResponse; +import org.apache.ldap.common.message.DeleteRequest; +import org.apache.ldap.common.message.DeleteResponse; +import org.apache.ldap.common.message.ExtendedRequest; +import org.apache.ldap.common.message.ExtendedResponse; +import org.apache.ldap.common.message.Message; +import org.apache.ldap.common.message.MessageTypeEnum; +import org.apache.ldap.common.message.ModifyDnRequest; +import org.apache.ldap.common.message.ModifyDnResponse; +import org.apache.ldap.common.message.ModifyRequest; +import org.apache.ldap.common.message.ModifyResponse; +import org.apache.ldap.common.message.SearchRequest; +import org.apache.ldap.common.message.SearchResponseDone; +import org.apache.ldap.common.message.SearchResponseEntry; +import org.apache.ldap.common.message.SearchResponseReference; +import org.apache.ldap.common.message.UnbindRequest; =20 =20 =20 Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/abandon/AbandonRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/abandon/AbandonR= equestEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/abandon/AbandonRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/abandon/AbandonRequestEncoder.java Sat Feb 12 1= 2:28:39 2005 @@ -17,20 +17,14 @@ package org.apache.ldap.common.berlib.asn1.encoder.abandon; =20 =20 -import org.apache.ldap.common.message.AbandonRequest; - +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; +import org.apache.ldap.common.message.AbandonRequest; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/add/AddResponseEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/add/AddResponseE= ncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/add/AddResponseEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/add/AddResponseEncoder.java Sat Feb 12 12:28:39= 2005 @@ -17,20 +17,14 @@ package org.apache.ldap.common.berlib.asn1.encoder.add; =20 =20 -import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; -import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; -import org.apache.ldap.common.berlib.asn1.LdapTag; - import org.apache.ldap.common.message.AddResponse; =20 =20 Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/bind/BindRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/bind/BindRequest= Encoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/bind/BindRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/bind/BindRequestEncoder.java Sat Feb 12 12:28:3= 9 2005 @@ -17,19 +17,15 @@ package org.apache.ldap.common.berlib.asn1.encoder.bind; =20 =20 -import org.apache.ldap.common.message.BindRequest; - +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; import org.apache.asn1.ber.Tuple; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.TupleNode; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; - import org.apache.commons.lang.NotImplementedException; +import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; +import org.apache.ldap.common.message.BindRequest; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/bind/BindResponseEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/bind/BindRespons= eEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/bind/BindResponseEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/bind/BindResponseEncoder.java Sat Feb 12 12:28:= 39 2005 @@ -17,21 +17,16 @@ package org.apache.ldap.common.berlib.asn1.encoder.bind; =20 =20 -import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Length; -import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Tuple; -import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; +import org.apache.commons.lang.NotImplementedException; import org.apache.ldap.common.berlib.asn1.LdapTag; - +import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; +import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; import org.apache.ldap.common.message.BindResponse; - -import org.apache.commons.lang.NotImplementedException; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/compare/CompareRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/compare/CompareR= equestEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/compare/CompareRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/compare/CompareRequestEncoder.java Sat Feb 12 1= 2:28:39 2005 @@ -17,18 +17,14 @@ package org.apache.ldap.common.berlib.asn1.encoder.compare; =20 =20 -import org.apache.ldap.common.message.CompareRequest; - -import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; +import org.apache.ldap.common.message.CompareRequest; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/compare/CompareResponseEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/compare/CompareR= esponseEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/compare/CompareResponseEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/compare/CompareResponseEncoder.java Sat Feb 12 = 12:28:39 2005 @@ -17,21 +17,15 @@ package org.apache.ldap.common.berlib.asn1.encoder.compare; =20 =20 +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.delete.DeleteResponseEnc= oder; -import org.apache.ldap.common.berlib.asn1.LdapTag; - -import org.apache.ldap.common.message.DeleteResponse; import org.apache.ldap.common.message.CompareResponse; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Tuple; -import org.apache.asn1.ber.*; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/delete/DeleteRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/delete/DeleteReq= uestEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/delete/DeleteRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/delete/DeleteRequestEncoder.java Sat Feb 12 12:= 28:39 2005 @@ -17,17 +17,14 @@ package org.apache.ldap.common.berlib.asn1.encoder.delete; =20 =20 -import org.apache.ldap.common.message.DeleteRequest; - -import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; -import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.primitives.UniversalTag; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.asn1.ber.primitives.UniversalTag; +import org.apache.ldap.common.message.DeleteRequest; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/delete/DeleteResponseEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/delete/DeleteRes= ponseEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/delete/DeleteResponseEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/delete/DeleteResponseEncoder.java Sat Feb 12 12= :28:39 2005 @@ -17,20 +17,15 @@ package org.apache.ldap.common.berlib.asn1.encoder.delete; =20 =20 +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; -import org.apache.ldap.common.berlib.asn1.LdapTag; - import org.apache.ldap.common.message.DeleteResponse; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/extended/ExtendedRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/extended/Extende= dRequestEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/extended/ExtendedRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/extended/ExtendedRequestEncoder.java Sat Feb 12= 12:28:39 2005 @@ -17,17 +17,14 @@ package org.apache.ldap.common.berlib.asn1.encoder.extended; =20 =20 -import org.apache.ldap.common.message.ExtendedRequest; - +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; import org.apache.asn1.ber.Tuple; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.TupleNode; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; +import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; +import org.apache.ldap.common.message.ExtendedRequest; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/extended/ExtendedResponseEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/extended/Extende= dResponseEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/extended/ExtendedResponseEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/extended/ExtendedResponseEncoder.java Sat Feb 1= 2 12:28:39 2005 @@ -16,19 +16,15 @@ */ package org.apache.ldap.common.berlib.asn1.encoder.extended; =20 -import org.apache.ldap.common.message.ExtendedResponse; -import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Tuple; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; +import org.apache.asn1.ber.TupleNode; +import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; +import org.apache.ldap.common.message.ExtendedResponse; =20 /** * An encoder that transforms a stub into a TupleNode tree representing the Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/modify/ModifyRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modify/ModifyReq= uestEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/modify/ModifyRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/modify/ModifyRequestEncoder.java Sat Feb 12 12:= 28:39 2005 @@ -17,21 +17,18 @@ package org.apache.ldap.common.berlib.asn1.encoder.modify; =20 =20 -import java.util.Iterator; -import javax.naming.directory.ModificationItem; - -import org.apache.ldap.common.message.ModifyRequest; - -import org.apache.asn1.ber.TupleNode; -import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; import org.apache.asn1.ber.Tuple; -import org.apache.asn1.ber.*; - +import org.apache.asn1.ber.TupleNode; +import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.encoder.ModificationItemEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.ModificationItemEncoder; +import org.apache.ldap.common.message.ModifyRequest; + +import javax.naming.directory.ModificationItem; +import java.util.Iterator; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/modify/ModifyResponseEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modify/ModifyRes= ponseEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/modify/ModifyResponseEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/modify/ModifyResponseEncoder.java Sat Feb 12 12= :28:39 2005 @@ -16,17 +16,15 @@ */ package org.apache.ldap.common.berlib.asn1.encoder.modify; =20 -import org.apache.ldap.common.message.ModifyResponse; -import org.apache.asn1.ber.TupleNode; -import org.apache.asn1.ber.Tuple; -import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; +import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.TupleNode; +import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; +import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; +import org.apache.ldap.common.message.ModifyResponse; =20 /** * Encoder which generates a TupleNode tree from a ModifyResponse PDU stub. Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/modifyDn/ModifyDnRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modifyDn/ModifyD= nRequestEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/modifyDn/ModifyDnRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/modifyDn/ModifyDnRequestEncoder.java Sat Feb 12= 12:28:39 2005 @@ -16,17 +16,14 @@ */ package org.apache.ldap.common.berlib.asn1.encoder.modifyDn; =20 -import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.message.ModifyDnRequest; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Tuple; =20 /** * Encoder which generates a TupleNode tree from a ModifyDnRequest PDU stu= b=2E Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/modifyDn/ModifyDnResponseEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modifyDn/ModifyD= nResponseEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/modifyDn/ModifyDnResponseEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/modifyDn/ModifyDnResponseEncoder.java Sat Feb 1= 2 12:28:39 2005 @@ -17,20 +17,15 @@ package org.apache.ldap.common.berlib.asn1.encoder.modifyDn; =20 =20 -import org.apache.ldap.common.message.ModifyDnResponse; - +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; +import org.apache.ldap.common.message.ModifyDnResponse; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/search/SearchRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchReq= uestEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/search/SearchRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/search/SearchRequestEncoder.java Sat Feb 12 12:= 28:39 2005 @@ -17,20 +17,26 @@ package org.apache.ldap.common.berlib.asn1.encoder.search; =20 =20 -import org.apache.ldap.common.filter.*; -import org.apache.ldap.common.message.SearchRequest; - -import org.apache.asn1.ber.*; +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.TagEnum; +import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.filter.BranchNode; +import org.apache.ldap.common.filter.ExprNode; +import org.apache.ldap.common.filter.ExtensibleNode; +import org.apache.ldap.common.filter.LeafNode; +import org.apache.ldap.common.filter.PresenceNode; +import org.apache.ldap.common.filter.SimpleNode; +import org.apache.ldap.common.filter.SubstringNode; +import org.apache.ldap.common.message.SearchRequest; =20 -import java.util.Iterator; import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/search/SearchResponseDoneEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchRes= ponseDoneEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/search/SearchResponseDoneEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/search/SearchResponseDoneEncoder.java Sat Feb 1= 2 12:28:39 2005 @@ -17,22 +17,15 @@ package org.apache.ldap.common.berlib.asn1.encoder.search; =20 =20 -import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; -import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.primitives.UniversalTag; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.LdapTag; - import org.apache.ldap.common.message.SearchResponseDone; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Tuple; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/search/SearchResponseEntryEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchRes= ponseEntryEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/search/SearchResponseEntryEncoder.java (origina= l) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/search/SearchResponseEntryEncoder.java Sat Feb = 12 12:28:39 2005 @@ -17,20 +17,15 @@ package org.apache.ldap.common.berlib.asn1.encoder.search; =20 =20 -import org.apache.ldap.common.message.SearchResponseEntry; - +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; - import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.encoder.AttributesEncoder; import org.apache.ldap.common.berlib.asn1.encoder.AttributesEncoder; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; +import org.apache.ldap.common.message.SearchResponseEntry; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/search/SearchResponseReferenceEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchRes= ponseReferenceEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/search/SearchResponseReferenceEncoder.java (ori= ginal) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/search/SearchResponseReferenceEncoder.java Sat = Feb 12 12:28:39 2005 @@ -17,18 +17,15 @@ package org.apache.ldap.common.berlib.asn1.encoder.search; =20 =20 -import org.apache.ldap.common.message.SearchResponseReference; - -import org.apache.asn1.ber.TupleNode; +import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; +import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.encoder.AttributesEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.ReferralEncoder; import org.apache.ldap.common.berlib.asn1.encoder.ReferralEncoder; +import org.apache.ldap.common.message.SearchResponseReference; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apach= e/ldap/common/berlib/asn1/encoder/unbind/UnbindRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/java/org/apache/ldap/common/berlib/asn1/encoder/unbind/UnbindReq= uestEncoder.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/unbind/UnbindRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap= /common/berlib/asn1/encoder/unbind/UnbindRequestEncoder.java Sat Feb 12 12:= 28:39 2005 @@ -16,16 +16,14 @@ */ package org.apache.ldap.common.berlib.asn1.encoder.unbind; =20 -import org.apache.ldap.common.message.UnbindRequest; +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; +import org.apache.ldap.common.message.UnbindRequest; =20 =20 /** Modified: incubator/directory/ldap/trunk/apache-provider/src/test/org/apach= e/ldap/common/berlib/asn1/decoder/add/AddResponseRuleTest.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/test/org/apache/ldap/common/berlib/asn1/decoder/add/AddResponseR= uleTest.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/test/org/apache/ldap= /common/berlib/asn1/decoder/add/AddResponseRuleTest.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/test/org/apache/ldap= /common/berlib/asn1/decoder/add/AddResponseRuleTest.java Sat Feb 12 12:28:3= 9 2005 @@ -18,17 +18,12 @@ =20 =20 import org.apache.ldap.common.berlib.asn1.decoder.testutils.RuleTestCase; -import org.apache.ldap.common.berlib.asn1.decoder.testutils.TestUtils; import org.apache.ldap.common.message.AddResponse; import org.apache.ldap.common.message.AddResponseImpl; -import org.apache.ldap.common.message.LdapResult; import org.apache.ldap.common.message.LdapResultImpl; -import org.apache.ldap.common.message.Referral; import org.apache.ldap.common.message.ReferralImpl; import org.apache.ldap.common.message.ResultCodeEnum; =20 -import java.util.Iterator; - =20 /** * Tests the population of an LdapResult using a ResultRule. @@ -41,9 +36,10 @@ { public void testAddResponse() throws Exception { - // build the PDU - AddResponseImpl resp =3D new AddResponseImpl( 8 ) ; - LdapResultImpl result =3D new LdapResultImpl( resp ) ; + byte[] pdu =3D new byte[] {0x30, 0x4C, 0x02, 0x01, 0x08, 0x69, 0x4= 7, 0x0A, 0x01, 0x33, 0x04, 0x1F, 0x75, 0x69, 0x64, 0x3D, 0x61, 0x6B, 0x61, = 0x72, 0x61, 0x73, 0x75, 0x6C, 0x75, 0x2C, 0x64, 0x63, 0x3D, 0x65, 0x78, 0x6= 1, 0x6D, 0x70, 0x6C, 0x65, 0x2C, 0x64, 0x63, 0x3D, 0x63, 0x6F, 0x6D, 0x04, = 0x11, 0x41, 0x6E, 0x20, 0x45, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x4D, 0x65, 0x7= 3, 0x73, 0x61, 0x67, 0x65, 0x21, 0xFFFFFFA3, 0x0E, 0x04, 0x05, 0x68, 0x65, = 0x6C, 0x6C, 0x6F, 0x04, 0x05, 0x77, 0x6F, 0x72, 0x6C, 0x64}; + + AddResponseImpl expected =3D new AddResponseImpl( 8 ) ; + LdapResultImpl result =3D new LdapResultImpl( expected ) ; result.setResultCode( ResultCodeEnum.BUSY ) ; result.setErrorMessage( "An Error Message!" ) ; result.setMatchedDn( "uid=3Dakarasulu,dc=3Dexample,dc=3Dcom" ) ; @@ -51,53 +47,9 @@ referral.addLdapUrl( "hello" ) ; referral.addLdapUrl( "world" ) ; result.setReferral( referral ) ; - resp.setLdapResult( result ) ; - System.out.println( "Generated AddResponse for test:" ) ; - System.out.println( TestUtils.printTupleTree( resp ) ) ; - - AddResponse decoded =3D ( AddResponse ) - snickersDecode( snaccEncode( resp ) ) ; + expected.setLdapResult( result ) ; =20 - assertNotNull( decoded ) ; - assertEquals( resp.getMessageId(), decoded.getMessageId() ) ; - LdapResult decodedResult =3D resp.getLdapResult() ; - assertEquals( result.getResultCode(), decodedResult.getResultCode(= ) ) ; - assertEquals( result.getErrorMessage(), - decodedResult.getErrorMessage() ) ; - assertEquals( result.getMatchedDn(), - decodedResult.getMatchedDn() ) ; - Referral decodedRef =3D result.getReferral() ; - Iterator urls =3D referral.getLdapUrls().iterator() ; - Iterator decodedUrls =3D decodedRef.getLdapUrls().iterator() ; - - while( urls.hasNext() && decodedUrls.hasNext() ) - { - assertEquals( urls.next(), decodedUrls.next() ) ; - } - - assertFalse( urls.hasNext() ) ; - assertFalse( decodedUrls.hasNext() ) ; + AddResponse decoded =3D ( AddResponse ) decode( pdu ) ; + assertEquals( expected, decoded ); } - - /** - * TODO: Fails but should replace the above at some point. - */ -// public void testSamplePDU() throws Exception -// { -// byte[] pdu =3D new byte[] {0x30, 0x4C, 0x02, 0x01, 0x08, 0x69, 0= x47, 0x0A, 0x01, 0x33, 0x04, 0x1F, 0x75, 0x69, 0x64, 0x3D, 0x61, 0x6B, 0x61= , 0x72, 0x61, 0x73, 0x75, 0x6C, 0x75, 0x2C, 0x64, 0x63, 0x3D, 0x65, 0x78, 0= x61, 0x6D, 0x70, 0x6C, 0x65, 0x2C, 0x64, 0x63, 0x3D, 0x63, 0x6F, 0x6D, 0x04= , 0x11, 0x41, 0x6E, 0x20, 0x45, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x4D, 0x65, 0= x73, 0x73, 0x61, 0x67, 0x65, 0x21, 0xFFFFFFA3, 0x0E, 0x04, 0x05, 0x68, 0x65= , 0x6C, 0x6C, 0x6F, 0x04, 0x05, 0x77, 0x6F, 0x72, 0x6C, 0x64}; -// -// AddResponseImpl expected =3D new AddResponseImpl( 8 ) ; -// LdapResultImpl result =3D new LdapResultImpl( expected ) ; -// result.setResultCode( ResultCodeEnum.BUSY ) ; -// result.setErrorMessage( "An Error Message!" ) ; -// result.setMatchedDn( "uid=3Dakarasulu,dc=3Dexample,dc=3Dcom" ) ; -// ReferralImpl referral =3D new ReferralImpl( result ) ; -// referral.addLdapUrl( "hello" ) ; -// referral.addLdapUrl( "world" ) ; -// result.setReferral( referral ) ; -// expected.setLdapResult( result ) ; -// -// AddResponse decoded =3D ( AddResponse ) decode( pdu ) ; -// assertEquals( expected, decoded ); -// } } Modified: incubator/directory/ldap/trunk/apache-provider/src/test/org/apach= e/ldap/common/berlib/asn1/decoder/bind/BindResponseRuleTest.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-pr= ovider/src/test/org/apache/ldap/common/berlib/asn1/decoder/bind/BindRespons= eRuleTest.java?view=3Ddiff&r1=3D153540&r2=3D153541 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/ldap/trunk/apache-provider/src/test/org/apache/ldap= /common/berlib/asn1/decoder/bind/BindResponseRuleTest.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/test/org/apache/ldap= /common/berlib/asn1/decoder/bind/BindResponseRuleTest.java Sat Feb 12 12:28= :39 2005 @@ -41,10 +41,12 @@ { public void testBindResponse() throws Exception { - // build the PDU - BindResponseImpl resp =3D new BindResponseImpl( 540 ) ; - resp.setServerSaslCreds( "hello".getBytes() ) ; - LdapResultImpl result =3D new LdapResultImpl( resp ) ; + byte[] pdu =3D new byte[] {0x30, 0x54, 0x02, 0x02, 0x02, 0x1C, 0x6= 1, 0x4E, 0x0A, 0x01, 0x33, 0x04, 0x1F, 0x75, 0x69, 0x64, 0x3D, 0x61, 0x6B, = 0x61, 0x72, 0x61, 0x73, 0x75, 0x6C, 0x75, 0x2C, 0x64, 0x63, 0x3D, 0x65, 0x7= 8, 0x61, 0x6D, 0x70, 0x6C, 0x65, 0x2C, 0x64, 0x63, 0x3D, 0x63, 0x6F, 0x6D, = 0x04, 0x11, 0x41, 0x6E, 0x20, 0x45, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x4D, 0x6= 5, 0x73, 0x73, 0x61, 0x67, 0x65, 0x21, 0xFFFFFFA3, 0x0E, 0x04, 0x05, 0x68, = 0x65, 0x6C, 0x6C, 0x6F, 0x04, 0x05, 0x77, 0x6F, 0x72, 0x6C, 0x64, 0xFFFFFF8= 7, 0x05, 0x68, 0x65, 0x6C, 0x6C, 0x6F}; + BindResponse decoded =3D ( BindResponse ) decode( pdu ) ; + + BindResponseImpl expected =3D new BindResponseImpl( 540 ) ; + expected.setServerSaslCreds( "hello".getBytes() ) ; + LdapResultImpl result =3D new LdapResultImpl( expected ) ; result.setResultCode( ResultCodeEnum.BUSY ) ; result.setErrorMessage( "An Error Message!" ) ; result.setMatchedDn( "uid=3Dakarasulu,dc=3Dexample,dc=3Dcom" ) ; @@ -52,58 +54,8 @@ referral.addLdapUrl( "hello" ) ; referral.addLdapUrl( "world" ) ; result.setReferral( referral ) ; - resp.setLdapResult( result ) ; - System.out.println( "Generated BindResponse for test:" ) ; - System.out.println( TestUtils.printTupleTree( resp ) ) ; - - - BindResponse decoded =3D ( BindResponse ) - snickersDecode( snaccEncode( resp ) ) ; + expected.setLdapResult( result ) ; =20 - assertNotNull( decoded ) ; - assertEquals( resp.getMessageId(), decoded.getMessageId() ) ; - assertNotNull( decoded.getServerSaslCreds() ) ; - assertEquals( new String( resp.getServerSaslCreds() ), - new String( decoded.getServerSaslCreds() ) ) ; - LdapResult decodedResult =3D resp.getLdapResult() ; - assertEquals( result.getResultCode(), decodedResult.getResultCode(= ) ) ; - assertEquals( result.getErrorMessage(), - decodedResult.getErrorMessage() ) ; - assertEquals( result.getMatchedDn(), - decodedResult.getMatchedDn() ) ; - Referral decodedRef =3D result.getReferral() ; - Iterator urls =3D referral.getLdapUrls().iterator() ; - Iterator decodedUrls =3D decodedRef.getLdapUrls().iterator() ; - - while( urls.hasNext() && decodedUrls.hasNext() ) - { - assertEquals( urls.next(), decodedUrls.next() ) ; - } - - assertFalse( urls.hasNext() ) ; - assertFalse( decodedUrls.hasNext() ) ; + assertEquals( expected, decoded ); } - - /** - * TODO: somehow, decoded result code is success instead of BUSY. To i= nvestigate ... - */ -// public void testAgainstPrecomputedPDU() throws Exception -// { -// byte[] pdu =3D new byte[] {0x30, 0x54, 0x02, 0x02, 0x02, 0x1C, 0= x61, 0x4E, 0x0A, 0x01, 0x33, 0x04, 0x1F, 0x75, 0x69, 0x64, 0x3D, 0x61, 0x6B= , 0x61, 0x72, 0x61, 0x73, 0x75, 0x6C, 0x75, 0x2C, 0x64, 0x63, 0x3D, 0x65, 0= x78, 0x61, 0x6D, 0x70, 0x6C, 0x65, 0x2C, 0x64, 0x63, 0x3D, 0x63, 0x6F, 0x6D= , 0x04, 0x11, 0x41, 0x6E, 0x20, 0x45, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x4D, 0= x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x21, 0xFFFFFFA3, 0x0E, 0x04, 0x05, 0x68= , 0x65, 0x6C, 0x6C, 0x6F, 0x04, 0x05, 0x77, 0x6F, 0x72, 0x6C, 0x64, 0xFFFFF= F87, 0x05, 0x68, 0x65, 0x6C, 0x6C, 0x6F}; -// BindResponse decoded =3D ( BindResponse ) decode( pdu ) ; -// -// BindResponseImpl expected =3D new BindResponseImpl( 540 ) ; -// expected.setServerSaslCreds( "hello".getBytes() ) ; -// LdapResultImpl result =3D new LdapResultImpl( expected ) ; -// result.setResultCode( ResultCodeEnum.BUSY ) ; -// result.setErrorMessage( "An Error Message!" ) ; -// result.setMatchedDn( "uid=3Dakarasulu,dc=3Dexample,dc=3Dcom" ) ; -// ReferralImpl referral =3D new ReferralImpl( result ) ; -// referral.addLdapUrl( "hello" ) ; -// referral.addLdapUrl( "world" ) ; -// result.setReferral( referral ) ; -// expected.setLdapResult( result ) ; -// -// assertEquals( expected, decoded ); -// } }