You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/20 18:49:55 UTC
svn commit: r1061416 [3/6] - in /directory:
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/
apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/
apacheds/trunk/core-integ/src/test/j...
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTsEncDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTsEncDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTsEncDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTsEncDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
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/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PrincipalNameDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PrincipalNameDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PrincipalNameDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PrincipalNameDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -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/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TicketDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TicketDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TicketDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TicketDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -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/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TransitedEncodingDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TransitedEncodingDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TransitedEncodingDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TransitedEncodingDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -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/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TypedDataDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TypedDataDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TypedDataDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TypedDataDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -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/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java Thu Jan 20 17:49:48 2011
@@ -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/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java Thu Jan 20 17:49:48 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.DecoderException;
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/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java Thu Jan 20 17:49:48 2011
@@ -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/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Thu Jan 20 17:49:48 2011
@@ -121,6 +121,7 @@ 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.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -243,7 +244,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 +368,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 +455,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 +544,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 +590,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() );
@@ -648,8 +649,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()) );
}
}
} );
@@ -785,8 +786,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 +1139,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 +1453,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 +1527,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 +1883,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 +2185,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 +2253,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 +2307,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 +2381,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 +2532,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 +2649,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 +2857,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 +2870,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
@@ -3235,7 +3236,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
@@ -3292,7 +3293,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()) );
}
}
} );
@@ -3433,7 +3434,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 +3497,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 +3633,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 +3911,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 +6180,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/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java Thu Jan 20 17:49:48 2011
@@ -31,6 +31,7 @@ import org.apache.directory.shared.ldap.
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.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -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/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java Thu Jan 20 17:49:48 2011
@@ -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/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java Thu Jan 20 17:49:48 2011
@@ -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/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java Thu Jan 20 17:49:48 2011
@@ -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/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java Thu Jan 20 17:49:48 2011
@@ -27,6 +27,7 @@ import org.apache.directory.shared.asn1.
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.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -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/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ValueAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ValueAction.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ValueAction.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ValueAction.java Thu Jan 20 17:49:48 2011
@@ -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/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControl.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControl.java Thu Jan 20 17:49:48 2011
@@ -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;
/**
@@ -270,7 +271,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/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlImpl.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlImpl.java Thu Jan 20 17:49:48 2011
@@ -26,6 +26,7 @@ import org.apache.directory.shared.asn1.
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.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 ];
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControl.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControl.java Thu Jan 20 17:49:48 2011
@@ -29,7 +29,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;
/**
@@ -241,7 +241,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();
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlGrammar.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlGrammar.java Thu Jan 20 17:49:48 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.Value;
import org.apache.directory.shared.asn1.ber.tlv.BooleanDecoder;
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;
@@ -115,7 +115,7 @@ public final class SyncDoneValueControlG
if ( IS_DEBUG )
{
- LOG.debug( "cookie = {}", StringTools.dumpBytes( cookie ) );
+ LOG.debug( "cookie = {}", Strings.dumpBytes(cookie) );
}
syncDoneValueContainer.getSyncDoneValueControl().setCookie( cookie );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControl.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControl.java Thu Jan 20 17:49:48 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.controls.AbstractControl;
import org.apache.directory.shared.ldap.message.control.replication.SynchronizationInfoEnum;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
/**
* A syncInfoValue object, as defined in RFC 4533
@@ -586,7 +586,7 @@ public class SyncInfoValueControl extend
{
case NEW_COOKIE :
sb.append( " newCookie : '" ).
- append( StringTools.dumpBytes( cookie ) ).append( "'\n" );
+ append( Strings.dumpBytes(cookie) ).append( "'\n" );
break;
case REFRESH_DELETE :
@@ -595,7 +595,7 @@ public class SyncInfoValueControl extend
if ( cookie != null )
{
sb.append( " cookie : '" ).
- append( StringTools.dumpBytes( cookie ) ).append( "'\n" );
+ append( Strings.dumpBytes(cookie) ).append( "'\n" );
}
sb.append( " refreshDone : " ).append( refreshDone ).append( '\n' );
@@ -607,7 +607,7 @@ public class SyncInfoValueControl extend
if ( cookie != null )
{
sb.append( " cookie : '" ).
- append( StringTools.dumpBytes( cookie ) ).append( "'\n" );
+ append( Strings.dumpBytes(cookie) ).append( "'\n" );
}
sb.append( " refreshDone : " ).append( refreshDone ).append( '\n' );
@@ -619,7 +619,7 @@ public class SyncInfoValueControl extend
if ( cookie != null )
{
sb.append( " cookie : '" ).
- append( StringTools.dumpBytes( cookie ) ).append( "'\n" );
+ append( Strings.dumpBytes(cookie) ).append( "'\n" );
}
sb.append( " refreshDeletes : " ).append( refreshDeletes ).append( '\n' );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlGrammar.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlGrammar.java Thu Jan 20 17:49:48 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.BooleanDecoder;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.message.control.replication.SynchronizationInfoEnum;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -111,7 +111,7 @@ public final class SyncInfoValueControlG
if ( IS_DEBUG )
{
- LOG.debug( "newcookie = " + StringTools.dumpBytes( newCookie ) );
+ LOG.debug( "newcookie = " + Strings.dumpBytes(newCookie) );
}
control.setCookie( newCookie );
@@ -180,7 +180,7 @@ public final class SyncInfoValueControlG
if ( IS_DEBUG )
{
- LOG.debug( "cookie = " + StringTools.dumpBytes( cookie ) );
+ LOG.debug( "cookie = " + Strings.dumpBytes(cookie) );
}
syncInfoValueContainer.getSyncInfoValueControl().setCookie( cookie );
@@ -354,7 +354,7 @@ public final class SyncInfoValueControlG
if ( IS_DEBUG )
{
- LOG.debug( "cookie = " + StringTools.dumpBytes( cookie ) );
+ LOG.debug( "cookie = " + Strings.dumpBytes(cookie) );
}
syncInfoValueContainer.getSyncInfoValueControl().setCookie( cookie );
@@ -526,7 +526,7 @@ public final class SyncInfoValueControlG
if ( IS_DEBUG )
{
- LOG.debug( "cookie = " + StringTools.dumpBytes( cookie ) );
+ LOG.debug( "cookie = " + Strings.dumpBytes(cookie) );
}
syncInfoValueContainer.getSyncInfoValueControl().setCookie( cookie );
@@ -740,7 +740,7 @@ public final class SyncInfoValueControlG
if ( IS_DEBUG )
{
- LOG.debug( "UUID = " + StringTools.dumpBytes( uuid ) );
+ LOG.debug( "UUID = " + Strings.dumpBytes(uuid) );
}
// Store the UUID in the UUIDs list
@@ -787,7 +787,7 @@ public final class SyncInfoValueControlG
if ( IS_DEBUG )
{
- LOG.debug( "UUID = " + StringTools.dumpBytes( uuid ) );
+ LOG.debug( "UUID = " + Strings.dumpBytes(uuid) );
}
// Store the UUID in the UUIDs list
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControl.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControl.java Thu Jan 20 17:49:48 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.controls.AbstractControl;
import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
/**
* A syncRequestValue object, as defined in RFC 4533
@@ -271,7 +271,7 @@ public class SyncRequestValueControl ex
sb.append( " critical : " ).append( isCritical() ).append( '\n' );
sb.append( " mode : '" ).append( mode ).append( "'\n" );
sb.append( " cookie : '" ).
- append( StringTools.dumpBytes( cookie ) ).append( "'\n" );
+ append( Strings.dumpBytes(cookie) ).append( "'\n" );
sb.append( " refreshAndPersist : '" ).append( reloadHint ).append( "'\n" );
return sb.toString();
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlGrammar.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlGrammar.java Thu Jan 20 17:49:48 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -167,7 +167,7 @@ public final class SyncRequestValueContr
if ( IS_DEBUG )
{
- LOG.debug( "cookie = " + StringTools.dumpBytes( cookie ) );
+ LOG.debug( "cookie = " + Strings.dumpBytes(cookie) );
}
syncRequestValueContainer.getSyncRequestValueControl().setCookie( cookie );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControl.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControl.java Thu Jan 20 17:49:48 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.controls.AbstractControl;
import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
/**
@@ -264,8 +264,8 @@ public class SyncStateValueControl exte
sb.append( " oid : " ).append( getOid() ).append( '\n' );
sb.append( " critical : " ).append( isCritical() ).append( '\n' );
sb.append( " syncStateType : '" ).append( syncStateType ).append( "'\n" );
- sb.append( " entryUUID : '" ).append( StringTools.dumpBytes( entryUUID ) ).append( "'\n" );
- sb.append( " cookie : '" ).append( StringTools.dumpBytes( cookie ) ).append( "'\n" );
+ sb.append( " entryUUID : '" ).append( Strings.dumpBytes(entryUUID) ).append( "'\n" );
+ sb.append( " cookie : '" ).append( Strings.dumpBytes(cookie) ).append( "'\n" );
return sb.toString();
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlGrammar.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlGrammar.java Thu Jan 20 17:49:48 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.DecoderException;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -161,7 +161,7 @@ public final class SyncStateValueControl
if ( IS_DEBUG )
{
- LOG.debug( "entryUUID = {}", StringTools.dumpBytes( entryUUID ) );
+ LOG.debug( "entryUUID = {}", Strings.dumpBytes(entryUUID) );
}
syncStateValueContainer.getSyncStateValueControl().setEntryUUID( entryUUID );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelGrammar.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelGrammar.java Thu Jan 20 17:49:48 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
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;
@@ -128,7 +128,7 @@ public final class CancelGrammar extends
}
catch ( IntegerDecoderException e )
{
- String msg = I18n.err( I18n.ERR_04031, StringTools.dumpBytes( value.getData() ) );
+ String msg = I18n.err( I18n.ERR_04031, Strings.dumpBytes(value.getData()) );
LOG.error( msg );
throw new DecoderException( msg );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationGrammar.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationGrammar.java Thu Jan 20 17:49:48 2011
@@ -31,6 +31,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.i18n.I18n;
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;
@@ -131,7 +132,7 @@ public class CertGenerationGrammar exten
}
else
{
- String msg = I18n.err( I18n.ERR_04033, StringTools.dumpBytes( value.getData() ) );
+ String msg = I18n.err( I18n.ERR_04033, Strings.dumpBytes(value.getData()) );
LOG.error( msg );
throw new DecoderException( msg );
}
@@ -217,7 +218,7 @@ public class CertGenerationGrammar exten
}
else
{
- String msg = I18n.err( I18n.ERR_04033, StringTools.dumpBytes( value.getData() ) );
+ String msg = I18n.err( I18n.ERR_04033, Strings.dumpBytes(value.getData()) );
LOG.error( msg );
throw new DecoderException( msg );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectGrammar.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectGrammar.java Thu Jan 20 17:49:48 2011
@@ -34,7 +34,7 @@ import org.apache.directory.shared.i18n.
import org.apache.directory.shared.ldap.codec.extended.operations.GracefulActionConstants;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.util.LdapURL;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -96,7 +96,7 @@ public final class GracefulDisconnectGra
}
catch ( IntegerDecoderException e )
{
- String msg = I18n.err( I18n.ERR_04036, StringTools.dumpBytes( value.getData() ) );
+ String msg = I18n.err( I18n.ERR_04036, Strings.dumpBytes(value.getData()) );
LOG.error( msg );
throw new DecoderException( msg );
}
@@ -126,7 +126,7 @@ public final class GracefulDisconnectGra
}
catch ( LdapURLEncodingException e )
{
- String msg = "failed to decode the URL '" + StringTools.dumpBytes( value.getData() ) + "'";
+ String msg = "failed to decode the URL '" + Strings.dumpBytes(value.getData()) + "'";
LOG.error( msg );
throw new DecoderException( msg );
}
@@ -157,7 +157,7 @@ public final class GracefulDisconnectGra
}
catch ( IntegerDecoderException e )
{
- String msg = I18n.err( I18n.ERR_04037, StringTools.dumpBytes( value.getData() ) );
+ String msg = I18n.err( I18n.ERR_04037, Strings.dumpBytes(value.getData()) );
LOG.error( msg );
throw new DecoderException( msg );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownGrammar.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownGrammar.java Thu Jan 20 17:49:48 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.extended.operations.GracefulActionConstants;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -131,7 +131,7 @@ public final class GracefulShutdownGramm
}
catch ( IntegerDecoderException e )
{
- String msg = I18n.err( I18n.ERR_04037, StringTools.dumpBytes( value.getData() ) );
+ String msg = I18n.err( I18n.ERR_04037, Strings.dumpBytes(value.getData()) );
LOG.error( msg );
throw new DecoderException( msg );
}
@@ -174,7 +174,7 @@ public final class GracefulShutdownGramm
}
catch ( IntegerDecoderException e )
{
- String msg = I18n.err( I18n.ERR_04036, StringTools.dumpBytes( value.getData() ) );
+ String msg = I18n.err( I18n.ERR_04036, Strings.dumpBytes(value.getData()) );
LOG.error( msg );
throw new DecoderException( msg );
}
@@ -218,7 +218,7 @@ public final class GracefulShutdownGramm
}
catch ( IntegerDecoderException e )
{
- String msg = I18n.err( I18n.ERR_04036, StringTools.dumpBytes( value.getData() ) );
+ String msg = I18n.err( I18n.ERR_04036, Strings.dumpBytes(value.getData()) );
LOG.error( msg );
throw new DecoderException( msg );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedure.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedure.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedure.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedure.java Thu Jan 20 17:49:48 2011
@@ -34,6 +34,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.util.StringTools;
+import org.apache.directory.shared.util.Strings;
/**
@@ -344,7 +345,7 @@ public class StoredProcedure extends Abs
sb.append( " type[" ).append( i ) .append( "] : '" ).
append( StringTools.utf8ToString( spParam.type ) ).append( "'\n" );
sb.append( " value[" ).append( i ) .append( "] : '" ).
- append( StringTools.dumpBytes( spParam.value ) ).append( "'\n" );
+ append( Strings.dumpBytes(spParam.value) ).append( "'\n" );
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureGrammar.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureGrammar.java Thu Jan 20 17:49:48 2011
@@ -32,6 +32,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedure.StoredProcedureParameter;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -228,7 +229,7 @@ public final class StoredProcedureGramma
if ( LOG.isDebugEnabled() )
{
- LOG.debug( "Parameter type found : " + StringTools.dumpBytes( parameterType ) );
+ LOG.debug( "Parameter type found : " + Strings.dumpBytes(parameterType) );
}
}
@@ -275,7 +276,7 @@ public final class StoredProcedureGramma
if ( LOG.isDebugEnabled() )
{
- LOG.debug( "Parameter value found : " + StringTools.dumpBytes( parameterValue ) );
+ LOG.debug( "Parameter value found : " + Strings.dumpBytes(parameterValue) );
}
}
else
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlGrammar.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlGrammar.java Thu Jan 20 17:49:48 2011
@@ -33,6 +33,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
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;
@@ -176,7 +177,7 @@ public final class EntryChangeControlGra
}
catch ( LdapInvalidDnException ine )
{
- LOG.error( I18n.err( I18n.ERR_04047, StringTools.dumpBytes( value.getData() ) ) );
+ LOG.error( I18n.err( I18n.ERR_04047, Strings.dumpBytes(value.getData()) ) );
throw new DecoderException( I18n.err( I18n.ERR_04048 ) );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControl.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControl.java Thu Jan 20 17:49:48 2011
@@ -30,6 +30,7 @@ import org.apache.directory.shared.asn1.
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;
/**
@@ -290,7 +291,7 @@ public class PagedResultsControl extends
sb.append( " oid : " ).append( getOid() ).append( '\n' );
sb.append( " critical : " ).append( isCritical() ).append( '\n' );
sb.append( " size : '" ).append( size ).append( "'\n" );
- sb.append( " cookie : '" ).append( StringTools.dumpBytes( cookie ) ).append( "'\n" );
+ sb.append( " cookie : '" ).append( Strings.dumpBytes(cookie) ).append( "'\n" );
return sb.toString();
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java Thu Jan 20 17:49:48 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.BooleanDecoder;
import org.apache.directory.shared.asn1.ber.tlv.BooleanDecoderException;
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;
@@ -91,7 +91,7 @@ public final class SubentriesControlGram
}
catch ( BooleanDecoderException bde )
{
- LOG.error( I18n.err( I18n.ERR_04054, StringTools.dumpBytes( value.getData() ), bde.getMessage() ) );
+ LOG.error( I18n.err( I18n.ERR_04054, Strings.dumpBytes(value.getData()), bde.getMessage() ) );
// This will generate a PROTOCOL_ERROR
throw new DecoderException( bde.getMessage() );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/BinaryValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/BinaryValue.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/BinaryValue.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/BinaryValue.java Thu Jan 20 17:49:48 2011
@@ -33,6 +33,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.ldap.schema.comparators.ByteArrayComparator;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -811,11 +812,11 @@ public class BinaryValue extends Abstrac
System.arraycopy( wrappedValue, 0, copy, 0, 16 );
- return "'" + StringTools.dumpBytes( copy ) + "...'";
+ return "'" + Strings.dumpBytes(copy) + "...'";
}
else
{
- return "'" + StringTools.dumpBytes( wrappedValue ) + "'";
+ return "'" + Strings.dumpBytes(wrappedValue) + "'";
}
}
}
\ No newline at end of file
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java Thu Jan 20 17:49:48 2011
@@ -35,6 +35,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.ldap.util.UTFUtils;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -1293,7 +1294,7 @@ public class DefaultEntryAttribute imple
catch( LdapException ne )
{
// The value can't be normalized : we don't add it.
- LOG.error( I18n.err( I18n.ERR_04449, StringTools.dumpBytes( val ) ) );
+ LOG.error( I18n.err( I18n.ERR_04449, Strings.dumpBytes(val) ) );
return 0;
}
}
@@ -1304,7 +1305,7 @@ public class DefaultEntryAttribute imple
}
else
{
- LOG.error( I18n.err( I18n.ERR_04486_VALUE_ALREADY_EXISTS, StringTools.dumpBytes( val ), upId ) );
+ LOG.error( I18n.err( I18n.ERR_04486_VALUE_ALREADY_EXISTS, Strings.dumpBytes(val), upId ) );
}
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifControl.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifControl.java Thu Jan 20 17:49:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.codec.controls.AbstractControl;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
/**
@@ -53,6 +53,6 @@ public class LdifControl extends Abstrac
*/
public String toString()
{
- return "LdifControl : {" + getOid() + ", " + isCritical() + ", " + StringTools.dumpBytes( getValue() ) + "}";
+ return "LdifControl : {" + getOid() + ", " + isCritical() + ", " + Strings.dumpBytes(getValue()) + "}";
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java Thu Jan 20 17:49:48 2011
@@ -26,6 +26,7 @@ import org.apache.directory.shared.i18n.
import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
/**
@@ -504,7 +505,7 @@ public class BindRequestImpl extends Abs
if ( isSimple )
{
sb.append( " Simple authentication : '" ).append( StringTools.utf8ToString( credentials ) )
- .append( '/' ).append( StringTools.dumpBytes( credentials ) ).append( "'\n" );
+ .append( '/' ).append( Strings.dumpBytes(credentials) ).append( "'\n" );
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java Thu Jan 20 17:49:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import java.util.Arrays;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
/**
@@ -205,7 +205,7 @@ public class BindResponseImpl extends Ab
if ( serverSaslCreds != null )
{
- sb.append( " Server sasl credentials : '" ).append( StringTools.dumpBytes( serverSaslCreds ) )
+ sb.append( " Server sasl credentials : '" ).append( Strings.dumpBytes(serverSaslCreds) )
.append( "'\n" );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java Thu Jan 20 17:49:48 2011
@@ -26,6 +26,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
/**
@@ -415,7 +416,7 @@ public class CompareRequestImpl extends
else
{
byte[] binVal = attrVal.getBytes();
- sb.append( StringTools.utf8ToString( binVal ) ).append( '/' ).append( StringTools.dumpBytes( binVal ) )
+ sb.append( StringTools.utf8ToString( binVal ) ).append( '/' ).append( Strings.dumpBytes(binVal) )
.append( "'\n" );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java Thu Jan 20 17:49:48 2011
@@ -27,6 +27,7 @@ import javax.naming.ldap.ExtendedRespons
import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
/**
@@ -335,7 +336,7 @@ public class ExtendedRequestImpl extends
if ( oid != null )
{
sb.append( " Request value : '" ).append( StringTools.utf8ToString( requestValue ) ).append( '/' )
- .append( StringTools.dumpBytes( requestValue ) ).append( "'\n" );
+ .append( Strings.dumpBytes(requestValue) ).append( "'\n" );
}
// The controls
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java Thu Jan 20 17:49:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import java.util.Arrays;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
/**
@@ -317,7 +317,7 @@ public class ExtendedResponseImpl extend
if ( responseValue != null )
{
- sb.append( " ResponseValue :'" ).append( StringTools.dumpBytes( responseValue ) ).append( "'\n" );
+ sb.append( " ResponseValue :'" ).append( Strings.dumpBytes(responseValue) ).append( "'\n" );
}
sb.append( super.toString() );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java Thu Jan 20 17:49:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import java.util.Arrays;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
/**
@@ -264,7 +264,7 @@ public class IntermediateResponseImpl ex
if ( responseValue != null )
{
sb.append( " ResponseValue :'" );
- sb.append( StringTools.dumpBytes( responseValue ) );
+ sb.append( Strings.dumpBytes(responseValue) );
sb.append( "'\n" );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ByteArrayComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ByteArrayComparator.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ByteArrayComparator.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ByteArrayComparator.java Thu Jan 20 17:49:48 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.schema.LdapComparator;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,7 +54,7 @@ public class ByteArrayComparator extends
public int compare( byte[] b1, byte[] b2 )
{
LOG.debug( "comparing OctetString objects '{}' with '{}'",
- StringTools.dumpBytes( b1 ), StringTools.dumpBytes( b2 ) );
+ Strings.dumpBytes(b1), Strings.dumpBytes(b2) );
// -------------------------------------------------------------------
// Handle some basis cases