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/22 21:08:59 UTC
svn commit: r1062251 [3/13] - in /directory:
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/
apacheds/trunk/core-api/src/main/java/org/apache/director...
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationDataEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationDataEntry.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationDataEntry.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationDataEntry.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.kerb
import java.util.Arrays;
import org.apache.directory.shared.kerberos.codec.types.AuthorizationType;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.StringConstants;
import org.apache.directory.shared.util.Strings;
/**
@@ -87,9 +87,9 @@ public class AuthorizationDataEntry
*/
public byte[] getAdData()
{
- if ( StringTools.isEmpty( adData ) )
+ if ( Strings.isEmpty(adData) )
{
- return StringTools.EMPTY_BYTES;
+ return StringConstants.EMPTY_BYTES;
}
else
{
@@ -116,9 +116,9 @@ public class AuthorizationDataEntry
*/
public void setAdData( byte[] adData )
{
- if ( StringTools.isEmpty( adData ) )
+ if ( Strings.isEmpty(adData) )
{
- this.adData = StringTools.EMPTY_BYTES;
+ this.adData = StringConstants.EMPTY_BYTES;
}
else
{
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java Sat Jan 22 20:08:48 2011
@@ -31,7 +31,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.Value;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -180,7 +179,7 @@ public class ETypeInfo2Entry extends Abs
// Compute the salt
if ( salt != null )
{
- saltBytes = StringTools.getBytesUtf8( salt );
+ saltBytes = Strings.getBytesUtf8(salt);
saltTagLength = 1 + TLV.getNbBytes( saltBytes.length ) + saltBytes.length;
etypeInfo2EntrySeqLength += 1 + TLV.getNbBytes( saltTagLength ) + saltTagLength;
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java Sat Jan 22 20:08:48 2011
@@ -34,7 +34,6 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.kerberos.flags.TicketFlag;
import org.apache.directory.shared.kerberos.flags.TicketFlags;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -181,7 +180,7 @@ public class EncTicketPart extends Abstr
keyLen = key.computeLength();
encTikcetPartSeqLen += 1 + TLV.getNbBytes( keyLen ) + keyLen;
- cRealmBytes = StringTools.getBytesUtf8( cRealm );
+ cRealmBytes = Strings.getBytesUtf8(cRealm);
cRealmLen = 1 + TLV.getNbBytes( cRealmBytes.length ) + cRealmBytes.length;
encTikcetPartSeqLen += 1 + TLV.getNbBytes( cRealmLen ) + cRealmLen;
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java Sat Jan 22 20:08:48 2011
@@ -33,7 +33,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
import org.apache.directory.shared.asn1.ber.tlv.Value;
import org.apache.directory.shared.kerberos.codec.types.HostAddrType;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -351,7 +350,7 @@ public class HostAddress extends Abstrac
}
catch ( UnknownHostException uhe )
{
- return "Unknow host : " + StringTools.utf8ToString( address );
+ return "Unknow host : " + Strings.utf8ToString(address);
}
}
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java Sat Jan 22 20:08:48 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.messages.KerberosMessage;
import org.apache.directory.shared.kerberos.messages.Ticket;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
/**
* The KDC-REP data structure. It will store the object described by the ASN.1 grammar :
@@ -306,7 +306,7 @@ public class KdcRep extends KerberosMess
}
// The crealm length
- crealmBytes = StringTools.getBytesUtf8( crealm );
+ crealmBytes = Strings.getBytesUtf8(crealm);
crealmLength = 1 + TLV.getNbBytes( crealmBytes.length ) + crealmBytes.length;
kdcRepSeqLength += 1 + TLV.getNbBytes( crealmLength ) + crealmLength;
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java Sat Jan 22 20:08:48 2011
@@ -37,8 +37,8 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.options.KdcOptions;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.messages.Ticket;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import sun.security.krb5.internal.AuthorizationData;
@@ -478,7 +478,7 @@ public class KdcReqBody extends Abstract
}
// Compute the realm length.
- realmBytes = StringTools.getBytesUtf8( realm );
+ realmBytes = Strings.getBytesUtf8(realm);
realmLength = 1 + TLV.getNbBytes( realmBytes.length ) + realmBytes.length;
kdcReqBodySeqLength += 1 + TLV.getNbBytes( realmLength ) + realmLength;
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java Sat Jan 22 20:08:48 2011
@@ -33,7 +33,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.kerberos.flags.TicketFlags;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -177,7 +176,7 @@ public class KrbCredInfo extends Abstrac
if ( pRealm != null )
{
- pRealmBytes = StringTools.getBytesUtf8( pRealm );
+ pRealmBytes = Strings.getBytesUtf8(pRealm);
pRealmLen = 1 + TLV.getNbBytes( pRealmBytes.length ) + pRealmBytes.length;
krbKredInfoSeqLen += 1 + TLV.getNbBytes( pRealmLen ) + pRealmLen;
}
@@ -225,7 +224,7 @@ public class KrbCredInfo extends Abstrac
if ( sRealm != null )
{
- sRealmBytes = StringTools.getBytesUtf8( sRealm );
+ sRealmBytes = Strings.getBytesUtf8(sRealm);
sRealmLen = 1 + TLV.getNbBytes( sRealmBytes.length ) + sRealmBytes.length;
krbKredInfoSeqLen += 1 + TLV.getNbBytes( sRealmLen ) + sRealmLen;
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java Sat Jan 22 20:08:48 2011
@@ -102,7 +102,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.Value;
import org.apache.directory.shared.kerberos.KerberosUtils;
import org.apache.directory.shared.kerberos.codec.types.PrincipalNameType;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.StringConstants;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -339,13 +339,13 @@ public class PrincipalName extends Abstr
{
if ( name != null )
{
- byte[] bytes = StringTools.getBytesUtf8( name );
+ byte[] bytes = Strings.getBytesUtf8(name);
nameBytes.add( bytes );
principalStringsSeqLength += 1 + TLV.getNbBytes( bytes.length ) + bytes.length;
}
else
{
- nameBytes.add( StringTools.EMPTY_BYTES );
+ nameBytes.add( StringConstants.EMPTY_BYTES );
principalStringsSeqLength += 1 + 1;
}
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java Sat Jan 22 20:08:48 2011
@@ -34,7 +34,6 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.Checksum;
import org.apache.directory.shared.kerberos.components.EncryptionKey;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -334,7 +333,7 @@ public class Authenticator extends Kerbe
authenticatorSeqLength = 1 + TLV.getNbBytes( authenticatorVnoLength ) + authenticatorVnoLength;
// Compute the crealm length.
- crealmBytes = StringTools.getBytesUtf8( crealm );
+ crealmBytes = Strings.getBytesUtf8(crealm);
crealmLength = 1 + TLV.getNbBytes( crealmBytes.length ) + crealmBytes.length;
authenticatorSeqLength += 1 + TLV.getNbBytes( crealmLength ) + crealmLength;
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java Sat Jan 22 20:08:48 2011
@@ -33,7 +33,6 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.kerberos.components.PrincipalName;
import org.apache.directory.shared.kerberos.exceptions.ErrorType;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -439,7 +438,7 @@ public class KrbError extends KerberosMe
// The crealm, if any
if ( cRealm != null )
{
- crealmBytes = StringTools.getBytesUtf8( cRealm );
+ crealmBytes = Strings.getBytesUtf8(cRealm);
cRealmLength = 1 + TLV.getNbBytes( crealmBytes.length ) + crealmBytes.length;
krbErrorSeqLength += 1 + TLV.getNbBytes( cRealmLength ) + cRealmLength;
}
@@ -452,7 +451,7 @@ public class KrbError extends KerberosMe
}
// The realm
- realmBytes = StringTools.getBytesUtf8( realm );
+ realmBytes = Strings.getBytesUtf8(realm);
realmLength = 1 + TLV.getNbBytes( realmBytes.length ) + realmBytes.length;
krbErrorSeqLength += 1 + TLV.getNbBytes( realmLength ) + realmLength;
@@ -463,7 +462,7 @@ public class KrbError extends KerberosMe
// The e-text, if any
if ( eText != null )
{
- eTextBytes = StringTools.getBytesUtf8( eText );
+ eTextBytes = Strings.getBytesUtf8(eText);
eTextLength = 1 + TLV.getNbBytes( eTextBytes.length ) + eTextBytes.length;
krbErrorSeqLength += 1 + TLV.getNbBytes( eTextLength ) + eTextLength;
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java Sat Jan 22 20:08:48 2011
@@ -34,7 +34,6 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.EncryptedData;
import org.apache.directory.shared.kerberos.components.PrincipalName;
import org.apache.directory.shared.kerberos.exceptions.InvalidTicketException;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -255,7 +254,7 @@ public class Ticket extends KerberosMess
tktvnoLength = 1 + 1 + Value.getNbBytes( getProtocolVersionNumber() );
// Compute the Ticket realm length.
- realmBytes = StringTools.getBytesUtf8( realm );
+ realmBytes = Strings.getBytesUtf8(realm);
realmLength = 1 + TLV.getNbBytes( realmBytes.length ) + realmBytes.length;
// Compute the principal length
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdIfRelevantDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdIfRelevantDecoderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdIfRelevantDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdIfRelevantDecoderTest.java Sat Jan 22 20:08:48 2011
@@ -35,7 +35,6 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.AuthorizationType;
import org.apache.directory.shared.kerberos.components.AdIfRelevant;
import org.apache.directory.shared.kerberos.components.AuthorizationDataEntry;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
@@ -95,7 +94,7 @@ public class AdIfRelevantDecoderTest
for ( AuthorizationDataEntry ad : adIfRelevant.getAuthorizationData() )
{
assertEquals( AuthorizationType.AD_INTENDED_FOR_SERVER, ad.getAdType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( expected[i++] ), ad.getAdData() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8(expected[i++]), ad.getAdData() ) );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdKdcIssuedDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdKdcIssuedDecoderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdKdcIssuedDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdKdcIssuedDecoderTest.java Sat Jan 22 20:08:48 2011
@@ -44,7 +44,6 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.Checksum;
import org.apache.directory.shared.kerberos.components.PrincipalName;
import org.apache.directory.shared.kerberos.crypto.checksum.ChecksumType;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -123,7 +122,7 @@ public class AdKdcIssuedDecoderTest
Checksum checksum = adKdcIssued.getAdChecksum();
assertEquals( ChecksumType.getTypeByValue( 2 ), checksum.getChecksumType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( "chksum" ), checksum.getChecksumValue() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8("chksum"), checksum.getChecksumValue() ) );
assertEquals( "EXAMPLE.COM", adKdcIssued.getIRealm() );
@@ -144,7 +143,7 @@ public class AdKdcIssuedDecoderTest
for ( AuthorizationDataEntry ad : authData.getAuthorizationData() )
{
assertEquals( AuthorizationType.AD_INTENDED_FOR_SERVER, ad.getAdType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( expected[i++] ), ad.getAdData() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8(expected[i++]), ad.getAdData() ) );
}
@@ -227,7 +226,7 @@ public class AdKdcIssuedDecoderTest
Checksum checksum = adKdcIssued.getAdChecksum();
assertEquals( ChecksumType.getTypeByValue( 2 ), checksum.getChecksumType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( "chksum" ), checksum.getChecksumValue() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8("chksum"), checksum.getChecksumValue() ) );
// The realm
assertNull( adKdcIssued.getIRealm() );
@@ -247,7 +246,7 @@ public class AdKdcIssuedDecoderTest
for ( AuthorizationDataEntry ad : authData.getAuthorizationData() )
{
assertEquals( AuthorizationType.AD_INTENDED_FOR_SERVER, ad.getAdType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( expected[i++] ), ad.getAdData() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8(expected[i++]), ad.getAdData() ) );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdMandatoryForKdcDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdMandatoryForKdcDecoderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdMandatoryForKdcDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdMandatoryForKdcDecoderTest.java Sat Jan 22 20:08:48 2011
@@ -35,7 +35,6 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.AuthorizationType;
import org.apache.directory.shared.kerberos.components.AdMandatoryForKdc;
import org.apache.directory.shared.kerberos.components.AuthorizationDataEntry;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
@@ -95,7 +94,7 @@ public class AdMandatoryForKdcDecoderTes
for ( AuthorizationDataEntry ad : adMandatoryForKdc.getAuthorizationData() )
{
assertEquals( AuthorizationType.AD_INTENDED_FOR_SERVER, ad.getAdType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( expected[i++] ), ad.getAdData() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8(expected[i++]), ad.getAdData() ) );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthorizationDataDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthorizationDataDecoderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthorizationDataDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthorizationDataDecoderTest.java Sat Jan 22 20:08:48 2011
@@ -35,7 +35,6 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.AuthorizationType;
import org.apache.directory.shared.kerberos.components.AuthorizationData;
import org.apache.directory.shared.kerberos.components.AuthorizationDataEntry;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
@@ -95,7 +94,7 @@ public class AuthorizationDataDecoderTes
for ( AuthorizationDataEntry ad : authData.getAuthorizationData() )
{
assertEquals( AuthorizationType.AD_INTENDED_FOR_SERVER, ad.getAdType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( expected[i++] ), ad.getAdData() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8(expected[i++]), ad.getAdData() ) );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ChecksumDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ChecksumDecoderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ChecksumDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ChecksumDecoderTest.java Sat Jan 22 20:08:48 2011
@@ -33,7 +33,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.codec.checksum.ChecksumContainer;
import org.apache.directory.shared.kerberos.components.Checksum;
import org.apache.directory.shared.kerberos.crypto.checksum.ChecksumType;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
@@ -77,7 +76,7 @@ public class ChecksumDecoderTest
Checksum checksum = chkContainer.getChecksum();
assertEquals( ChecksumType.getTypeByValue( 2 ), checksum.getChecksumType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( "chksum" ), checksum.getChecksumValue() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8("chksum"), checksum.getChecksumValue() ) );
ByteBuffer bb = ByteBuffer.allocate( checksum.computeLength() );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfo2EntryDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfo2EntryDecoderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfo2EntryDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfo2EntryDecoderTest.java Sat Jan 22 20:08:48 2011
@@ -34,7 +34,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.codec.etypeInfo2Entry.ETypeInfo2EntryContainer;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.components.ETypeInfo2Entry;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
@@ -86,7 +85,7 @@ public class ETypeInfo2EntryDecoderTest
assertEquals( EncryptionType.DES3_CBC_MD5, etypeInfo2Entry.getEType() );
assertEquals( "abcd", etypeInfo2Entry.getSalt() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( "1234" ), etypeInfo2Entry.getS2kparams() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8("1234"), etypeInfo2Entry.getS2kparams() ) );
ByteBuffer bb = ByteBuffer.allocate( etypeInfo2Entry.computeLength() );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoDecoderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoDecoderTest.java Sat Jan 22 20:08:48 2011
@@ -37,7 +37,6 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.components.ETypeInfo;
import org.apache.directory.shared.kerberos.components.ETypeInfoEntry;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -105,7 +104,7 @@ public class ETypeInfoDecoderTest
for ( ETypeInfoEntry etypeInfoEntry : etypeInfo.getETypeInfoEntries() )
{
assertEquals( EncryptionType.DES3_CBC_MD5, etypeInfoEntry.getEType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( expected[i] ), etypeInfoEntry.getSalt() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8(expected[i]), etypeInfoEntry.getSalt() ) );
i++;
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoEntryDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoEntryDecoderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoEntryDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoEntryDecoderTest.java Sat Jan 22 20:08:48 2011
@@ -34,7 +34,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.codec.etypeInfoEntry.ETypeInfoEntryContainer;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.components.ETypeInfoEntry;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
@@ -83,7 +82,7 @@ public class ETypeInfoEntryDecoderTest
ETypeInfoEntry etypeInforEntry = container.getETypeInfoEntry();
assertEquals( EncryptionType.DES3_CBC_MD5, etypeInforEntry.getEType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( "1234" ), etypeInforEntry.getSalt() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8("1234"), etypeInforEntry.getSalt() ) );
ByteBuffer bb = ByteBuffer.allocate( etypeInforEntry.computeLength() );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDataDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDataDecoderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDataDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDataDecoderTest.java Sat Jan 22 20:08:48 2011
@@ -37,7 +37,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.codec.encryptedData.EncryptedDataContainer;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.components.EncryptedData;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -94,7 +93,7 @@ public class EncryptedDataDecoderTest
assertEquals( EncryptionType.AES256_CTS_HMAC_SHA1_96, encryptedData.getEType() );
assertEquals( 5, encryptedData.getKvno() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( "abcdef" ), encryptedData.getCipher() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8("abcdef"), encryptedData.getCipher() ) );
// Check the encoding
ByteBuffer bb = ByteBuffer.allocate( encryptedData.computeLength() );
@@ -157,7 +156,7 @@ public class EncryptedDataDecoderTest
assertEquals( EncryptionType.AES256_CTS_HMAC_SHA1_96, encryptedData.getEType() );
assertFalse( encryptedData.hasKvno() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( "abcdef" ), encryptedData.getCipher() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8("abcdef"), encryptedData.getCipher() ) );
// Check the encoding
ByteBuffer bb = ByteBuffer.allocate( encryptedData.computeLength() );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptionKeyDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptionKeyDecoderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptionKeyDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptionKeyDecoderTest.java Sat Jan 22 20:08:48 2011
@@ -33,7 +33,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.codec.encryptionKey.EncryptionKeyContainer;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.components.EncryptionKey;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
@@ -79,7 +78,7 @@ public class EncryptionKeyDecoderTest
EncryptionKey encKey = container.getEncryptionKey();
assertEquals( EncryptionType.getTypeByValue( 2 ), encKey.getKeyType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( "keyval" ), encKey.getKeyValue() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8("keyval"), encKey.getKeyValue() ) );
ByteBuffer bb = ByteBuffer.allocate( encKey.computeLength() );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressDecoderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressDecoderTest.java Sat Jan 22 20:08:48 2011
@@ -36,7 +36,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.codec.hostAddress.HostAddressContainer;
import org.apache.directory.shared.kerberos.codec.types.HostAddrType;
import org.apache.directory.shared.kerberos.components.HostAddress;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -90,7 +89,7 @@ public class HostAddressDecoderTest
HostAddress hostAddress = ( ( HostAddressContainer ) hostAddressContainer ).getHostAddress();
assertEquals( HostAddrType.ADDRTYPE_INET, hostAddress.getAddrType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( "192.168.0.1" ), hostAddress.getAddress() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8("192.168.0.1"), hostAddress.getAddress() ) );
// Check the encoding
ByteBuffer bb = ByteBuffer.allocate( hostAddress.computeLength() );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressesDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressesDecoderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressesDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressesDecoderTest.java Sat Jan 22 20:08:48 2011
@@ -38,7 +38,6 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.HostAddrType;
import org.apache.directory.shared.kerberos.components.HostAddress;
import org.apache.directory.shared.kerberos.components.HostAddresses;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -111,7 +110,7 @@ public class HostAddressesDecoderTest
for ( HostAddress hostAddress : hostAddresses.getAddresses() )
{
assertEquals( HostAddrType.ADDRTYPE_INET, hostAddress.getAddrType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( expected[i] ), hostAddress.getAddress() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8(expected[i]), hostAddress.getAddress() ) );
i++;
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java Sat Jan 22 20:08:48 2011
@@ -37,7 +37,6 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.PaDataType;
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;
@@ -105,7 +104,7 @@ public class MethodDataDecoderTest
for ( PaData paData : methodData.getPaDatas() )
{
assertEquals( PaDataType.PA_ENC_TIMESTAMP, paData.getPaDataType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( expected[i] ), paData.getPaDataValue() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8(expected[i]), paData.getPaDataValue() ) );
i++;
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaDataDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaDataDecoderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaDataDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaDataDecoderTest.java Sat Jan 22 20:08:48 2011
@@ -33,7 +33,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.codec.padata.PaDataContainer;
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;
@@ -79,7 +78,7 @@ public class PaDataDecoderTest
PaData checksum = container.getPaData();
assertEquals( PaDataType.getTypeByValue( 2 ), checksum.getPaDataType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( "padata" ), checksum.getPaDataValue() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8("padata"), checksum.getPaDataValue() ) );
ByteBuffer bb = ByteBuffer.allocate( checksum.computeLength() );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java Sat Jan 22 20:08:48 2011
@@ -36,7 +36,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.codec.paEncTimestamp.PaEncTimestampContainer;
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;
@@ -93,7 +92,7 @@ public class PaEncTimestampDecoderTest
assertEquals( EncryptionType.AES256_CTS_HMAC_SHA1_96, paEncTimestamp.getEType() );
assertEquals( 5, paEncTimestamp.getKvno() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( "abcdef" ), paEncTimestamp.getCipher() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8("abcdef"), paEncTimestamp.getCipher() ) );
// Check the encoding
ByteBuffer bb = ByteBuffer.allocate( paEncTimestamp.computeLength() );
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=1062251&r1=1062250&r2=1062251&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 Sat Jan 22 20:08:48 2011
@@ -40,7 +40,6 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.EncryptedData;
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;
@@ -121,7 +120,7 @@ public class TicketDecoderTest
assertNotNull( encryptedData );
assertEquals( EncryptionType.AES256_CTS_HMAC_SHA1_96, encryptedData.getEType() );
assertEquals( 5, encryptedData.getKvno() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( "abcdef" ), encryptedData.getCipher() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8("abcdef"), encryptedData.getCipher() ) );
// Check the encoding
try
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=1062251&r1=1062250&r2=1062251&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 Sat Jan 22 20:08:48 2011
@@ -36,7 +36,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.codec.transitedEncoding.TransitedEncodingContainer;
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;
@@ -90,7 +89,7 @@ public class TransitedEncodingDecoderTes
TransitedEncoding transitedEncoding = ( ( TransitedEncodingContainer ) transitedEncodingContainer ).getTransitedEncoding();
assertEquals( TransitedEncodingType.DOMAIN_X500_COMPRESS, transitedEncoding.getTrType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( "abcdef" ), transitedEncoding.getContents() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8("abcdef"), transitedEncoding.getContents() ) );
// Check the encoding
ByteBuffer bb = ByteBuffer.allocate( transitedEncoding.computeLength() );
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=1062251&r1=1062250&r2=1062251&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 Sat Jan 22 20:08:48 2011
@@ -33,7 +33,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
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;
@@ -93,7 +92,7 @@ public class TypedDataDecoderTest
for ( TypedData.TD td : typedData.getTypedData() )
{
assertEquals( 2, td.getDataType() );
- assertTrue( Arrays.equals( StringTools.getBytesUtf8( expected[i++] ), td.getDataValue() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8(expected[i++]), td.getDataValue() ) );
}
// Check the encoding
Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java Sat Jan 22 20:08:48 2011
@@ -48,9 +48,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.AddResponse;
import org.apache.directory.shared.ldap.message.BindResponse;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.DateUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Sat Jan 22 20:08:48 2011
@@ -50,7 +50,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.ModifyResponse;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.DateUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java Sat Jan 22 20:08:48 2011
@@ -50,7 +50,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.apache.directory.shared.ldap.ldif.LdifUtils;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -387,7 +387,7 @@ public class SingleFileLdifPartition ext
synchronized ( lock )
{
String ldif = LdifUtils.convertEntryToLdif( entry );
- ldifFile.write( StringTools.getBytesUtf8( ldif + "\n" ) );
+ ldifFile.write( Strings.getBytesUtf8(ldif + "\n") );
}
}
Modified: directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java Sat Jan 22 20:08:48 2011
@@ -79,7 +79,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader;
import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
@@ -180,7 +180,7 @@ public class SingleFileLdifPartitionTest
{
// while writing to the file 1 extra newline char will be added
String ldif = LdifUtils.convertEntryToLdif( entry ) + 1;
- byte[] data = StringTools.getBytesUtf8( ldif );
+ byte[] data = Strings.getBytesUtf8(ldif);
return data.length;
}
@@ -433,7 +433,7 @@ public class SingleFileLdifPartitionTest
file.read( entry1Data );
- String ldif = StringTools.utf8ToString( entry1Data );
+ String ldif = Strings.utf8ToString(entry1Data);
LdifEntry ldifEntry = reader.parseLdif( ldif ).get( 0 );
@@ -466,7 +466,7 @@ public class SingleFileLdifPartitionTest
file.read( entry1Data );
- ldif = StringTools.utf8ToString( entry1Data );
+ ldif = Strings.utf8ToString(entry1Data);
ldifEntry = reader.parseLdif( ldif ).get( 0 );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java Sat Jan 22 20:08:48 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.spi.BinaryAttributeDetector;
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;
import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.ssl.SslFilter;
@@ -101,7 +101,7 @@ class LdapProtocolHandler extends Demuxi
}
catch ( Exception e )
{
- if ( StringTools.isEmpty( id ) )
+ if ( Strings.isEmpty(id) )
{
return false;
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Sat Jan 22 20:08:48 2011
@@ -83,7 +83,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.SearchRequest;
import org.apache.directory.shared.ldap.message.UnbindRequest;
import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
import org.apache.mina.core.filterchain.IoFilterChainBuilder;
import org.apache.mina.core.future.WriteFuture;
@@ -323,7 +323,7 @@ public class LdapServer extends Director
@SuppressWarnings("PMD.EmptyCatchBlock")
private void loadKeyStore() throws Exception
{
- if ( StringTools.isEmpty( keystoreFile ) )
+ if ( Strings.isEmpty(keystoreFile) )
{
Provider provider = Security.getProvider( "SUN" );
LOG.debug( "provider = {}", provider );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java Sat Jan 22 20:08:48 2011
@@ -47,7 +47,8 @@ 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.name.DN;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.StringConstants;
+import org.apache.directory.shared.util.Strings;
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( StringConstants.EMPTY_BYTES );
}
try
@@ -449,7 +450,7 @@ public class BindHandler extends LdapReq
String saslMechanism = bindRequest.getSaslMechanism();
// The empty mechanism is also a request for a new Bind session
- if ( StringTools.isEmpty( saslMechanism )
+ if ( Strings.isEmpty(saslMechanism)
|| !ldapSession.getSaslProperty( SaslConstants.SASL_MECH ).equals( saslMechanism ) )
{
sendAuthMethNotSupported( ldapSession, bindRequest );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Sat Jan 22 20:08:48 2011
@@ -72,7 +72,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
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;
@@ -507,7 +507,7 @@ public class SearchHandler extends LdapR
PagedResultsControl.CONTROL_OID );
byte[] cookie = pagedSearchControl.getCookie();
- if ( !StringTools.isEmpty( cookie ) )
+ if ( !Strings.isEmpty(cookie) )
{
// If the cookie is not null, we have to destroy the associated
// cursor stored into the session (if any)
@@ -603,7 +603,7 @@ public class SearchHandler extends LdapR
byte[] cookie = pagedSearchControl.getCookie();
LdapResult ldapResult = req.getResultResponse().getLdapResult();
- if ( StringTools.isEmpty( cookie ) )
+ if ( Strings.isEmpty(cookie) )
{
// This is a new search. We have a special case when the paged size
// is above the server size limit : in this case, we default to a
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java Sat Jan 22 20:08:48 2011
@@ -47,7 +47,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.JndiUtils;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.apache.mina.core.session.IoSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -185,7 +185,7 @@ public abstract class AbstractSaslCallba
// We assume that we have only one password available
byte[] password = userPassword.get().getBytes();
- String strPassword = StringTools.utf8ToString( password );
+ String strPassword = Strings.utf8ToString(password);
passwordCB.setPassword( strPassword.toCharArray() );
}
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java Sat Jan 22 20:08:48 2011
@@ -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.StringConstants;
/**
@@ -61,7 +61,7 @@ public abstract class AbstractSaslServer
*/
public byte[] unwrap( byte[] incoming, int offset, int len ) throws SaslException
{
- return StringTools.EMPTY_BYTES;
+ return StringConstants.EMPTY_BYTES;
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java Sat Jan 22 20:08:48 2011
@@ -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.StringConstants;
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, StringConstants.EMPTY_BYTES );
ldapSession.putSaslProperty( SaslConstants.SASL_AUTHENT_USER, ldapPrincipal );
ldapSession.putSaslProperty( Context.SECURITY_PRINCIPAL, bindDn );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java Sat Jan 22 20:08:48 2011
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
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.Strings;
/**
@@ -187,7 +187,7 @@ public class NtlmSaslServer extends Abst
{
BindOperationContext bindContext = new BindOperationContext( getLdapSession().getCoreSession() );
bindContext.setDn( new DN( user ) );
- bindContext.setCredentials( StringTools.getBytesUtf8( password ) );
+ bindContext.setCredentials( Strings.getBytesUtf8(password) );
getAdminSession().getDirectoryService().getOperationManager().bind( bindContext );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java Sat Jan 22 20:08:48 2011
@@ -31,7 +31,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.BindRequest;
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.StringConstants;
+import org.apache.directory.shared.util.Strings;
import javax.naming.InvalidNameException;
import javax.security.sasl.SaslException;
@@ -114,7 +115,7 @@ public class PlainSaslServer extends Abs
*/
public byte[] evaluateResponse( byte[] initialResponse ) throws SaslException
{
- if ( StringTools.isEmpty( initialResponse ) )
+ if ( Strings.isEmpty(initialResponse) )
{
state = NegotiationState.MECH_RECEIVED;
return null;
@@ -195,7 +196,7 @@ public class PlainSaslServer extends Abs
}
start++;
- String value = StringTools.utf8ToString( initialResponse, start, end - start + 1 );
+ String value = Strings.utf8ToString(initialResponse, start, end - start + 1);
password = PrepareString.normalize( value, PrepareString.StringType.CASE_EXACT_IA5 );
@@ -225,7 +226,7 @@ public class PlainSaslServer extends Abs
}
}
- return StringTools.EMPTY_BYTES;
+ return StringConstants.EMPTY_BYTES;
}
@@ -242,7 +243,7 @@ public class PlainSaslServer extends Abs
{
BindOperationContext bindContext = new BindOperationContext( getLdapSession().getCoreSession() );
bindContext.setDn( new DN( user ) );
- bindContext.setCredentials( StringTools.getBytesUtf8( password ) );
+ bindContext.setCredentials( Strings.getBytesUtf8(password) );
getAdminSession().getDirectoryService().getOperationManager().bind( bindContext );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java Sat Jan 22 20:08:48 2011
@@ -49,7 +49,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.extended.StoredProcedureResponse;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.sp.LdapContextParameter;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
/**
@@ -79,7 +79,7 @@ public class StoredProcedureExtendedOper
{
StoredProcedure spBean = decodeBean( req.getRequestValue() );
- String procedure = StringTools.utf8ToString( spBean.getProcedure() );
+ String procedure = Strings.utf8ToString(spBean.getProcedure());
ClonedServerEntry spUnit = manager.findStoredProcUnit( session.getCoreSession(), procedure );
StoredProcEngine engine = manager.getStoredProcEngineInstance( spUnit );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java Sat Jan 22 20:08:48 2011
@@ -30,7 +30,7 @@ import javax.net.ssl.TrustManager;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
import org.apache.mina.core.filterchain.IoFilterChainBuilder;
import org.apache.mina.filter.ssl.SslFilter;
@@ -60,7 +60,7 @@ public class LdapsInitializer
KeyManagerFactory kmf = KeyManagerFactory.getInstance( algorithm );
- if ( StringTools.isEmpty( certificatePassord ) )
+ if ( Strings.isEmpty(certificatePassord) )
{
kmf.init( ks, null );
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java Sat Jan 22 20:08:48 2011
@@ -86,6 +86,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -301,7 +302,7 @@ public class SyncReplConsumer implements
if ( syncDoneCtrl.getCookie() != null )
{
syncCookie = syncDoneCtrl.getCookie();
- LOG.debug( "assigning cookie from sync done value control: " + StringTools.utf8ToString( syncCookie ) );
+ LOG.debug( "assigning cookie from sync done value control: " + Strings.utf8ToString(syncCookie) );
storeCookie();
}
@@ -345,7 +346,7 @@ public class SyncReplConsumer implements
{
syncCookie = syncStateCtrl.getCookie();
LOG.debug( "assigning the cookie from sync state value control: "
- + StringTools.utf8ToString( syncCookie ) );
+ + Strings.utf8ToString(syncCookie) );
}
SyncStateTypeEnum state = syncStateCtrl.getSyncStateType();
@@ -436,7 +437,7 @@ public class SyncReplConsumer implements
if ( cookie != null )
{
- LOG.debug( "setting the cookie from the sync info: " + StringTools.utf8ToString( cookie ) );
+ LOG.debug( "setting the cookie from the sync info: " + Strings.utf8ToString(cookie) );
syncCookie = cookie;
}
@@ -541,7 +542,7 @@ public class SyncReplConsumer implements
if ( syncCookie != null )
{
- LOG.debug( "searching with searchRequest, cookie '{}'", StringTools.utf8ToString( syncCookie ) );
+ LOG.debug( "searching with searchRequest, cookie '{}'", Strings.utf8ToString(syncCookie) );
syncReq.setCookie( syncCookie );
}
@@ -702,7 +703,7 @@ public class SyncReplConsumer implements
lastSavedCookie = new byte[syncCookie.length];
System.arraycopy( syncCookie, 0, lastSavedCookie, 0, syncCookie.length );
- LOG.debug( "read the cookie from file: " + StringTools.utf8ToString( syncCookie ) );
+ LOG.debug( "read the cookie from file: " + Strings.utf8ToString(syncCookie) );
}
}
else
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java Sat Jan 22 20:08:48 2011
@@ -87,6 +87,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.schema.AttributeType;
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;
@@ -218,7 +219,7 @@ public class SyncReplProvider implements
// cookie is in the format <replicaId>;<Csn value>
byte[] cookieBytes = syncControl.getCookie();
- String cookieString = StringTools.utf8ToString( cookieBytes );
+ String cookieString = Strings.utf8ToString(cookieBytes);
if ( cookieBytes == null )
{
@@ -226,7 +227,7 @@ public class SyncReplProvider implements
}
else
{
- LOG.warn( "search request received with the cookie {}", StringTools.utf8ToString( cookieBytes ) );
+ LOG.warn( "search request received with the cookie {}", Strings.utf8ToString(cookieBytes) );
if ( !isValidCookie( cookieString ) )
{
LOG.error( "received a invalid cookie {} from the consumer with session {}", cookieString, session );
@@ -320,7 +321,7 @@ public class SyncReplProvider implements
String lastSentCsn = sendContentFromLog( session, req, replicaLog );
- byte[] cookie = StringTools.getBytesUtf8( replicaLog.getId() + REPLICA_ID_DELIM + lastSentCsn );
+ byte[] cookie = Strings.getBytesUtf8(replicaLog.getId() + REPLICA_ID_DELIM + lastSentCsn);
if ( refreshNPersist )
{
@@ -410,12 +411,12 @@ public class SyncReplProvider implements
if ( searchDoneResp.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS )
{
replicaLog.setLastSentCsn( contextCsn );
- byte[] cookie = StringTools.getBytesUtf8( replicaLog.getId() + REPLICA_ID_DELIM + contextCsn );
+ byte[] cookie = Strings.getBytesUtf8(replicaLog.getId() + REPLICA_ID_DELIM + contextCsn);
if ( refreshNPersist ) // refreshAndPersist mode
{
contextCsn = sendContentFromLog( session, req, replicaLog );
- cookie = StringTools.getBytesUtf8( replicaLog.getId() + REPLICA_ID_DELIM + contextCsn );
+ cookie = Strings.getBytesUtf8(replicaLog.getId() + REPLICA_ID_DELIM + contextCsn);
IntermediateResponse intermResp = new IntermediateResponseImpl( req.getMessageId() );
intermResp.setResponseName( SyncInfoValueControl.CONTROL_OID );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java Sat Jan 22 20:08:48 2011
@@ -43,6 +43,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.control.replication.SyncModifyDnType;
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.apache.mina.core.future.WriteFuture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -407,7 +408,7 @@ public class SyncReplSearchListener impl
private byte[] getCookie( Entry entry ) throws LdapInvalidAttributeValueException
{
String csn = entry.get( SchemaConstants.ENTRY_CSN_AT ).getString();
- return StringTools.getBytesUtf8( clientMsgLog.getId() + SyncReplProvider.REPLICA_ID_DELIM + csn );
+ return Strings.getBytesUtf8(clientMsgLog.getId() + SyncReplProvider.REPLICA_ID_DELIM + csn);
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java Sat Jan 22 20:08:48 2011
@@ -27,7 +27,7 @@ import org.apache.directory.ldap.client.
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import javax.net.ssl.X509TrustManager;
@@ -178,7 +178,7 @@ public class SyncreplConfiguration
*/
public String getReplUserPassword()
{
- return StringTools.utf8ToString( replUserPassword );
+ return Strings.utf8ToString(replUserPassword);
}
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java Sat Jan 22 20:08:48 2011
@@ -38,7 +38,7 @@ import java.util.regex.Pattern;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
import org.apache.directory.shared.ldap.schemaextractor.impl.ResourceMap;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -306,7 +306,7 @@ public class LdifConfigExtractor
break;
}
- String s = StringTools.utf8ToString( buf, 0, read );
+ String s = Strings.utf8ToString(buf, 0, read);
fw.write( s );
}
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.server.conf
import org.apache.directory.server.config.ConfigurationElement;
import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
/**
@@ -173,7 +173,7 @@ public abstract class AdsBaseBean
sb.append( toString( tabs, "enabled", enabled ) );
- if ( !StringTools.isEmpty( description ) )
+ if ( !Strings.isEmpty(description) )
{
sb.append( tabs ).append( "description : '" ).append( description ).append( "'\n" );
}
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java Sat Jan 22 20:08:48 2011
@@ -92,7 +92,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.ldif.LdifUtils;
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.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
@@ -1256,8 +1256,8 @@ public class AddIT extends AbstractLdapT
assertTrue( res.hasMore() );
Attribute userPasswordAttribute = res.next().getAttributes().get( "userPassword" );
assertEquals( 2, userPasswordAttribute.size() );
- assertTrue( userPasswordAttribute.contains( StringTools.getBytesUtf8( "test" ) ) );
- assertTrue( userPasswordAttribute.contains( StringTools.getBytesUtf8( "ABC" ) ) );
+ assertTrue( userPasswordAttribute.contains( Strings.getBytesUtf8("test") ) );
+ assertTrue( userPasswordAttribute.contains( Strings.getBytesUtf8("ABC") ) );
assertFalse( res.hasMore() );
}