directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1051130 [3/7] - in /directory: apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/ apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/entry/ apacheds/branches/...
Date Mon, 20 Dec 2010 14:31:36 GMT
Modified: directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Mon Dec 20 14:31:29 2010
@@ -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/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java Mon Dec 20 14:31:29 2010
@@ -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/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java Mon Dec 20 14:31:29 2010
@@ -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/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java Mon Dec 20 14:31:29 2010
@@ -31,8 +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.CharConstants;
+import org.apache.directory.shared.util.Strings;
 
 import javax.naming.InvalidNameException;
 import javax.security.sasl.SaslException;
@@ -115,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;
@@ -196,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 );
                 
@@ -243,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/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java Mon Dec 20 14:31:29 2010
@@ -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/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java Mon Dec 20 14:31:29 2010
@@ -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/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java Mon Dec 20 14:31:29 2010
@@ -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/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java Mon Dec 20 14:31:29 2010
@@ -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/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java Mon Dec 20 14:31:29 2010
@@ -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/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java Mon Dec 20 14:31:29 2010
@@ -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/branches/alex_refactoring/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java (original)
+++ directory/apacheds/branches/alex_refactoring/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java Mon Dec 20 14:31:29 2010
@@ -38,7 +38,7 @@ import java.util.regex.Pattern;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.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/branches/alex_refactoring/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java (original)
+++ directory/apacheds/branches/alex_refactoring/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java Mon Dec 20 14:31:29 2010
@@ -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/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java (original)
+++ directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java Mon Dec 20 14:31:29 2010
@@ -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() );
     }
 

Modified: directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java (original)
+++ directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java Mon Dec 20 14:31:29 2010
@@ -47,7 +47,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControl;
 import org.apache.directory.shared.ldap.message.control.Control;
 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.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -295,7 +295,7 @@ public class PagedSearchIT extends Abstr
             // check if this is over
             byte[] cookie = responseControl.getCookie();
             
-            if ( StringTools.isEmpty( cookie ) )
+            if ( Strings.isEmpty(cookie) )
             {
                 // If so, exit the loop
                 break;
@@ -1047,7 +1047,7 @@ public class PagedSearchIT extends Abstr
             // check if this is over
             byte[] cookie = responseControl.getCookie();
             
-            if ( StringTools.isEmpty( cookie ) )
+            if ( Strings.isEmpty(cookie) )
             {
                 // If so, exit the loop
                 break;
@@ -1103,7 +1103,7 @@ public class PagedSearchIT extends Abstr
             // check if this is over
             byte[] cookie = responseControl.getCookie();
             
-            if ( StringTools.isEmpty( cookie ) )
+            if ( Strings.isEmpty(cookie) )
             {
                 // If so, exit the loop
                 break;

Modified: directory/apacheds/branches/alex_refactoring/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original)
+++ directory/apacheds/branches/alex_refactoring/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Mon Dec 20 14:31:29 2010
@@ -56,6 +56,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.registries.SchemaLoader;
 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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -296,7 +297,7 @@ public class ApacheDS
 
         return  new DN( fileSep + 
                 "=" + 
-                StringTools.dumpHexPairs( StringTools.getBytesUtf8( getCanonical( ldif ) ) ) + 
+                StringTools.dumpHexPairs( Strings.getBytesUtf8(getCanonical(ldif)) ) +
                 "," + 
                 ServerDNConstants.LDIF_FILES_DN ); 
     }

Modified: directory/apacheds/branches/alex_refactoring/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicaId.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicaId.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicaId.java (original)
+++ directory/apacheds/branches/alex_refactoring/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicaId.java Mon Dec 20 14:31:29 2010
@@ -24,7 +24,7 @@ import java.io.Serializable;
 import java.util.regex.Pattern;
 
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
 
 
 /**
@@ -62,7 +62,7 @@ public class ReplicaId implements Compar
      */
     public ReplicaId( String id )
     {
-        if ( StringTools.isEmpty( id ) )
+        if ( Strings.isEmpty(id) )
         {
             throw new IllegalArgumentException( I18n.err( I18n.ERR_694, id ) );
         }

Modified: directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Mon Dec 20 14:31:29 2010
@@ -53,7 +53,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 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;
 
@@ -1499,7 +1499,7 @@ public abstract class AbstractStore<E, I
         }
         while ( !parentId.equals( getRootId() ) );
 
-        DN dn = new DN( upName, normName, StringTools.getBytesUtf8( normName ), rdnList );
+        DN dn = new DN( upName, normName, Strings.getBytesUtf8(normName), rdnList );
 
         return dn;
     }

