diff --git a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapStateFactoryRegistry.java b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapStateFactoryRegistry.java
index 98f8451..7412b61 100644
--- a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapStateFactoryRegistry.java
+++ b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapStateFactoryRegistry.java
@@ -21,7 +21,7 @@
 
 import javax.naming.NamingException;
 
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
 import org.apache.ldap.server.jndi.ServerDirStateFactory;
 import org.apache.ldap.server.schema.StateFactoryRegistry;
 
@@ -89,7 +89,7 @@
     	
     	sb.append( tabs ).append(  "  By class : \n" );
     	
-    	sb.append( tabs ).append(  StringUtils.mapToString( byClass, "    " ) ) .append( '\n' );
+    	sb.append( tabs ).append(  StringTools.mapToString( byClass, "    " ) ) .append( '\n' );
     	
     	sb.append( tabs ).append(  "}\n" );
 
diff --git a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java
index 6175907..2eae4e4 100755
--- a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java
+++ b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java
@@ -22,8 +22,8 @@
 
 import javax.naming.NamingException;
 
-import org.apache.asn1.codec.util.StringUtils;
 import org.apache.ldap.common.schema.SyntaxChecker;
+import org.apache.ldap.common.util.StringTools;
 import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
 
 
@@ -123,11 +123,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( "}\n" );
     	
diff --git a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java
index eb412b3..6ddd485 100644
--- a/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java
+++ b/core/src/main/java/org/apache/ldap/server/schema/bootstrap/BootstrapSyntaxRegistry.java
@@ -23,8 +23,8 @@
 
 import javax.naming.NamingException;
 
-import org.apache.asn1.codec.util.StringUtils;
 import org.apache.ldap.common.schema.Syntax;
+import org.apache.ldap.common.util.StringTools;
 import org.apache.ldap.server.schema.OidRegistry;
 import org.apache.ldap.server.schema.SyntaxRegistry;
 
@@ -153,11 +153,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" );
     	
