Return-Path: Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org Received: (qmail 28543 invoked from network); 16 Mar 2005 04:20:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 16 Mar 2005 04:20:55 -0000 Received: (qmail 82831 invoked by uid 500); 16 Mar 2005 04:20:55 -0000 Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org Received: (qmail 82790 invoked by uid 500); 16 Mar 2005 04:20:54 -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 82777 invoked by uid 99); 16 Mar 2005 04:20:54 -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; Tue, 15 Mar 2005 20:20:54 -0800 Received: (qmail 28521 invoked by uid 65534); 16 Mar 2005 04:20:53 -0000 Message-ID: <20050316042053.28520.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: Wed, 16 Mar 2005 04:20:53 -0000 Subject: svn commit: r157659 - in directory: asn1/branches/rewrite/ber/src/java/org/apache/asn1/ asn1/branches/rewrite/ber/src/java/org/apache/asn1/tag/ protocol-providers/ protocols/ To: directory-cvs@incubator.apache.org From: akarasulu@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Tue Mar 15 20:20:50 2005 New Revision: 157659 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D157659 Log: renaming protocols to protocol-providers to better express the serverside n= ature of these components Added: directory/protocol-providers/ - copied from r157658, directory/protocols/ Removed: directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/TupleEvent= Consumer.java directory/protocols/ Modified: directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/BufferCons= umer.java directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/TupleConsu= mer.java directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/tag/TagOct= etCollector.java directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/tag/TagUti= ls.java Modified: directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/Buff= erConsumer.java URL: http://svn.apache.org/viewcvs/directory/asn1/branches/rewrite/ber/src/= java/org/apache/asn1/BufferConsumer.java?view=3Ddiff&r1=3D157658&r2=3D157659 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/BufferCons= umer.java (original) +++ directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/BufferCons= umer.java Tue Mar 15 20:20:50 2005 @@ -20,8 +20,6 @@ import java.nio.ByteBuffer; import java.util.List; =20 -import org.apache.asn1.codec.DecoderException; - =20 /** * A ByteBuffer consumer. Modified: directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/Tupl= eConsumer.java URL: http://svn.apache.org/viewcvs/directory/asn1/branches/rewrite/ber/src/= java/org/apache/asn1/TupleConsumer.java?view=3Ddiff&r1=3D157658&r2=3D157659 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/TupleConsu= mer.java (original) +++ directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/TupleConsu= mer.java Tue Mar 15 20:20:50 2005 @@ -17,16 +17,47 @@ package org.apache.asn1; =20 =20 -import org.apache.asn1.tuples.Tuple; +import org.apache.asn1.ber.TagEnum; + +import java.nio.ByteBuffer; +import java.net.URL; =20 =20 /** - * A Tuple consumer. + * A consumer of tuple events rather than tuples themselves. This way tup= le objects + * need not be created. This is an experiment. * * @author Apache Di= rectory Project * @version $Rev$ */ public interface TupleConsumer { - void consume( Tuple tuple ); + /** + * Consumer callback invoked by the production of a primitive tuple + * whose value is kept in memory. + * + * @param tag the tag enum type of the TLV tuple + * @param value the buffered value of the TLV tuple + */ + void consume( TagEnum tag, ByteBuffer value ); + + /** + * Consumer callback invoked by the production of a primitive tuple + * whose value is kept on disk to be accessed later. + * + * The length in bytes of the data is encoded into a header in the + * stream - this helps because we can build and stream out determinate + * length tuples when encoding and chunking value out the door + * + * @param tag the tag enum type of the TLV tuple + * @param url the url to use for streamed access to this large tuple v= alue + */ + void consume( TagEnum tag, int length, URL url ); + + /** + * Consumer callback invoked by the production of a constructed tuple. + * + * @param tag the tag enum type of the TLV tuple + */ + void consume( TagEnum tag ); } Modified: directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/tag/= TagOctetCollector.java URL: http://svn.apache.org/viewcvs/directory/asn1/branches/rewrite/ber/src/= java/org/apache/asn1/tag/TagOctetCollector.java?view=3Ddiff&r1=3D157658&r2= =3D157659 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/tag/TagOct= etCollector.java (original) +++ directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/tag/TagOct= etCollector.java Tue Mar 15 20:20:50 2005 @@ -99,7 +99,7 @@ /** * Gets the number of octets stored by this TagOctetCollector *=20 - * @return + * @return the size of this collector in tag bytes */ public int size() { @@ -121,7 +121,7 @@ /** * Gets the 4 octets for the tag. *=20 - * @return + * @return a byte array at most 4 in size representing the tag bytes */ public byte[] toArray() { @@ -173,7 +173,7 @@ =20 default: =20 - throw new IllegalArgumentException( "Cannot support more t= han 4 octets" ) ; + throw new IllegalStateException( "Cannot support more than= 4 octets" ) ; } =20 return octets ; @@ -183,50 +183,45 @@ /** * Gets the byte at a specific index. *=20 - * @param index + * @param index into the tag bytes * @return * @throws IndexOutOfBoundsException */ public byte get( int index ) { - byte octet ; + byte octet; =20 - if ( index >=3D size ) - { - throw new IndexOutOfBoundsException( "accesing index " + index= + " with a size of " + size ) ; - } - switch( index ) { case(0): =20 - octet =3D ( byte ) ( ( intValue & 0xff000000 ) >> 24 ) ; + octet =3D ( byte ) ( ( intValue & 0xff000000 ) >> 24 ); =20 - break ; + break; =20 case(1): =20 - octet =3D ( byte ) ( ( intValue & 0x00ff0000 ) >> 16 ) ; + octet =3D ( byte ) ( ( intValue & 0x00ff0000 ) >> 16 ); =20 - break ; + break; =20 case(2): =20 - octet =3D ( byte ) ( ( intValue & 0x0000ff00 ) >> 8 ) ; + octet =3D ( byte ) ( ( intValue & 0x0000ff00 ) >> 8 ); =20 - break ; + break; =20 case(3): =20 - octet =3D ( byte ) ( intValue & 0x000000ff ) ; + octet =3D ( byte ) ( intValue & 0x000000ff ); =20 - break ; + break; =20 default: =20 - throw new IllegalArgumentException( "Cannot support more t= han 4 octets" ) ; + throw new IndexOutOfBoundsException( "Cannot support more = than 4 octets or less than 0: " + index ); } =20 - return octet ; + return octet; } } Modified: directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/tag/= TagUtils.java URL: http://svn.apache.org/viewcvs/directory/asn1/branches/rewrite/ber/src/= java/org/apache/asn1/tag/TagUtils.java?view=3Ddiff&r1=3D157658&r2=3D157659 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/tag/TagUti= ls.java (original) +++ directory/asn1/branches/rewrite/ber/src/java/org/apache/asn1/tag/TagUti= ls.java Tue Mar 15 20:20:50 2005 @@ -310,11 +310,6 @@ */ public static boolean isRawTagConstructed( int rawTag ) { - if ( ( rawTag & 0x20000000 ) > 0 ) - { - return true; - } - - return false; + return ( rawTag & 0x20000000 ) > 0; } }