directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1062251 [4/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...
Date Sat, 22 Jan 2011 20:08:59 GMT
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original)
+++ directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Sat Jan 22 20:08:48 2011
@@ -55,7 +55,6 @@ 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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -297,7 +296,7 @@ public class ApacheDS
 
         return  new DN( fileSep + 
                 "=" + 
-                Strings.dumpHexPairs( StringTools.getBytesUtf8( getCanonical( ldif ) ) ) + 
+                Strings.dumpHexPairs( Strings.getBytesUtf8(getCanonical(ldif)) ) +
                 "," + 
                 ServerDNConstants.LDIF_FILES_DN ); 
     }

Modified: directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicaId.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicaId.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicaId.java (original)
+++ directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicaId.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java (original)
+++ directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java Sat Jan 22 20:08:48 2011
@@ -74,7 +74,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.DateUtils;
 import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java (original)
+++ directory/shared/trunk/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java Sat Jan 22 20:08:48 2011
@@ -74,7 +74,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.SearchResultEntry;
 import org.apache.directory.shared.ldap.message.SearchResultReference;
 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;
 
 
@@ -475,7 +475,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/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java Sat Jan 22 20:08:48 2011
@@ -36,8 +36,8 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.i18n.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.Base64;
+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/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java Sat Jan 22 20:08:48 2011
@@ -71,9 +71,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.SearchResultReferenceImpl;
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.util.Base64;
+import org.apache.directory.shared.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;
 
@@ -1306,7 +1306,7 @@ public final class Dsmlv2ResponseGrammar
             {
                 if ( ParserUtils.isBase64BinaryValue( xpp, typeValue ) )
                 {
-                    control.setValue( Base64.decode( nextText.trim().toCharArray() ) );
+                    control.setValue( Base64.decode(nextText.trim().toCharArray()) );
                 }
                 else
                 {
@@ -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/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java Sat Jan 22 20:08:48 2011
@@ -26,7 +26,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.ldap.codec.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/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java Sat Jan 22 20:08:48 2011
@@ -78,7 +78,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.name.RDN;
-import org.apache.directory.shared.ldap.util.Base64;
+import org.apache.directory.shared.util.Base64;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -1855,7 +1855,7 @@ public final class Dsmlv2Grammar extends
 
                 if ( ParserUtils.isBase64BinaryValue( xpp, typeValue ) )
                 {
-                    modifyRequest.addAttributeValue( Base64.decode( nextText.trim().toCharArray() ) );
+                    modifyRequest.addAttributeValue( Base64.decode(nextText.trim().toCharArray()) );
                 }
                 else
                 {

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.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.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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java Sat Jan 22 20:08:48 2011
@@ -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/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Sat Jan 22 20:08:48 2011
@@ -136,7 +136,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.registries.SchemaLoader;
 import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.StringConstants;
+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;
@@ -382,7 +383,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" );
         }
@@ -411,7 +412,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" );
         }
@@ -454,7 +455,7 @@ public class LdapNetworkConnection exten
         config.setLdapPort( port );
 
         // Default to localhost if null
-        if ( StringTools.isEmpty( server ) )
+        if ( Strings.isEmpty(server) )
         {
             config.setLdapHost( "localhost" );
         }
@@ -885,7 +886,7 @@ public class LdapNetworkConnection exten
         LOG.debug( "Anonymous Bind request" );
 
         // Create the BindRequest
-        BindRequest bindRequest = createBindRequest( StringTools.EMPTY, StringTools.EMPTY_BYTES );
+        BindRequest bindRequest = createBindRequest( StringConstants.EMPTY, StringConstants.EMPTY_BYTES );
 
         return bind( bindRequest );
     }
@@ -899,7 +900,7 @@ public class LdapNetworkConnection exten
         LOG.debug( "Anonymous Bind request" );
 
         // Create the BindRequest
-        BindRequest bindRequest = createBindRequest( StringTools.EMPTY, StringTools.EMPTY_BYTES );
+        BindRequest bindRequest = createBindRequest( StringConstants.EMPTY, StringConstants.EMPTY_BYTES );
 
         return bindAsync( bindRequest );
     }
@@ -913,7 +914,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 );
     }
@@ -927,7 +928,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 );
     }
@@ -941,7 +942,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 );
     }
