From commits-return-29334-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Thu Dec 16 10:20:23 2010 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 84455 invoked from network); 16 Dec 2010 10:20:22 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Dec 2010 10:20:22 -0000 Received: (qmail 32446 invoked by uid 500); 16 Dec 2010 10:20:22 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 32378 invoked by uid 500); 16 Dec 2010 10:20:22 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 32371 invoked by uid 99); 16 Dec 2010 10:20:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Dec 2010 10:20:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Dec 2010 10:20:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 01B422388AB9; Thu, 16 Dec 2010 10:19:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1049873 [3/8] - in /directory: apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/ apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ apac... Date: Thu, 16 Dec 2010 10:19:41 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101216101946.01B422388AB9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java (original) +++ directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java Thu Dec 16 10:19:33 2010 @@ -35,7 +35,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.codec.krbError.KrbErrorContainer; import org.apache.directory.shared.kerberos.exceptions.ErrorType; import org.apache.directory.shared.kerberos.messages.KrbError; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; /** @@ -95,7 +95,7 @@ public class KrbErrorDecoderTest 0x00, 0x01 } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbErrorContainer container = new KrbErrorContainer( stream ); @@ -135,7 +135,7 @@ public class KrbErrorDecoderTest { buffer = krbError.encode( buffer ); - assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) ); + assertEquals( decoded, Strings.dumpBytes(buffer.array()) ); } catch( EncoderException e ) { @@ -195,7 +195,7 @@ public class KrbErrorDecoderTest 0x00, 0x01 } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbErrorContainer container = new KrbErrorContainer( stream ); @@ -222,7 +222,7 @@ public class KrbErrorDecoderTest { buffer = krbError.encode( buffer ); - assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) ); + assertEquals( decoded, Strings.dumpBytes(buffer.array()) ); } catch( EncoderException e ) { @@ -280,7 +280,7 @@ public class KrbErrorDecoderTest 0x00, 0x01 } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbErrorContainer container = new KrbErrorContainer( stream ); @@ -307,7 +307,7 @@ public class KrbErrorDecoderTest { buffer = krbError.encode( buffer ); - assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) ); + assertEquals( decoded, Strings.dumpBytes(buffer.array()) ); } catch( EncoderException e ) { @@ -364,7 +364,7 @@ public class KrbErrorDecoderTest 0x00, 0x01 } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbErrorContainer container = new KrbErrorContainer( stream ); @@ -392,7 +392,7 @@ public class KrbErrorDecoderTest { buffer = krbError.encode( buffer ); - assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) ); + assertEquals( decoded, Strings.dumpBytes(buffer.array()) ); } catch( EncoderException e ) { @@ -450,7 +450,7 @@ public class KrbErrorDecoderTest 0x00, 0x01 } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbErrorContainer container = new KrbErrorContainer( stream ); @@ -477,7 +477,7 @@ public class KrbErrorDecoderTest { buffer = krbError.encode( buffer ); - assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) ); + assertEquals( decoded, Strings.dumpBytes(buffer.array()) ); } catch( EncoderException e ) { @@ -530,7 +530,7 @@ public class KrbErrorDecoderTest 0x00, 0x01 } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbErrorContainer container = new KrbErrorContainer( stream ); @@ -557,7 +557,7 @@ public class KrbErrorDecoderTest { buffer = krbError.encode( buffer ); - assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) ); + assertEquals( decoded, Strings.dumpBytes(buffer.array()) ); } catch( EncoderException e ) { @@ -608,7 +608,7 @@ public class KrbErrorDecoderTest 0x00, 0x01 } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbErrorContainer container = new KrbErrorContainer( stream ); @@ -636,7 +636,7 @@ public class KrbErrorDecoderTest { buffer = krbError.encode( buffer ); - assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) ); + assertEquals( decoded, Strings.dumpBytes(buffer.array()) ); } catch( EncoderException e ) { @@ -694,7 +694,7 @@ public class KrbErrorDecoderTest 0x00, 0x01 } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbErrorContainer container = new KrbErrorContainer( stream ); @@ -721,7 +721,7 @@ public class KrbErrorDecoderTest { buffer = krbError.encode( buffer ); - assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) ); + assertEquals( decoded, Strings.dumpBytes(buffer.array()) ); } catch( EncoderException e ) { @@ -777,7 +777,7 @@ public class KrbErrorDecoderTest 0x1B, 0x5, 'e', 't', 'e', 'x', 't' } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbErrorContainer container = new KrbErrorContainer( stream ); @@ -804,7 +804,7 @@ public class KrbErrorDecoderTest { buffer = krbError.encode( buffer ); - assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) ); + assertEquals( decoded, Strings.dumpBytes(buffer.array()) ); } catch( EncoderException e ) { @@ -859,7 +859,7 @@ public class KrbErrorDecoderTest // NO etext and edata } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbErrorContainer container = new KrbErrorContainer( stream ); @@ -887,7 +887,7 @@ public class KrbErrorDecoderTest { buffer = krbError.encode( buffer ); - assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) ); + assertEquals( decoded, Strings.dumpBytes(buffer.array()) ); } catch( EncoderException e ) { @@ -928,7 +928,7 @@ public class KrbErrorDecoderTest 0x1B, 0x05, 's', 'n', 'a', 'm', 'e', } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbErrorContainer container = new KrbErrorContainer( stream ); @@ -960,7 +960,7 @@ public class KrbErrorDecoderTest { buffer = krbError.encode( buffer ); - assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) ); + assertEquals( decoded, Strings.dumpBytes(buffer.array()) ); } catch( EncoderException e ) { Modified: directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbPrivDecoderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbPrivDecoderTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbPrivDecoderTest.java (original) +++ directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbPrivDecoderTest.java Thu Dec 16 10:19:33 2010 @@ -32,7 +32,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.kerberos.KerberosMessageType; import org.apache.directory.shared.kerberos.codec.krbPriv.KrbPrivContainer; import org.apache.directory.shared.kerberos.messages.KrbPriv; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; /** @@ -63,7 +63,7 @@ public class KrbPrivDecoderTest int streamLen = data.length; ByteBuffer stream = ByteBuffer.wrap( data ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); Asn1Decoder decoder = new Asn1Decoder(); @@ -92,7 +92,7 @@ public class KrbPrivDecoderTest ByteBuffer bb = ByteBuffer.allocate( encodedLen ); krbPriv.encode( bb ); - String encoded = StringTools.dumpBytes( bb.array() ); + String encoded = Strings.dumpBytes(bb.array()); assertEquals( decoded, encoded ); } catch( EncoderException e ) Modified: directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeBodyDecoderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeBodyDecoderTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeBodyDecoderTest.java (original) +++ directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeBodyDecoderTest.java Thu Dec 16 10:19:33 2010 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.kerberos.codec.krbSafeBody.KrbSafeBodyContainer; import org.apache.directory.shared.kerberos.components.HostAddress; import org.apache.directory.shared.kerberos.components.KrbSafeBody; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; /** @@ -77,7 +77,7 @@ public class KrbSafeBodyDecoderTest 0x04, 0x04, 127, 0, 0, 1 } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbSafeBodyContainer container = new KrbSafeBodyContainer(); @@ -114,7 +114,7 @@ public class KrbSafeBodyDecoderTest body.encode( bb ); - String encoded = StringTools.dumpBytes( bb.array() ); + String encoded = Strings.dumpBytes(bb.array()); assertEquals( decoded, encoded ); } catch( EncoderException e ) @@ -155,7 +155,7 @@ public class KrbSafeBodyDecoderTest 0x04, 0x04, 127, 0, 0, 1 } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbSafeBodyContainer container = new KrbSafeBodyContainer(); @@ -191,7 +191,7 @@ public class KrbSafeBodyDecoderTest body.encode( bb ); - String encoded = StringTools.dumpBytes( bb.array() ); + String encoded = Strings.dumpBytes(bb.array()); assertEquals( decoded, encoded ); } catch( EncoderException e ) @@ -230,7 +230,7 @@ public class KrbSafeBodyDecoderTest 0x04, 0x04, 127, 0, 0, 1 } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbSafeBodyContainer container = new KrbSafeBodyContainer(); @@ -266,7 +266,7 @@ public class KrbSafeBodyDecoderTest body.encode( bb ); - String encoded = StringTools.dumpBytes( bb.array() ); + String encoded = Strings.dumpBytes(bb.array()); assertEquals( decoded, encoded ); } catch( EncoderException e ) @@ -303,7 +303,7 @@ public class KrbSafeBodyDecoderTest 0x04, 0x04, 127, 0, 0, 1 } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbSafeBodyContainer container = new KrbSafeBodyContainer(); @@ -340,7 +340,7 @@ public class KrbSafeBodyDecoderTest body.encode( bb ); - String encoded = StringTools.dumpBytes( bb.array() ); + String encoded = Strings.dumpBytes(bb.array()); assertEquals( decoded, encoded ); } catch( EncoderException e ) @@ -381,7 +381,7 @@ public class KrbSafeBodyDecoderTest 0x04, 0x04, 127, 0, 0, 1 } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbSafeBodyContainer container = new KrbSafeBodyContainer(); @@ -418,7 +418,7 @@ public class KrbSafeBodyDecoderTest body.encode( bb ); - String encoded = StringTools.dumpBytes( bb.array() ); + String encoded = Strings.dumpBytes(bb.array()); assertEquals( decoded, encoded ); } catch( EncoderException e ) @@ -450,7 +450,7 @@ public class KrbSafeBodyDecoderTest // NO r-address } ); - String decoded = StringTools.dumpBytes( stream.array() ); + String decoded = Strings.dumpBytes(stream.array()); stream.flip(); KrbSafeBodyContainer container = new KrbSafeBodyContainer(); @@ -487,7 +487,7 @@ public class KrbSafeBodyDecoderTest body.encode( bb ); - String encoded = StringTools.dumpBytes( bb.array() ); + String encoded = Strings.dumpBytes(bb.array()); assertEquals( decoded, encoded ); } catch( EncoderException e ) Modified: directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeDecoderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeDecoderTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeDecoderTest.java (original) +++ directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeDecoderTest.java Thu Dec 16 10:19:33 2010 @@ -33,7 +33,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.kerberos.KerberosMessageType; import org.apache.directory.shared.kerberos.codec.krbSafe.KrbSafeContainer; import org.apache.directory.shared.kerberos.messages.KrbSafe; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; /** @@ -72,7 +72,7 @@ public class KrbSafeDecoderTest 0x04, 0x02, 0x00, 0x01 }; - String decoded = StringTools.dumpBytes( data ); + String decoded = Strings.dumpBytes(data); int streamLen = data.length; ByteBuffer stream = ByteBuffer.wrap( data ); @@ -105,7 +105,7 @@ public class KrbSafeDecoderTest ByteBuffer bb = ByteBuffer.allocate( encodedLen ); krbSafe.encode( bb ); - String encoded = StringTools.dumpBytes( bb.array() ); + String encoded = Strings.dumpBytes(bb.array()); assertEquals( decoded, encoded ); } catch( EncoderException e ) Modified: directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/LastReqDecoderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/LastReqDecoderTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/LastReqDecoderTest.java (original) +++ directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/LastReqDecoderTest.java Thu Dec 16 10:19:33 2010 @@ -33,7 +33,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.codec.types.LastReqType; import org.apache.directory.shared.kerberos.components.LastReq; import org.apache.directory.shared.kerberos.components.LastReqEntry; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; /** @@ -66,7 +66,7 @@ public class LastReqDecoderTest 0x18, 0x0F, '2', '0', '1', '0', '1', '1', '1', '0', '1', '5', '4', '5', '2', '6', 'Z' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); LastReqContainer lastReqContainer = new LastReqContainer(); @@ -106,7 +106,7 @@ public class LastReqDecoderTest // Check the length assertEquals( 0x36, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java (original) +++ directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java Thu Dec 16 10:19:33 2010 @@ -38,6 +38,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.components.MethodData; import org.apache.directory.shared.kerberos.components.PaData; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -76,7 +77,7 @@ public class MethodDataDecoderTest 0x04, 0x06, 'g', 'h', 'i', 'j', 'k', 'l' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a METHOD-DATA Container @@ -118,7 +119,7 @@ public class MethodDataDecoderTest // Check the length assertEquals( 0x24, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaDataDecoderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaDataDecoderTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaDataDecoderTest.java (original) +++ directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaDataDecoderTest.java Thu Dec 16 10:19:33 2010 @@ -34,6 +34,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.codec.types.PaDataType; import org.apache.directory.shared.kerberos.components.PaData; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; /** @@ -59,7 +60,7 @@ public class PaDataDecoderTest 0x04, 0x06, 'p', 'a', 'd', 'a', 't', 'a' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); PaDataContainer container = new PaDataContainer(); @@ -89,7 +90,7 @@ public class PaDataDecoderTest // Check the length assertEquals( 0x11, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java (original) +++ directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java Thu Dec 16 10:19:33 2010 @@ -37,6 +37,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.codec.types.EncryptionType; import org.apache.directory.shared.kerberos.components.PaEncTimestamp; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -71,7 +72,7 @@ public class PaEncTimestampDecoderTest 0x04, 0x06, 'a', 'b', 'c', 'd', 'e', 'f' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a PaEncTimestamp Container @@ -104,7 +105,7 @@ public class PaEncTimestampDecoderTest // Check the length assertEquals( 0x16, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTsEncDecoderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTsEncDecoderTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTsEncDecoderTest.java (original) +++ directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTsEncDecoderTest.java Thu Dec 16 10:19:33 2010 @@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.kerberos.codec.paEncTsEnc.PaEncTsEncContainer; import org.apache.directory.shared.kerberos.components.PaEncTsEnc; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; /** @@ -57,7 +57,7 @@ public class PaEncTsEncDecoderTest 0x02, 0x01, 0x01 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); PaEncTsEncContainer paEncTsEncContainer = new PaEncTsEncContainer(); @@ -85,7 +85,7 @@ public class PaEncTsEncDecoderTest // Check the length assertEquals( 0x1A, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -200,7 +200,7 @@ public class PaEncTsEncDecoderTest '2', '0', '1', '0', '1', '0', '1', '0', '2', '3', '4', '5', '4', '5', 'Z', } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); PaEncTsEncContainer paEncTsEncContainer = new PaEncTsEncContainer(); @@ -228,7 +228,7 @@ public class PaEncTsEncDecoderTest // Check the length assertEquals( 0x15, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PrincipalNameDecoderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PrincipalNameDecoderTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PrincipalNameDecoderTest.java (original) +++ directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PrincipalNameDecoderTest.java Thu Dec 16 10:19:33 2010 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.kerberos.codec.principalName.PrincipalNameContainer; import org.apache.directory.shared.kerberos.codec.types.PrincipalNameType; import org.apache.directory.shared.kerberos.components.PrincipalName; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -69,7 +69,7 @@ public class PrincipalNameDecoderTest 0x1B, 0x08, 'h', 'n', 'e', 'l', 's', 'o', 'n', '3', } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a PrincipalName Container @@ -103,7 +103,7 @@ public class PrincipalNameDecoderTest // Check the length assertEquals( 0x29, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TicketDecoderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TicketDecoderTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TicketDecoderTest.java (original) +++ directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TicketDecoderTest.java Thu Dec 16 10:19:33 2010 @@ -41,6 +41,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.components.PrincipalName; import org.apache.directory.shared.kerberos.messages.Ticket; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -87,7 +88,7 @@ public class TicketDecoderTest 'a', 'b', 'c', 'd', 'e', 'f' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a Ticket Container @@ -130,7 +131,7 @@ public class TicketDecoderTest // Check the length assertEquals( 0x46, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TransitedEncodingDecoderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TransitedEncodingDecoderTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TransitedEncodingDecoderTest.java (original) +++ directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TransitedEncodingDecoderTest.java Thu Dec 16 10:19:33 2010 @@ -37,6 +37,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.codec.types.TransitedEncodingType; import org.apache.directory.shared.kerberos.components.TransitedEncoding; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -69,7 +70,7 @@ public class TransitedEncodingDecoderTes 0x04, 0x06, 'a', 'b', 'c', 'd', 'e', 'f' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a TransitedEncoding Container @@ -101,7 +102,7 @@ public class TransitedEncodingDecoderTes // Check the length assertEquals( len, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TypedDataDecoderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TypedDataDecoderTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TypedDataDecoderTest.java (original) +++ directory/apacheds/branches/alex_refactoring/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TypedDataDecoderTest.java Thu Dec 16 10:19:33 2010 @@ -34,6 +34,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.kerberos.codec.typedData.TypedDataContainer; import org.apache.directory.shared.kerberos.components.TypedData; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; /** @@ -66,7 +67,7 @@ public class TypedDataDecoderTest 0x04, 0x03, 'g', 'h', 'i' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); TypedDataContainer typedDataContainer = new TypedDataContainer(); @@ -105,7 +106,7 @@ public class TypedDataDecoderTest // Check the length assertEquals( 0x21, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java (original) +++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java Thu Dec 16 10:19:33 2010 @@ -48,6 +48,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.CharConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -281,7 +282,7 @@ public class BindHandler extends LdapReq // SaslServer will throw an exception if the credentials are null. if ( bindRequest.getCredentials() == null ) { - bindRequest.setCredentials( StringTools.EMPTY_BYTES ); + bindRequest.setCredentials( CharConstants.EMPTY_BYTES ); } try Modified: directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java (original) +++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java Thu Dec 16 10:19:33 2010 @@ -25,7 +25,7 @@ import javax.security.sasl.SaslServer; import org.apache.directory.server.core.CoreSession; import org.apache.directory.server.ldap.LdapSession; import org.apache.directory.shared.ldap.message.BindRequest; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.CharConstants; /** @@ -61,7 +61,7 @@ public abstract class AbstractSaslServer */ public byte[] unwrap( byte[] incoming, int offset, int len ) throws SaslException { - return StringTools.EMPTY_BYTES; + return CharConstants.EMPTY_BYTES; } Modified: directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java (original) +++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java Thu Dec 16 10:19:33 2010 @@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.message.BindRequest; import org.apache.directory.shared.ldap.name.DN; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.CharConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -85,7 +85,7 @@ public class GssapiCallbackHandler exten LOG.debug( "Converted username {} to DN {}.", username, bindDn ); LdapPrincipal ldapPrincipal = new LdapPrincipal( new DN( entry.getDistinguishedName() ), - AuthenticationLevel.STRONG, StringTools.EMPTY_BYTES ); + AuthenticationLevel.STRONG, CharConstants.EMPTY_BYTES ); ldapSession.putSaslProperty( SaslConstants.SASL_AUTHENT_USER, ldapPrincipal ); ldapSession.putSaslProperty( Context.SECURITY_PRINCIPAL, bindDn ); Modified: directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java (original) +++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java Thu Dec 16 10:19:33 2010 @@ -32,6 +32,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.PrepareString; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.CharConstants; import javax.naming.InvalidNameException; import javax.security.sasl.SaslException; @@ -225,7 +226,7 @@ public class PlainSaslServer extends Abs } } - return StringTools.EMPTY_BYTES; + return CharConstants.EMPTY_BYTES; } Modified: directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java (original) +++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java Thu Dec 16 10:19:33 2010 @@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.SearchRequest; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; /** * The structure which stores the informations relative to the pagedSearch control. @@ -315,7 +315,7 @@ public class PagedSearchContext StringBuilder sb = new StringBuilder(); sb.append( "PagedSearch context : <" ); - sb.append( StringTools.dumpBytes( cookie ) ); + sb.append( Strings.dumpBytes(cookie) ); sb.append( ", " ); sb.append( currentPosition ); sb.append( ">" ); Modified: directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original) +++ directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Thu Dec 16 10:19:33 2010 @@ -137,6 +137,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.registries.Schema; import org.apache.directory.shared.ldap.schema.registries.SchemaLoader; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.CharConstants; import org.apache.mina.core.filterchain.IoFilter; import org.apache.mina.core.future.CloseFuture; import org.apache.mina.core.future.ConnectFuture; @@ -885,7 +886,7 @@ public class LdapNetworkConnection exten LOG.debug( "Anonymous Bind request" ); // Create the BindRequest - BindRequest bindRequest = createBindRequest( StringTools.EMPTY, StringTools.EMPTY_BYTES ); + BindRequest bindRequest = createBindRequest( StringTools.EMPTY, CharConstants.EMPTY_BYTES ); return bind( bindRequest ); } @@ -899,7 +900,7 @@ public class LdapNetworkConnection exten LOG.debug( "Anonymous Bind request" ); // Create the BindRequest - BindRequest bindRequest = createBindRequest( StringTools.EMPTY, StringTools.EMPTY_BYTES ); + BindRequest bindRequest = createBindRequest( StringTools.EMPTY, CharConstants.EMPTY_BYTES ); return bindAsync( bindRequest ); } Modified: directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/SaslRequest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/SaslRequest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/SaslRequest.java (original) +++ directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/SaslRequest.java Thu Dec 16 10:19:33 2010 @@ -26,7 +26,7 @@ import java.util.Arrays; import java.util.List; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.CharConstants; /** @@ -112,7 +112,7 @@ public class SaslRequest } else { - return StringTools.EMPTY_BYTES; + return CharConstants.EMPTY_BYTES; } } Modified: directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java (original) +++ directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java Thu Dec 16 10:19:33 2010 @@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.tlv.TLVStateEnum; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.message.Message; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.session.IoSession; import org.apache.mina.filter.codec.ProtocolDecoder; @@ -84,7 +84,7 @@ public class LdapProtocolDecoder impleme System.arraycopy( buf.array(), currentPos, b, 0, pos - currentPos ); currentPos = pos; - LOG.debug( "Received buffer : " + StringTools.dumpBytes( b ) ); + LOG.debug( "Received buffer : " + Strings.dumpBytes(b) ); } if ( ldapMessageContainer.getState() == TLVStateEnum.PDU_DECODED ) Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadBitString.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadBitString.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadBitString.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadBitString.java Thu Dec 16 10:19:33 2010 @@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.tlv.TLV; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -84,7 +84,7 @@ public abstract class AbstractReadBitStr if ( IS_DEBUG ) { - LOG.debug( "BITSTRING value : {}", StringTools.dumpBytes( data ) ); + LOG.debug( "BITSTRING value : {}", Strings.dumpBytes(data) ); } } } Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadInteger.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadInteger.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadInteger.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadInteger.java Thu Dec 16 10:19:33 2010 @@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.tlv.Value; import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -120,7 +120,7 @@ public abstract class AbstractReadIntege } catch ( IntegerDecoderException ide ) { - LOG.error( I18n.err( I18n.ERR_04070, StringTools.dumpBytes( value.getData() ), ide + LOG.error( I18n.err( I18n.ERR_04070, Strings.dumpBytes(value.getData()), ide .getLocalizedMessage() ) ); // This will generate a PROTOCOL_ERROR Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java Thu Dec 16 10:19:33 2010 @@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.DecoderCallback; import org.apache.directory.shared.i18n.I18n; import org.apache.directory.shared.ldap.message.ResponseCarryingMessageException; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.session.IoSession; import org.apache.mina.filter.codec.ProtocolDecoder; @@ -241,7 +241,7 @@ public class LdapDecoder implements Prot } else { - LOG.debug( StringTools.dumpBytes( array ) ); + LOG.debug( Strings.dumpBytes(array) ); } } Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Thu Dec 16 10:19:33 2010 @@ -121,6 +121,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.name.RDN; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.CharConstants; +import org.apache.directory.shared.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -243,7 +245,7 @@ public final class LdapMessageGrammar ex } catch ( IntegerDecoderException ide ) { - LOG.error( I18n.err( I18n.ERR_04070, StringTools.dumpBytes( value.getData() ), ide + LOG.error( I18n.err( I18n.ERR_04070, Strings.dumpBytes(value.getData()), ide .getLocalizedMessage() ) ); // This will generate a PROTOCOL_ERROR @@ -367,7 +369,7 @@ public final class LdapMessageGrammar ex } catch ( LdapInvalidDnException ine ) { - String msg = I18n.err( I18n.ERR_04074, dnStr, StringTools.dumpBytes( dnBytes ), ine + String msg = I18n.err( I18n.ERR_04074, dnStr, Strings.dumpBytes(dnBytes), ine .getLocalizedMessage() ); LOG.error( msg ); @@ -454,7 +456,7 @@ public final class LdapMessageGrammar ex catch ( IntegerDecoderException ide ) { LOG.error( I18n - .err( I18n.ERR_04076, StringTools.dumpBytes( value.getData() ), ide.getMessage() ) ); + .err( I18n.ERR_04076, Strings.dumpBytes(value.getData()), ide.getMessage() ) ); // This will generate a PROTOCOL_ERROR throw new DecoderException( ide.getMessage() ); @@ -543,7 +545,7 @@ public final class LdapMessageGrammar ex catch ( IntegerDecoderException ide ) { LOG.error( I18n - .err( I18n.ERR_04078, StringTools.dumpBytes( value.getData() ), ide.getMessage() ) ); + .err( I18n.ERR_04078, Strings.dumpBytes(value.getData()), ide.getMessage() ) ); // This will generate a PROTOCOL_ERROR throw new DecoderException( ide.getMessage() ); @@ -589,7 +591,7 @@ public final class LdapMessageGrammar ex } catch ( LdapInvalidDnException ine ) { - String msg = "Incorrect DN given : " + dnStr + " (" + StringTools.dumpBytes( dnBytes ) + String msg = "Incorrect DN given : " + dnStr + " (" + Strings.dumpBytes(dnBytes) + ") is invalid"; LOG.error( "{} : {}", msg, ine.getMessage() ); @@ -636,7 +638,7 @@ public final class LdapMessageGrammar ex // We have to handle the special case of a 0 length simple if ( tlv.getLength() == 0 ) { - bindRequestMessage.setCredentials( StringTools.EMPTY_BYTES ); + bindRequestMessage.setCredentials( CharConstants.EMPTY_BYTES ); } else { @@ -648,8 +650,8 @@ public final class LdapMessageGrammar ex if ( IS_DEBUG ) { - LOG.debug( "The simple authentication is : {}", StringTools.dumpBytes( bindRequestMessage - .getCredentials() ) ); + LOG.debug( "The simple authentication is : {}", Strings.dumpBytes(bindRequestMessage + .getCredentials()) ); } } } ); @@ -773,7 +775,7 @@ public final class LdapMessageGrammar ex // credentials if ( tlv.getLength() == 0 ) { - bindRequestMessage.setCredentials( StringTools.EMPTY_BYTES ); + bindRequestMessage.setCredentials( CharConstants.EMPTY_BYTES ); } else { @@ -785,8 +787,8 @@ public final class LdapMessageGrammar ex if ( IS_DEBUG ) { - LOG.debug( "The credentials are : {}", StringTools.dumpBytes( bindRequestMessage - .getCredentials() ) ); + LOG.debug( "The credentials are : {}", Strings.dumpBytes(bindRequestMessage + .getCredentials()) ); } } } ); @@ -1138,7 +1140,7 @@ public final class LdapMessageGrammar ex catch ( LdapInvalidDnException ine ) { // This is for the client side. We will never decode LdapResult on the server - String msg = "The DN " + StringTools.dumpBytes( dnBytes ) + "is invalid : " + String msg = "The DN " + Strings.dumpBytes(dnBytes) + "is invalid : " + ine.getMessage(); LOG.error( "{} : {}", msg, ine.getMessage() ); throw new DecoderException( msg, ine ); @@ -1452,7 +1454,7 @@ public final class LdapMessageGrammar ex } catch ( LdapInvalidDnException ine ) { - String msg = "Invalid DN given : " + dnStr + " (" + StringTools.dumpBytes( dnBytes ) + String msg = "Invalid DN given : " + dnStr + " (" + Strings.dumpBytes(dnBytes) + ") is invalid"; LOG.error( "{} : {}", msg, ine.getMessage() ); @@ -1526,7 +1528,7 @@ public final class LdapMessageGrammar ex } catch ( IntegerDecoderException ide ) { - String msg = I18n.err( I18n.ERR_04082, StringTools.dumpBytes( tlv.getValue().getData() ) ); + String msg = I18n.err( I18n.ERR_04082, Strings.dumpBytes(tlv.getValue().getData()) ); LOG.error( msg ); // This will generate a PROTOCOL_ERROR @@ -1882,7 +1884,7 @@ public final class LdapMessageGrammar ex } catch ( LdapInvalidDnException ine ) { - String msg = "Invalid DN given : " + dnStr + " (" + StringTools.dumpBytes( dnBytes ) + String msg = "Invalid DN given : " + dnStr + " (" + Strings.dumpBytes(dnBytes) + ") is invalid"; LOG.error( "{} : {}", msg, ine.getMessage() ); @@ -2184,7 +2186,7 @@ public final class LdapMessageGrammar ex } catch ( LdapInvalidDnException ine ) { - String msg = "Invalid DN given : " + dnStr + " (" + StringTools.dumpBytes( dnBytes ) + String msg = "Invalid DN given : " + dnStr + " (" + Strings.dumpBytes(dnBytes) + ") is invalid"; LOG.error( "{} : {}", msg, ine.getMessage() ); @@ -2252,7 +2254,7 @@ public final class LdapMessageGrammar ex } catch ( LdapInvalidDnException ine ) { - String msg = "Invalid new RDN given : " + dnStr + " (" + StringTools.dumpBytes( dnBytes ) + String msg = "Invalid new RDN given : " + dnStr + " (" + Strings.dumpBytes(dnBytes) + ") is invalid"; LOG.error( "{} : {}", msg, ine.getMessage() ); @@ -2306,7 +2308,7 @@ public final class LdapMessageGrammar ex catch ( BooleanDecoderException bde ) { LOG.error( I18n - .err( I18n.ERR_04091, StringTools.dumpBytes( value.getData() ), bde.getMessage() ) ); + .err( I18n.ERR_04091, Strings.dumpBytes(value.getData()), bde.getMessage() ) ); // This will generate a PROTOCOL_ERROR throw new DecoderException( bde.getMessage() ); @@ -2380,7 +2382,7 @@ public final class LdapMessageGrammar ex catch ( LdapInvalidDnException ine ) { String msg = "Invalid new superior DN given : " + dnStr + " (" - + StringTools.dumpBytes( dnBytes ) + ") is invalid"; + + Strings.dumpBytes(dnBytes) + ") is invalid"; LOG.error( "{} : {}", msg, ine.getMessage() ); ModifyDnResponseImpl response = new ModifyDnResponseImpl( modifyDnRequest.getMessageId() ); @@ -2531,7 +2533,7 @@ public final class LdapMessageGrammar ex } catch ( LdapInvalidDnException ine ) { - String msg = "Invalid DN given : " + dnStr + " (" + StringTools.dumpBytes( dnBytes ) + String msg = "Invalid DN given : " + dnStr + " (" + Strings.dumpBytes(dnBytes) + ") is invalid"; LOG.error( "{} : {}", msg, ine.getMessage() ); @@ -2648,8 +2650,8 @@ public final class LdapMessageGrammar ex if ( IS_DEBUG ) { - LOG.debug( "Comparing attribute value {}", StringTools.dumpBytes( compareRequest - .getAssertionValue().getBytes() ) ); + LOG.debug( "Comparing attribute value {}", Strings.dumpBytes(compareRequest + .getAssertionValue().getBytes()) ); } } else @@ -2856,7 +2858,7 @@ public final class LdapMessageGrammar ex String msg = "The Request name is not a valid OID : " + StringTools.utf8ToString( requestNameBytes ) + " (" - + StringTools.dumpBytes( requestNameBytes ) + ") is invalid"; + + Strings.dumpBytes(requestNameBytes) + ") is invalid"; LOG.error( msg ); // throw an exception, we will get a PROTOCOL_ERROR @@ -2869,7 +2871,7 @@ public final class LdapMessageGrammar ex { String msg = "The Request name is not a valid OID : " + StringTools.utf8ToString( requestNameBytes ) + " (" - + StringTools.dumpBytes( requestNameBytes ) + ") is invalid"; + + Strings.dumpBytes(requestNameBytes) + ") is invalid"; LOG.error( "{} : {}", msg, de.getMessage() ); // Rethrow the exception, we will get a PROTOCOL_ERROR @@ -2913,7 +2915,7 @@ public final class LdapMessageGrammar ex // value if ( tlv.getLength() == 0 ) { - extendedRequest.setRequestValue( StringTools.EMPTY_BYTES ); + extendedRequest.setRequestValue( CharConstants.EMPTY_BYTES ); } else { @@ -3235,7 +3237,7 @@ public final class LdapMessageGrammar ex { String msg = "The Intermediate Response name is not a valid OID : " + StringTools.utf8ToString( responseNameBytes ) + " (" - + StringTools.dumpBytes( responseNameBytes ) + ") is invalid"; + + Strings.dumpBytes(responseNameBytes) + ") is invalid"; LOG.error( "{} : {}", msg, oidStr ); // Rethrow the exception, we will get a PROTOCOL_ERROR @@ -3280,7 +3282,7 @@ public final class LdapMessageGrammar ex // value if ( tlv.getLength() == 0 ) { - intermediateResponse.setResponseValue( StringTools.EMPTY_BYTES ); + intermediateResponse.setResponseValue( CharConstants.EMPTY_BYTES ); } else { @@ -3292,7 +3294,7 @@ public final class LdapMessageGrammar ex if ( IS_DEBUG ) { - LOG.debug( "Value read : {}", StringTools.dumpBytes( intermediateResponse.getResponseValue() ) ); + LOG.debug( "Value read : {}", Strings.dumpBytes(intermediateResponse.getResponseValue()) ); } } } ); @@ -3323,7 +3325,7 @@ public final class LdapMessageGrammar ex // value if ( tlv.getLength() == 0 ) { - intermediateResponse.setResponseValue( StringTools.EMPTY_BYTES ); + intermediateResponse.setResponseValue( CharConstants.EMPTY_BYTES ); } else { @@ -3433,7 +3435,7 @@ public final class LdapMessageGrammar ex // The OID is encoded as a String, not an Object Id if ( !OID.isOID( oidValue ) ) { - LOG.error( I18n.err( I18n.ERR_04098, StringTools.dumpBytes( value ) ) ); + LOG.error( I18n.err( I18n.ERR_04098, Strings.dumpBytes(value) ) ); // This will generate a PROTOCOL_ERROR throw new DecoderException( I18n.err( I18n.ERR_04099, oidValue ) ); @@ -3496,7 +3498,7 @@ public final class LdapMessageGrammar ex catch ( BooleanDecoderException bde ) { LOG.error( I18n - .err( I18n.ERR_04100, StringTools.dumpBytes( value.getData() ), bde.getMessage() ) ); + .err( I18n.ERR_04100, Strings.dumpBytes(value.getData()), bde.getMessage() ) ); // This will generate a PROTOCOL_ERROR throw new DecoderException( bde.getMessage() ); @@ -3632,7 +3634,7 @@ public final class LdapMessageGrammar ex } catch ( LdapInvalidDnException ine ) { - String msg = "Invalid root DN given : " + dnStr + " (" + StringTools.dumpBytes( dnBytes ) + String msg = "Invalid root DN given : " + dnStr + " (" + Strings.dumpBytes(dnBytes) + ") is invalid"; LOG.error( "{} : {}", msg, ine.getMessage() ); @@ -3910,7 +3912,7 @@ public final class LdapMessageGrammar ex catch ( BooleanDecoderException bde ) { LOG.error( I18n - .err( I18n.ERR_04105, StringTools.dumpBytes( value.getData() ), bde.getMessage() ) ); + .err( I18n.ERR_04105, Strings.dumpBytes(value.getData()), bde.getMessage() ) ); throw new DecoderException( bde.getMessage() ); } @@ -6179,7 +6181,7 @@ public final class LdapMessageGrammar ex catch ( BooleanDecoderException bde ) { LOG.error( I18n - .err( I18n.ERR_04110, StringTools.dumpBytes( value.getData() ), bde.getMessage() ) ); + .err( I18n.ERR_04110, Strings.dumpBytes(value.getData()), bde.getMessage() ) ); throw new DecoderException( bde.getMessage() ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java Thu Dec 16 10:19:33 2010 @@ -30,7 +30,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.controls.ControlDecoder; import org.apache.directory.shared.ldap.message.Message; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.CharConstants; +import org.apache.directory.shared.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -71,7 +72,7 @@ public class ControlValueAction extends // Store the value - have to handle the special case of a 0 length value if ( tlv.getLength() == 0 ) { - control.setValue( StringTools.EMPTY_BYTES ); + control.setValue( CharConstants.EMPTY_BYTES ); } else { @@ -88,7 +89,7 @@ public class ControlValueAction extends if ( IS_DEBUG ) { - LOG.debug( "Control value : " + StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + LOG.debug( "Control value : " + Strings.dumpBytes((byte[]) control.getValue()) ); } } } Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java Thu Dec 16 10:19:33 2010 @@ -33,6 +33,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.SearchRequest; import org.apache.directory.shared.ldap.message.SearchRequestImpl; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.CharConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -79,7 +80,7 @@ public class InitAssertionValueFilterAct } else { - assertionValue = new BinaryValue( StringTools.EMPTY_BYTES ); + assertionValue = new BinaryValue( CharConstants.EMPTY_BYTES ); } AttributeValueAssertionFilter terminalFilter = ( AttributeValueAssertionFilter ) ( ( SearchRequestImpl ) searchRequest ) @@ -94,7 +95,7 @@ public class InitAssertionValueFilterAct } else { - assertionValue = new BinaryValue( StringTools.EMPTY_BYTES ); + assertionValue = new BinaryValue( CharConstants.EMPTY_BYTES ); } assertion.setAssertionValue( assertionValue ); Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java Thu Dec 16 10:19:33 2010 @@ -32,6 +32,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.ResultResponse; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -103,7 +104,7 @@ public class MatchedDNAction extends Gra catch ( LdapInvalidDnException ine ) { // This is for the client side. We will never decode LdapResult on the server - String msg = I18n.err( I18n.ERR_04013, dnStr, StringTools.dumpBytes( dnBytes ), ine + String msg = I18n.err( I18n.ERR_04013, dnStr, Strings.dumpBytes(dnBytes), ine .getLocalizedMessage() ); LOG.error( msg ); Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java Thu Dec 16 10:19:33 2010 @@ -27,6 +27,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.ModifyRequest; import org.apache.directory.shared.ldap.message.ModifyRequestImpl; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.CharConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,7 +66,7 @@ public class ModifyAttributeValueAction TLV tlv = ldapMessageContainer.getCurrentTLV(); // Store the value. It can't be null - byte[] value = StringTools.EMPTY_BYTES; + byte[] value = CharConstants.EMPTY_BYTES; if ( tlv.getLength() == 0 ) { Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseAction.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseAction.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseAction.java Thu Dec 16 10:19:33 2010 @@ -26,7 +26,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.tlv.TLV; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.message.ExtendedResponse; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.CharConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,7 +72,7 @@ public class ResponseAction extends Gram // OID if ( tlv.getLength() == 0 ) { - extendedResponse.setResponseValue( StringTools.EMPTY_BYTES ); + extendedResponse.setResponseValue( CharConstants.EMPTY_BYTES ); } else { Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java Thu Dec 16 10:19:33 2010 @@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.LdapResult; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.ResultResponse; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,7 +81,7 @@ public class ResultCodeAction extends Gr } catch ( IntegerDecoderException ide ) { - LOG.error( I18n.err( I18n.ERR_04018, StringTools.dumpBytes( value.getData() ), ide.getMessage() ) ); + LOG.error( I18n.err( I18n.ERR_04018, Strings.dumpBytes(value.getData()), ide.getMessage() ) ); throw new DecoderException( ide.getMessage() ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java Thu Dec 16 10:19:33 2010 @@ -26,6 +26,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.message.SearchResultEntry; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -80,7 +81,7 @@ public class SearchResultAttributeValueA if ( IS_DEBUG ) { - LOG.debug( "Attribute value {}", StringTools.dumpBytes( ( byte[] ) value ) ); + LOG.debug( "Attribute value {}", Strings.dumpBytes((byte[]) value) ); } } else Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java Thu Dec 16 10:19:33 2010 @@ -26,7 +26,8 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.tlv.TLV; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.message.BindResponse; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.CharConstants; +import org.apache.directory.shared.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,7 +71,7 @@ public class ServerSASLCredsAction exten if ( tlv.getLength() == 0 ) { - serverSaslCreds = StringTools.EMPTY_BYTES; + serverSaslCreds = CharConstants.EMPTY_BYTES; } else { @@ -85,7 +86,7 @@ public class ServerSASLCredsAction exten if ( IS_DEBUG ) { - LOG.debug( "The SASL credentials value is : {}", StringTools.dumpBytes( serverSaslCreds ) ); + LOG.debug( "The SASL credentials value is : {}", Strings.dumpBytes(serverSaslCreds) ); } } } Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ValueAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ValueAction.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ValueAction.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ValueAction.java Thu Dec 16 10:19:33 2010 @@ -26,6 +26,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.message.AddRequest; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -79,7 +80,7 @@ public class ValueAction extends Grammar if ( IS_DEBUG ) { - LOG.debug( "Adding value {}", StringTools.dumpBytes( ( byte[] ) value ) ); + LOG.debug( "Adding value {}", Strings.dumpBytes((byte[]) value) ); } addRequest.addAttributeValue( ( byte[] ) value ); Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControl.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControl.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControl.java Thu Dec 16 10:19:33 2010 @@ -31,6 +31,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.i18n.I18n; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; /** @@ -233,7 +234,7 @@ public abstract class AbstractControl ex if ( value != null ) { - sb.append( " Control value : '" ).append( StringTools.dumpBytes( value ) ) + sb.append( " Control value : '" ).append( Strings.dumpBytes(value) ) .append( "'\n" ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlImpl.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlImpl.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlImpl.java Thu Dec 16 10:19:33 2010 @@ -25,7 +25,8 @@ import java.nio.ByteBuffer; import org.apache.directory.shared.asn1.ber.tlv.Value; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.CharConstants; +import org.apache.directory.shared.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,7 +66,7 @@ public class ControlImpl extends Abstrac { if ( IS_DEBUG ) { - LOG.debug( "Control payoad for {} : {}", getOid(), StringTools.dumpBytes( value ) ); + LOG.debug( "Control payoad for {} : {}", getOid(), Strings.dumpBytes(value) ); } this.value = new byte[ value.length ]; @@ -87,7 +88,7 @@ public class ControlImpl extends Abstrac { if ( value == null ) { - return StringTools.EMPTY_BYTES; + return CharConstants.EMPTY_BYTES; } final byte[] copy = new byte[ value.length ]; Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControl.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControl.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControl.java Thu Dec 16 10:19:33 2010 @@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.tlv.Value; import org.apache.directory.shared.i18n.I18n; import org.apache.directory.shared.ldap.codec.controls.AbstractControl; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; /** @@ -224,7 +224,7 @@ public class SyncDoneValueControl extend sb.append( " SyncDoneValue control :\n" ); sb.append( " oid : " ).append( getOid() ).append( '\n' ); sb.append( " critical : " ).append( isCritical() ).append( '\n' ); - sb.append( " cookie : '" ).append( StringTools.dumpBytes( cookie ) ).append( "'\n" ); + sb.append( " cookie : '" ).append( Strings.dumpBytes(cookie) ).append( "'\n" ); sb.append( " refreshDeletes : '" ).append( refreshDeletes ).append( "'\n" ); return sb.toString();