Use StringTools instead of StringUtils
git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/branches/DN-refactoring@359111 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java
index b36ad8a..7696959 100755
--- a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java
+++ b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapAttributeTypeRegistry.java
@@ -23,8 +23,8 @@
import javax.naming.NamingException;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.schema.AttributeType;
+import org.apache.ldap.common.util.StringTools;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
import org.apache.ldap.server.schema.OidRegistry;
@@ -150,11 +150,11 @@
sb.append( tabs ).append( " By oid : \n" );
- sb.append( tabs ).append( StringUtils.mapToString( byOid, " " ) ) .append( '\n' );
+ sb.append( tabs ).append( StringTools.mapToString( byOid, " " ) ) .append( '\n' );
sb.append( tabs ).append( " Oid to schema : \n" );
- sb.append( tabs ).append( StringUtils.mapToString( oidToSchema, " " ) ) .append( '\n' );
+ sb.append( tabs ).append( StringTools.mapToString( oidToSchema, " " ) ) .append( '\n' );
sb.append( tabs ).append( " OidRegistry :\n" );
diff --git a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java
index c4a46c6..1cd7839 100755
--- a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java
+++ b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapComparatorRegistry.java
@@ -23,7 +23,7 @@
import javax.naming.NamingException;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import org.apache.ldap.server.schema.ComparatorRegistry;
import org.apache.ldap.server.schema.SerializableComparator;
@@ -124,11 +124,11 @@
sb.append( tabs).append( " Comparators : \n" );
- sb.append( tabs).append( StringUtils.mapToString( comparators, " " ) ) .append( '\n' );
+ sb.append( tabs).append( StringTools.mapToString( comparators, " " ) ) .append( '\n' );
sb.append( tabs).append( " By schema : \n" );
- sb.append( tabs).append( StringUtils.mapToString( oidToSchema, " " ) ) .append( '\n' );
+ sb.append( tabs).append( StringTools.mapToString( oidToSchema, " " ) ) .append( '\n' );
sb.append( tabs).append( "}\n" );
diff --git a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java
index 3d11dce..71d0cc5 100755
--- a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java
+++ b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitContentRuleRegistry.java
@@ -23,8 +23,8 @@
import javax.naming.NamingException;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.schema.DITContentRule;
+import org.apache.ldap.common.util.StringTools;
import org.apache.ldap.server.schema.DITContentRuleRegistry;
import org.apache.ldap.server.schema.OidRegistry;
@@ -142,11 +142,11 @@
sb.append( tabs ).append( " By oid : \n" );
- sb.append( tabs ).append( StringUtils.mapToString( byOid, " " ) ) .append( '\n' );
+ sb.append( tabs ).append( StringTools.mapToString( byOid, " " ) ) .append( '\n' );
sb.append( tabs ).append( " Oid to schema : \n" );
- sb.append( tabs ).append( StringUtils.mapToString( oidToSchema, " " ) ) .append( '\n' );
+ sb.append( tabs ).append( StringTools.mapToString( oidToSchema, " " ) ) .append( '\n' );
sb.append( tabs ).append( " OidRegistry :\n" );
diff --git a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java
index 7c2a52c..fe1de8d 100755
--- a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java
+++ b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapDitStructureRuleRegistry.java
@@ -23,8 +23,8 @@
import javax.naming.NamingException;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.schema.DITStructureRule;
+import org.apache.ldap.common.util.StringTools;
import org.apache.ldap.server.schema.DITStructureRuleRegistry;
import org.apache.ldap.server.schema.OidRegistry;
@@ -145,11 +145,11 @@
sb.append( tabs ).append( " By oid : \n" );
- sb.append( tabs ).append( StringUtils.mapToString( byOid, " " ) ) .append( '\n' );
+ sb.append( tabs ).append( StringTools.mapToString( byOid, " " ) ) .append( '\n' );
sb.append( tabs ).append( " Oid to schema : \n" );
- sb.append( tabs ).append( StringUtils.mapToString( oidToSchema, " " ) ) .append( '\n' );
+ sb.append( tabs ).append( StringTools.mapToString( oidToSchema, " " ) ) .append( '\n' );
sb.append( tabs ).append( " OidRegistry :\n" );
diff --git a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java
index 1785dfc..908527f 100644
--- a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java
+++ b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleRegistry.java
@@ -23,8 +23,8 @@
import javax.naming.NamingException;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.schema.MatchingRule;
+import org.apache.ldap.common.util.StringTools;
import org.apache.ldap.server.schema.MatchingRuleRegistry;
import org.apache.ldap.server.schema.OidRegistry;
@@ -160,11 +160,11 @@
sb.append( tabs ).append( " By oid : \n" );
- sb.append( tabs ).append( StringUtils.mapToString( byOid, " " ) ) .append( '\n' );
+ sb.append( tabs ).append( StringTools.mapToString( byOid, " " ) ) .append( '\n' );
sb.append( tabs ).append( " Oid to schema : \n" );
- sb.append( tabs ).append( StringUtils.mapToString( oidToSchema, " " ) ) .append( '\n' );
+ sb.append( tabs ).append( StringTools.mapToString( oidToSchema, " " ) ) .append( '\n' );
sb.append( tabs ).append( " OidRegistry :\n" );
diff --git a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java
index 2e457a0..5e1635a 100755
--- a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java
+++ b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java
@@ -23,8 +23,8 @@
import javax.naming.NamingException;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.schema.MatchingRuleUse;
+import org.apache.ldap.common.util.StringTools;
import org.apache.ldap.server.schema.MatchingRuleUseRegistry;
@@ -126,11 +126,11 @@
sb.append( tabs).append( " By name : \n" );
- sb.append( tabs).append( StringUtils.mapToString( byName, " " ) ) .append( '\n' );
+ sb.append( tabs).append( StringTools.mapToString( byName, " " ) ) .append( '\n' );
sb.append( tabs).append( " Name to schema : \n" );
- sb.append( tabs).append( StringUtils.mapToString( nameToSchema, " " ) ) .append( '\n' );
+ sb.append( tabs).append( StringTools.mapToString( nameToSchema, " " ) ) .append( '\n' );
sb.append( tabs).append( "}\n" );
diff --git a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java
index 2bf36ef..c22ac1b 100755
--- a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java
+++ b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNameFormRegistry.java
@@ -23,8 +23,8 @@
import javax.naming.NamingException;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.schema.NameForm;
+import org.apache.ldap.common.util.StringTools;
import org.apache.ldap.server.schema.NameFormRegistry;
import org.apache.ldap.server.schema.OidRegistry;
@@ -144,11 +144,11 @@
sb.append( tabs ).append( " By oid : \n" );
- sb.append( tabs ).append( StringUtils.mapToString( byOid, " " ) ) .append( '\n' );
+ sb.append( tabs ).append( StringTools.mapToString( byOid, " " ) ) .append( '\n' );
sb.append( tabs ).append( " Oid to schema : \n" );
- sb.append( tabs ).append( StringUtils.mapToString( oidToSchema, " " ) ) .append( '\n' );
+ sb.append( tabs ).append( StringTools.mapToString( oidToSchema, " " ) ) .append( '\n' );
sb.append( tabs ).append( " OidRegistry :\n" );
diff --git a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java
index f120fcd..cbb94a8 100755
--- a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java
+++ b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapNormalizerRegistry.java
@@ -22,9 +22,9 @@
import javax.naming.NamingException;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.asn1new.primitives.OID;
import org.apache.ldap.common.schema.Normalizer;
+import org.apache.ldap.common.util.StringTools;
import org.apache.ldap.server.schema.NormalizerRegistry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -131,11 +131,11 @@
sb.append( tabs ).append( " By oid : \n" );
- sb.append( StringUtils.mapToString( byOid, tabs + " " ) ) .append( '\n' );
+ sb.append( StringTools.mapToString( byOid, tabs + " " ) ) .append( '\n' );
sb.append( tabs ).append( " By schema : \n" );
- sb.append( StringUtils.mapToString( oidToSchema, tabs + " " ) ) .append( '\n' );
+ sb.append( StringTools.mapToString( oidToSchema, tabs + " " ) ) .append( '\n' );
sb.append( tabs ).append( "}\n" );
diff --git a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java
index e398f43..3aef8e4 100755
--- a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java
+++ b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectClassRegistry.java
@@ -23,8 +23,8 @@
import javax.naming.NamingException;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.schema.ObjectClass;
+import org.apache.ldap.common.util.StringTools;
import org.apache.ldap.server.schema.ObjectClassRegistry;
import org.apache.ldap.server.schema.OidRegistry;
@@ -144,11 +144,11 @@
sb.append( tabs ).append( " By oid : \n" );
- sb.append( tabs ).append( StringUtils.mapToString( byOid, " " ) ) .append( '\n' );
+ sb.append( tabs ).append( StringTools.mapToString( byOid, " " ) ) .append( '\n' );
sb.append( tabs ).append( " Oid to schema : \n" );
- sb.append( tabs ).append( StringUtils.mapToString( oidToSchema, " " ) ) .append( '\n' );
+ sb.append( tabs ).append( StringTools.mapToString( oidToSchema, " " ) ) .append( '\n' );
sb.append( tabs ).append( " OidRegistry :\n" );
diff --git a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectFactoryRegistry.java b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectFactoryRegistry.java
index 31c0370..763653e 100644
--- a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectFactoryRegistry.java
+++ b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapObjectFactoryRegistry.java
@@ -23,7 +23,7 @@
import javax.naming.directory.Attribute;
import javax.naming.ldap.LdapContext;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import org.apache.ldap.server.jndi.ServerDirObjectFactory;
import org.apache.ldap.server.schema.ObjectFactoryRegistry;
import org.apache.ldap.server.schema.OidRegistry;
@@ -112,7 +112,7 @@
sb.append( tabs ).append( " By oid : \n" );
- sb.append( tabs ).append( StringUtils.mapToString( byOid, " " ) ) .append( '\n' );
+ sb.append( tabs ).append( StringTools.mapToString( byOid, " " ) ) .append( '\n' );
sb.append( tabs ).append( " OidRegistry :\n" );