Modified: directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java (original)
+++ directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java Mon Dec 20 14:31:29 2010
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.comparators.ByteArrayComparator;
 import org.apache.directory.shared.ldap.schema.comparators.StringComparator;
 import org.apache.directory.shared.ldap.schema.normalizers.NoOpNormalizer;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
 
 
 /**
@@ -206,7 +206,7 @@ public class EqualityEvaluator<T, ID ext
 
                 if ( node.getValue().isBinary() )
                 {
-                    nodeValue = StringTools.utf8ToString( ( ( Value<byte[]> ) node.getValue() ).getNormalizedValue() );
+                    nodeValue = Strings.utf8ToString(((Value<byte[]>) node.getValue()).getNormalizedValue());
                 }
                 else
                 {

Modified: directory/shared/branches/alex_refactoring/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java Mon Dec 20 14:31:29 2010
@@ -53,7 +53,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.*;
 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.xmlpull.v1.XmlPullParserException;
 
 
@@ -454,7 +454,7 @@ public class Dsmlv2Engine
     {
         BindRequest bindRequest = new BindRequestImpl();
         bindRequest.setSimple( true );
-        bindRequest.setCredentials( StringTools.getBytesUtf8( password ) );
+        bindRequest.setCredentials( Strings.getBytesUtf8(password) );
         bindRequest.setName( new DN( user ) );
         bindRequest.setVersion3( true );
         bindRequest.setMessageId( messageId );

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java Mon Dec 20 14:31:29 2010
@@ -37,7 +37,7 @@ import org.apache.directory.shared.i18n.
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.Base64;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.Namespace;
@@ -167,7 +167,7 @@ public final class ParserUtils
         }
         else if ( value instanceof String )
         {
-            return new String( Base64.encode( StringTools.getBytesUtf8( ( String ) value ) ) );
+            return new String( Base64.encode( Strings.getBytesUtf8((String) value) ) );
         }
 
         return "";

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java Mon Dec 20 14:31:29 2010
@@ -73,7 +73,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.Base64;
 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.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -1847,7 +1847,7 @@ public final class Dsmlv2ResponseGrammar
                 }
                 else
                 {
-                    extendedResponse.setResponseValue( StringTools.getBytesUtf8( nextText.trim() ) );
+                    extendedResponse.setResponseValue( Strings.getBytesUtf8(nextText.trim()) );
                 }
             }
             catch ( IOException e )

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java Mon Dec 20 14:31:29 2010
@@ -26,7 +26,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.ExtendedResponse;
 import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
 import org.dom4j.Element;
 import org.dom4j.Namespace;
 import org.dom4j.QName;
@@ -107,7 +107,7 @@ public class ExtendedResponseDsml extend
             }
             else
             {
-                element.addElement( "response" ).addText( StringTools.utf8ToString( (byte[])response ) );
+                element.addElement( "response" ).addText( Strings.utf8ToString((byte[]) response) );
             }
         }
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java Mon Dec 20 14:31:29 2010
@@ -32,7 +32,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
 import org.apache.directory.shared.ldap.message.AbandonRequest;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -148,7 +148,7 @@ public class AbandonRequestTest extends 
         assertEquals( 1, abandonRequest.getControls().size() );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -180,7 +180,7 @@ public class AbandonRequestTest extends 
         assertEquals( 1, abandonRequest.getControls().size() );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -244,7 +244,7 @@ public class AbandonRequestTest extends 
         assertEquals( 2, abandonRequest.getControls().size() );
         assertFalse( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java Mon Dec 20 14:31:29 2010
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.message.AddRequest;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -154,7 +154,7 @@ public class AddRequestTest extends Abst
 
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
 
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -185,7 +185,7 @@ public class AddRequestTest extends Abst
         assertEquals( 1, addRequest.getControls().size() );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -246,7 +246,7 @@ public class AddRequestTest extends Abst
         assertEquals( 2, addRequest.getControls().size() );
         assertFalse( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java Mon Dec 20 14:31:29 2010
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.control.Control;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -121,7 +121,7 @@ public class AddResponseTest extends Abs
 
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
 
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -186,7 +186,7 @@ public class AddResponseTest extends Abs
 
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
 
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java Mon Dec 20 14:31:29 2010
@@ -32,7 +32,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
 import org.apache.directory.shared.ldap.message.BindRequest;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -146,7 +146,7 @@ public class AuthRequestTest extends Abs
         assertEquals( 1, abandonRequest.getControls().size() );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -177,7 +177,7 @@ public class AuthRequestTest extends Abs
         assertEquals( 1, abandonRequest.getControls().size() );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -238,7 +238,7 @@ public class AuthRequestTest extends Abs
         assertEquals( 2, abandonRequest.getControls().size() );
         assertFalse( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java Mon Dec 20 14:31:29 2010
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.control.Control;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -121,7 +121,7 @@ public class AuthResponseTest extends Ab
 
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
 
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -187,7 +187,7 @@ public class AuthResponseTest extends Ab
 
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
 
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java Mon Dec 20 14:31:29 2010
@@ -33,7 +33,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
 import org.apache.directory.shared.ldap.message.CompareRequest;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -152,7 +152,7 @@ public class CompareRequestTest extends 
 
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
 
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -187,7 +187,7 @@ public class CompareRequestTest extends 
 
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
 
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -257,7 +257,7 @@ public class CompareRequestTest extends 
 
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
 
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java Mon Dec 20 14:31:29 2010
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.control.Control;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -122,7 +122,7 @@ public class CompareResponseTest extends
 
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
 
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -188,7 +188,7 @@ public class CompareResponseTest extends
 
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
 
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java Mon Dec 20 14:31:29 2010
@@ -32,7 +32,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
 import org.apache.directory.shared.ldap.message.DeleteRequest;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -145,7 +145,7 @@ public class DelRequestTest extends Abst
         assertEquals( 1, delRequest.getControls().size() );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -176,7 +176,7 @@ public class DelRequestTest extends Abst
         assertEquals( 1, delRequest.getControls().size() );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -237,7 +237,7 @@ public class DelRequestTest extends Abst
         assertEquals( 2, delRequest.getControls().size() );
         assertFalse( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java Mon Dec 20 14:31:29 2010
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.control.Control;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -121,7 +121,7 @@ public class DelResponseTest extends Abs
 
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
 
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -186,7 +186,7 @@ public class DelResponseTest extends Abs
 
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
 
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java Mon Dec 20 14:31:29 2010
@@ -33,7 +33,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
 import org.apache.directory.shared.ldap.message.ExtendedRequest;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -111,7 +111,7 @@ public class ExtendedRequestTest extends
         assertEquals( 1, extendedRequest.getControls().size() );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -142,7 +142,7 @@ public class ExtendedRequestTest extends
         assertEquals( 1, extendedRequest.getControls().size() );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -204,7 +204,7 @@ public class ExtendedRequestTest extends
         assertEquals( 2, extendedRequest.getControls().size() );
         assertFalse( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java Mon Dec 20 14:31:29 2010
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.control.Control;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -124,7 +124,7 @@ public class ExtendedResponseTest extend
 
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
 
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -190,7 +190,7 @@ public class ExtendedResponseTest extend
 
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
 
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -630,7 +630,7 @@ public class ExtendedResponseTest extend
 
         ExtendedResponse extendedResponse = ( ExtendedResponse ) parser.getBatchResponse().getCurrentResponse();
 
-        assertEquals( "This is a response", StringTools.utf8ToString( extendedResponse.getResponseValue() ) );
+        assertEquals( "This is a response", Strings.utf8ToString(extendedResponse.getResponseValue()) );
     }
 
 
@@ -684,7 +684,7 @@ public class ExtendedResponseTest extend
 
         ExtendedResponse extendedResponse = ( ExtendedResponse ) parser.getBatchResponse().getCurrentResponse();
 
-        assertEquals( "", StringTools.utf8ToString( extendedResponse.getResponseValue() ) );
+        assertEquals( "", Strings.utf8ToString(extendedResponse.getResponseValue()) );
     }
 
 
@@ -712,7 +712,7 @@ public class ExtendedResponseTest extend
         org.apache.directory.shared.ldap.message.ExtendedResponse extendedResponse = ( ExtendedResponse ) parser
             .getBatchResponse().getCurrentResponse();
 
-        assertEquals( "This is a response", StringTools.utf8ToString( extendedResponse.getResponseValue() ) );
+        assertEquals( "This is a response", Strings.utf8ToString(extendedResponse.getResponseValue()) );
 
         try
         {

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java Mon Dec 20 14:31:29 2010
@@ -32,7 +32,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
 import org.apache.directory.shared.ldap.message.ModifyDnRequest;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -110,7 +110,7 @@ public class ModifyDNRequestTest extends
         assertEquals( 1, modifyDNRequest.getControls().size() );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -141,7 +141,7 @@ public class ModifyDNRequestTest extends
         assertEquals( 1, modifyDNRequest.getControls().size() );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -203,7 +203,7 @@ public class ModifyDNRequestTest extends
         assertEquals( 2, modifyDNRequest.getControls().size() );
         assertFalse( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java Mon Dec 20 14:31:29 2010
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.control.Control;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -122,7 +122,7 @@ public class ModifyDNResponseTest extend
 
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
 
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -188,7 +188,7 @@ public class ModifyDNResponseTest extend
 
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
 
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java Mon Dec 20 14:31:29 2010
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.message.ModifyRequest;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -118,7 +118,7 @@ public class ModifyRequestTest extends A
         assertEquals( 1, modifyRequest.getControls().size() );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -149,7 +149,7 @@ public class ModifyRequestTest extends A
         assertEquals( 1, modifyRequest.getControls().size() );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -211,7 +211,7 @@ public class ModifyRequestTest extends A
         assertEquals( 2, modifyRequest.getControls().size() );
         assertFalse( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java Mon Dec 20 14:31:29 2010
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.control.Control;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -122,7 +122,7 @@ public class ModifyResponseTest extends 
 
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
 
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -188,7 +188,7 @@ public class ModifyResponseTest extends 
 
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
 
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java Mon Dec 20 14:31:29 2010
@@ -50,7 +50,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.SearchRequest;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -164,7 +164,7 @@ public class SearchRequestTest extends A
         assertEquals( 1, searchRequest.getControls().size() );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -195,7 +195,7 @@ public class SearchRequestTest extends A
         assertEquals( 1, searchRequest.getControls().size() );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -257,7 +257,7 @@ public class SearchRequestTest extends A
         assertEquals( 2, searchRequest.getControls().size() );
         assertFalse( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java Mon Dec 20 14:31:29 2010
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.SearchResultDone;
 import org.apache.directory.shared.ldap.message.control.Control;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -86,7 +86,7 @@ public class SearchResultDoneTest extend
 
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
 
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -154,7 +154,7 @@ public class SearchResultDoneTest extend
 
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
 
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java Mon Dec 20 14:31:29 2010
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.message.SearchResultEntry;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -85,7 +85,7 @@ public class SearchResultEntryTest exten
 
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
 
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -153,7 +153,7 @@ public class SearchResultEntryTest exten
 
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
 
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java Mon Dec 20 14:31:29 2010
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.SearchResultReference;
 import org.apache.directory.shared.ldap.message.control.Control;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -83,7 +83,7 @@ public class SearchResultReferenceTest e
 
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
 
-        assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 
@@ -155,7 +155,7 @@ public class SearchResultReferenceTest e
 
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
 
-        assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Mon Dec 20 14:31:29 2010
@@ -138,6 +138,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.registries.SchemaLoader;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.shared.util.CharConstants;
+import org.apache.directory.shared.util.Strings;
 import org.apache.mina.core.filterchain.IoFilter;
 import org.apache.mina.core.future.CloseFuture;
 import org.apache.mina.core.future.ConnectFuture;
@@ -383,7 +384,7 @@ public class LdapNetworkConnection exten
         config.setLdapPort( config.getDefaultLdapPort() );
 
         // Default to localhost if null
-        if ( StringTools.isEmpty( server ) )
+        if ( Strings.isEmpty(server) )
         {
             config.setLdapHost( "localhost" );
         }
@@ -412,7 +413,7 @@ public class LdapNetworkConnection exten
         config.setLdapPort( useSsl ? config.getDefaultLdapsPort() : config.getDefaultLdapPort() );
 
         // Default to localhost if null
-        if ( StringTools.isEmpty( server ) )
+        if ( Strings.isEmpty(server) )
         {
             config.setLdapHost( "localhost" );
         }
@@ -455,7 +456,7 @@ public class LdapNetworkConnection exten
         config.setLdapPort( port );
 
         // Default to localhost if null
-        if ( StringTools.isEmpty( server ) )
+        if ( Strings.isEmpty(server) )
         {
             config.setLdapHost( "localhost" );
         }
@@ -914,7 +915,7 @@ public class LdapNetworkConnection exten
         LOG.debug( "Bind request : {}", name );
 
         // Create the BindRequest
-        BindRequest bindRequest = createBindRequest( name, StringTools.getBytesUtf8( credentials ) );
+        BindRequest bindRequest = createBindRequest( name, Strings.getBytesUtf8(credentials) );
 
         return bind( bindRequest );
     }
@@ -928,7 +929,7 @@ public class LdapNetworkConnection exten
         LOG.debug( "Bind request : {}", name );
 
         // Create the BindRequest
-        BindRequest bindRequest = createBindRequest( name, StringTools.getBytesUtf8( credentials ) );
+        BindRequest bindRequest = createBindRequest( name, Strings.getBytesUtf8(credentials) );
 
         return bindAsync( bindRequest );
     }
@@ -942,7 +943,7 @@ public class LdapNetworkConnection exten
         LOG.debug( "Bind request : {}", name );
 
         // Create the BindRequest
-        BindRequest bindRequest = createBindRequest( name, StringTools.getBytesUtf8( credentials ), null );
+        BindRequest bindRequest = createBindRequest( name, Strings.getBytesUtf8(credentials), null );
 
         return bind( bindRequest );
     }
@@ -956,7 +957,7 @@ public class LdapNetworkConnection exten
         LOG.debug( "Bind request : {}", name );
 
         // Create the BindRequest
-        BindRequest bindRequest = createBindRequest( name, StringTools.getBytesUtf8( credentials ) );
+        BindRequest bindRequest = createBindRequest( name, Strings.getBytesUtf8(credentials) );
 
         return bindAsync( bindRequest );
     }
@@ -1094,7 +1095,7 @@ public class LdapNetworkConnection exten
         bindRequest.setName( name );
 
         // Set the credentials
-        if ( StringTools.isEmpty( saslMechanism ) )
+        if ( Strings.isEmpty(saslMechanism) )
         {
             // Simple bind
             bindRequest.setSimple( true );
@@ -1172,7 +1173,7 @@ public class LdapNetworkConnection exten
     public BindResponse bindCramMd5( String name, String credentials, String authzId )
         throws LdapException, IOException
     {
-        return bindCramMd5( name, StringTools.getBytesUtf8( credentials ), authzId );
+        return bindCramMd5( name, Strings.getBytesUtf8(credentials), authzId );
     }
 
 
@@ -1240,7 +1241,7 @@ public class LdapNetworkConnection exten
     public BindResponse bindDigestMd5( String name, String credentials, String authzId, String realmName )
         throws LdapException, IOException
     {
-        return bindDigestMd5( name, StringTools.getBytesUtf8( credentials ), authzId, realmName );
+        return bindDigestMd5( name, Strings.getBytesUtf8(credentials), authzId, realmName );
     }
 
 
@@ -1315,7 +1316,7 @@ public class LdapNetworkConnection exten
         Control... ctrls )
         throws LdapException, IOException
     {
-        return bindGssApi( name, StringTools.getBytesUtf8( credentials ), realmName, kdcHost, kdcPort, ctrls );
+        return bindGssApi( name, Strings.getBytesUtf8(credentials), realmName, kdcHost, kdcPort, ctrls );
     }
 
 

Modified: directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/callback/SaslCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/callback/SaslCallbackHandler.java?rev=1051130&r1=1051129&r2=1051130&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/callback/SaslCallbackHandler.java (original)
+++ directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/callback/SaslCallbackHandler.java Mon Dec 20 14:31:29 2010
@@ -31,7 +31,7 @@ import javax.security.auth.callback.Unsu
 import javax.security.sasl.RealmCallback;
 
 import org.apache.directory.ldap.client.api.SaslRequest;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -82,7 +82,7 @@ public class SaslCallbackHandler impleme
                 PasswordCallback pcb = ( PasswordCallback ) cb;
 
                 LOG.debug( "sending credentials in the PasswordCallback" );
-                pcb.setPassword( StringTools.utf8ToString( saslReq.getCredentials() ).toCharArray() );
+                pcb.setPassword( Strings.utf8ToString(saslReq.getCredentials()).toCharArray() );
             }
             else if ( cb instanceof RealmCallback )
             {



Mime
View raw message