@@ -955,7 +956,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 );
     }
@@ -1093,7 +1094,7 @@ public class LdapNetworkConnection exten
         bindRequest.setName( name );
 
         // Set the credentials
-        if ( StringTools.isEmpty( saslMechanism ) )
+        if ( Strings.isEmpty(saslMechanism) )
         {
             // Simple bind
             bindRequest.setSimple( true );
@@ -1171,7 +1172,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 );
     }
 
 
@@ -1239,7 +1240,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 );
     }
 
 
@@ -1314,7 +1315,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/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/SaslRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/SaslRequest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/SaslRequest.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/SaslRequest.java Sat Jan 22 20:08:48 2011
@@ -26,7 +26,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.StringConstants;
 
 
 /**
@@ -112,7 +112,7 @@ public class SaslRequest
         }
         else
         {
-            return StringTools.EMPTY_BYTES;
+            return StringConstants.EMPTY_BYTES;
         }
     }
 

Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/callback/SaslCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/callback/SaslCallbackHandler.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/callback/SaslCallbackHandler.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/callback/SaslCallbackHandler.java Sat Jan 22 20:08:48 2011
@@ -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 )
             {

Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoader.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoader.java (original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoader.java Sat Jan 22 20:08:48 2011
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.registries.Schema;
 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;
 
@@ -160,7 +160,7 @@ public class JarLdifSchemaLoader extends
     private String getSchemaDirectory( Schema schema )
     {
         return "schema" + SEPARATOR_PATTERN + "ou=schema" + SEPARATOR_PATTERN
-                        + "cn=" + StringTools.lowerCase( schema.getSchemaName() ) + SEPARATOR_PATTERN;
+                        + "cn=" + Strings.lowerCase(schema.getSchemaName()) + SEPARATOR_PATTERN;
     }
 
 

Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/LdifSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/LdifSchemaLoader.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/LdifSchemaLoader.java (original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/LdifSchemaLoader.java Sat Jan 22 20:08:48 2011
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.ldif.LdifReader;
 import org.apache.directory.shared.ldap.schema.registries.AbstractSchemaLoader;
 import org.apache.directory.shared.ldap.schema.registries.Schema;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -243,7 +243,7 @@ public class LdifSchemaLoader extends Ab
      */
     private File getSchemaDirectory( Schema schema )
     {
-        return new File( new File( baseDirectory, SchemaConstants.OU_SCHEMA ), "cn=" + StringTools.lowerCase( schema.getSchemaName() ) );
+        return new File( new File( baseDirectory, SchemaConstants.OU_SCHEMA ), "cn=" + Strings.lowerCase(schema.getSchemaName()) );
     }
 
 

Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java (original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java Sat Jan 22 20:08:48 2011
@@ -57,8 +57,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.registries.DefaultSchema;
 import org.apache.directory.shared.ldap.schema.registries.Registries;
 import org.apache.directory.shared.ldap.schema.registries.Schema;
-import org.apache.directory.shared.ldap.util.Base64;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Base64;
+import org.apache.directory.shared.util.StringConstants;
+import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -183,7 +184,7 @@ public class SchemaEntityFactory impleme
      */
     private Schema getSchema( String schemaName, Registries registries )
     {
-        if ( StringTools.isEmpty( schemaName ) )
+        if ( Strings.isEmpty(schemaName) )
         {
             schemaName = MetaSchemaConstants.SCHEMA_OTHER;
         }
@@ -262,7 +263,7 @@ public class SchemaEntityFactory impleme
         // Try to class load the syntaxChecker
         Class<?> clazz = null;
         SyntaxChecker syntaxChecker = null;
-        String byteCodeStr = StringTools.EMPTY;
+        String byteCodeStr = StringConstants.EMPTY;
 
         if ( byteCode == null )
         {
@@ -272,7 +273,7 @@ public class SchemaEntityFactory impleme
         {
             classLoader.setAttribute( byteCode );
             clazz = classLoader.loadClass( className );
-            byteCodeStr = new String( Base64.encode( byteCode.getBytes() ) );
+            byteCodeStr = new String( Base64.encode(byteCode.getBytes()) );
         }
 
         // Create the syntaxChecker instance
@@ -394,7 +395,7 @@ public class SchemaEntityFactory impleme
         // Try to class load the comparator
         LdapComparator<?> comparator = null;
         Class<?> clazz = null;
-        String byteCodeStr = StringTools.EMPTY;
+        String byteCodeStr = StringConstants.EMPTY;
 
         if ( byteCode == null )
         {
@@ -544,7 +545,7 @@ public class SchemaEntityFactory impleme
         // Try to class load the normalizer
         Class<?> clazz = null;
         Normalizer normalizer = null;
-        String byteCodeStr = StringTools.EMPTY;
+        String byteCodeStr = StringConstants.EMPTY;
 
         if ( byteCode == null )
         {

Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java (original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java Sat Jan 22 20:08:48 2011
@@ -80,7 +80,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.registries.SchemaLoader;
 import org.apache.directory.shared.ldap.schema.registries.SyntaxCheckerRegistry;
 import org.apache.directory.shared.ldap.schemaloader.SchemaEntityFactory;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -258,7 +258,7 @@ public class DefaultSchemaManager implem
     private void deleteSchemaObjects( Schema schema, Registries registries ) throws LdapException
     {
         Map<String, Set<SchemaObjectWrapper>> schemaObjects = registries.getObjectBySchemaName();
-        Set<SchemaObjectWrapper> content = schemaObjects.get( StringTools.toLowerCase( schema.getSchemaName() ) );
+        Set<SchemaObjectWrapper> content = schemaObjects.get( Strings.toLowerCase(schema.getSchemaName()) );
 
         List<SchemaObject> toBeDeleted = new ArrayList<SchemaObject>();
 
@@ -1500,7 +1500,7 @@ public class DefaultSchemaManager implem
      */
     public AttributeType lookupAttributeTypeRegistry( String oid ) throws LdapException
     {
-        return registries.getAttributeTypeRegistry().lookup( StringTools.toLowerCase( oid ).trim() );
+        return registries.getAttributeTypeRegistry().lookup( Strings.toLowerCase(oid).trim() );
     }
 
 
@@ -1511,7 +1511,7 @@ public class DefaultSchemaManager implem
     {
         try
         {
-            return registries.getAttributeTypeRegistry().lookup( StringTools.toLowerCase( oid ).trim() );
+            return registries.getAttributeTypeRegistry().lookup( Strings.toLowerCase(oid).trim() );
         }
         catch ( LdapException lnsae )
         {
@@ -1534,7 +1534,7 @@ public class DefaultSchemaManager implem
      */
     public MatchingRule lookupMatchingRuleRegistry( String oid ) throws LdapException
     {
-        return registries.getMatchingRuleRegistry().lookup( StringTools.toLowerCase( oid ).trim() );
+        return registries.getMatchingRuleRegistry().lookup( Strings.toLowerCase(oid).trim() );
     }
 
 
@@ -1552,7 +1552,7 @@ public class DefaultSchemaManager implem
      */
     public ObjectClass lookupObjectClassRegistry( String oid ) throws LdapException
     {
-        return registries.getObjectClassRegistry().lookup( StringTools.toLowerCase( oid ).trim() );
+        return registries.getObjectClassRegistry().lookup( Strings.toLowerCase(oid).trim() );
     }
 
 
@@ -1561,7 +1561,7 @@ public class DefaultSchemaManager implem
      */
     public LdapSyntax lookupLdapSyntaxRegistry( String oid ) throws LdapException
     {
-        return registries.getLdapSyntaxRegistry().lookup( StringTools.toLowerCase( oid ).trim() );
+        return registries.getLdapSyntaxRegistry().lookup( Strings.toLowerCase(oid).trim() );
     }
 
 
@@ -1624,9 +1624,9 @@ public class DefaultSchemaManager implem
      */
     private String getSchemaName( SchemaObject schemaObject )
     {
-        String schemaName = StringTools.toLowerCase( schemaObject.getSchemaName() );
+        String schemaName = Strings.toLowerCase(schemaObject.getSchemaName());
 
-        if ( StringTools.isEmpty( schemaName ) )
+        if ( Strings.isEmpty(schemaName) )
         {
             return MetaSchemaConstants.SCHEMA_OTHER;
         }
@@ -1773,7 +1773,7 @@ public class DefaultSchemaManager implem
                 {
                     // We have some error : reject the addition and get out
                     String msg = "Cannot add the SchemaObject " + copy.getOid() + " into the registries, "
-                        + "the resulting registries would be inconsistent :" + StringTools.listToString( errors );
+                        + "the resulting registries would be inconsistent :" + Strings.listToString(errors);
                     LOG.info( msg );
 
                     return false;
@@ -1826,7 +1826,7 @@ public class DefaultSchemaManager implem
 
             if ( ( referencing != null ) && !referencing.isEmpty() )
             {
-                String msg = I18n.err( I18n.ERR_11012, schemaObject.getOid(), StringTools.setToString( referencing ) );
+                String msg = I18n.err( I18n.ERR_11012, schemaObject.getOid(), Strings.setToString(referencing) );
 
                 Throwable error = new LdapProtocolErrorException( msg );
                 errors.add( error );
@@ -1883,7 +1883,7 @@ public class DefaultSchemaManager implem
                 {
                     // We have some error : reject the deletion and get out
                     String msg = "Cannot delete the SchemaObject " + schemaObject.getOid() + " from the registries, "
-                        + "the resulting registries would be inconsistent :" + StringTools.listToString( errors );
+                        + "the resulting registries would be inconsistent :" + Strings.listToString(errors);
                     LOG.info( msg );
 
                     return false;

Modified: directory/shared/trunk/ldap/src/checkstyle/suppressions.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/checkstyle/suppressions.xml?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/checkstyle/suppressions.xml (original)
+++ directory/shared/trunk/ldap/src/checkstyle/suppressions.xml Sat Jan 22 20:08:48 2011
@@ -25,7 +25,7 @@
 
 <suppressions>
     <!-- UnixCrypt is from external, no formatting is applied -->
-    <suppress files="org.apache.directory.shared.ldap.util.UnixCrypt" checks="[A-Za-z0-9]" />
+    <suppress files="org.apache.directory.shared.util.UnixCrypt" checks="[A-Za-z0-9]" />
     
     <!-- hashcode() is final in super class -->
     <suppress files="org.apache.directory.shared.ldap.schema.SyntaxChecker" checks="EqualsHashCode" />

Modified: directory/shared/trunk/ldap/src/main/antlr/ACIItem.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/ACIItem.g?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/ACIItem.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/ACIItem.g Sat Jan 22 20:08:48 2011
@@ -42,12 +42,12 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecificationModifier;
-import org.apache.directory.shared.ldap.util.ComponentsMonitor;
-import org.apache.directory.shared.ldap.util.MandatoryAndOptionalComponentsMonitor;
-import org.apache.directory.shared.ldap.util.MandatoryComponentsMonitor;
+import org.apache.directory.shared.util.ComponentsMonitor;
+import org.apache.directory.shared.util.MandatoryAndOptionalComponentsMonitor;
+import org.apache.directory.shared.util.MandatoryComponentsMonitor;
 import org.apache.directory.shared.ldap.util.NamespaceTools;
 import org.apache.directory.shared.ldap.util.NoDuplicateKeysMap;
-import org.apache.directory.shared.ldap.util.OptionalComponentsMonitor;
+import org.apache.directory.shared.util.OptionalComponentsMonitor;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;

Modified: directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g Sat Jan 22 20:08:48 2011
@@ -32,8 +32,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.NotNode;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
-import org.apache.directory.shared.ldap.util.ComponentsMonitor;
-import org.apache.directory.shared.ldap.util.OptionalComponentsMonitor;
+import org.apache.directory.shared.util.ComponentsMonitor;
+import org.apache.directory.shared.util.OptionalComponentsMonitor;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 
 import org.slf4j.Logger;

Modified: directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g Sat Jan 22 20:08:48 2011
@@ -434,7 +434,7 @@ attributeValue [UpAndNormValue value]
 quotestring [UpAndNormValue value] 
     {
         matchedProduction( "quotestring()" );
-        org.apache.directory.shared.ldap.util.ByteBuffer bb = new org.apache.directory.shared.ldap.util.ByteBuffer();
+        org.apache.directory.shared.util.ByteBuffer bb = new org.apache.directory.shared.util.ByteBuffer();
         byte[] bytes;
     }
     :
@@ -445,7 +445,7 @@ quotestring [UpAndNormValue value] 
                 s:~(DQUOTE|ESC|ESCESC|ESCSHARP|HEXPAIR) 
                 {
                     value.rawValue += s.getText();
-                    bb.append( StringTools.getBytesUtf8( s.getText() ) ); 
+                    bb.append( Strings.getBytesUtf8( s.getText() ) );
                 }
             )
             |
@@ -454,7 +454,7 @@ quotestring [UpAndNormValue value] 
         dq2:DQUOTE { value.rawValue += dq2.getText(); }
     )
     {
-        String string = StringTools.utf8ToString( bb.copyOfUsedBytes() );
+        String string = Strings.utf8ToString( bb.copyOfUsedBytes() );
         value.value = string;
     }
     ;
@@ -497,7 +497,7 @@ hexstring [UpAndNormValue value]
 string [UpAndNormValue value]
     {
         matchedProduction( "string()" );
-        org.apache.directory.shared.ldap.util.ByteBuffer bb = new org.apache.directory.shared.ldap.util.ByteBuffer();
+        org.apache.directory.shared.util.ByteBuffer bb = new org.apache.directory.shared.util.ByteBuffer();
         String tmp;
         byte[] bytes;
     }
@@ -507,13 +507,13 @@ string [UpAndNormValue value]
             tmp = lutf1 
             { 
                 value.rawValue += tmp;
-                bb.append( StringTools.getBytesUtf8( tmp ) ); 
+                bb.append( Strings.getBytesUtf8( tmp ) );
             }
             |
             tmp = utfmb 
             {
                 value.rawValue += tmp;
-                bb.append( StringTools.getBytesUtf8( tmp ) );
+                bb.append( Strings.getBytesUtf8( tmp ) );
             }
             |
             bytes = pair [value] { bb.append( bytes ); }
@@ -522,20 +522,20 @@ string [UpAndNormValue value]
             tmp = sutf1
             {
                 value.rawValue += tmp;
-                bb.append( StringTools.getBytesUtf8( tmp ) ); 
+                bb.append( Strings.getBytesUtf8( tmp ) );
             }
             |
             tmp = utfmb 
             {
                 value.rawValue += tmp;
-                bb.append( StringTools.getBytesUtf8( tmp ) ); 
+                bb.append( Strings.getBytesUtf8( tmp ) );
             }
             |
             bytes = pair [value] { bb.append( bytes ); }
         )*
     )
     {
-        String string = StringTools.utf8ToString( bb.copyOfUsedBytes() );
+        String string = Strings.utf8ToString( bb.copyOfUsedBytes() );
         
         // trim trailing space characters manually
         // don't know how to tell antlr that the last char mustn't be a space.
@@ -663,7 +663,7 @@ pair [UpAndNormValue value] returns [byt
         ESCESC 
         { 
             value.rawValue += "\\\\";
-            pair = StringTools.getBytesUtf8( "\\" );
+            pair = Strings.getBytesUtf8( "\\" );
         } 
     )
     |
@@ -671,7 +671,7 @@ pair [UpAndNormValue value] returns [byt
         ESCSHARP 
         { 
             value.rawValue += "\\#";
-            pair = StringTools.getBytesUtf8( "#" );
+            pair = Strings.getBytesUtf8( "#" );
         } 
     )
     |
@@ -680,7 +680,7 @@ pair [UpAndNormValue value] returns [byt
         tmp = special 
         { 
             value.rawValue += "\\" + tmp;
-            pair = StringTools.getBytesUtf8( tmp ); 
+            pair = Strings.getBytesUtf8( tmp );
         }
     )
     |

Modified: directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g Sat Jan 22 20:08:48 2011
@@ -44,8 +44,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecificationModifier;
 import org.apache.directory.shared.ldap.schema.NormalizerMappingResolver;
 import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
-import org.apache.directory.shared.ldap.util.ComponentsMonitor;
-import org.apache.directory.shared.ldap.util.OptionalComponentsMonitor;
+import org.apache.directory.shared.util.ComponentsMonitor;
+import org.apache.directory.shared.util.OptionalComponentsMonitor;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.exception.LdapException;

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java Sat Jan 22 20:08:48 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
 
 
 /**
@@ -191,7 +191,7 @@ public abstract class SchemaElementImpl 
      */
     private String descToLdif() throws LdapException
     {
-        if ( StringTools.isEmpty( description ) )
+        if ( Strings.isEmpty(description) )
         {
             return "";
         }



Mime
View raw message