You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/22 21:08:59 UTC
svn commit: r1062251 [7/13] - in /directory:
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/
apacheds/trunk/core-api/src/main/java/org/apache/director...
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/AbstractSchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/AbstractSchemaParser.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/AbstractSchemaParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/AbstractSchemaParser.java Sat Jan 22 20:08:48 2011
@@ -26,8 +26,7 @@ import java.util.List;
import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
import org.apache.directory.shared.ldap.schema.SchemaObject;
-import org.apache.directory.shared.ldap.util.StringTools;
-
+import org.apache.directory.shared.util.Strings;
/**
@@ -135,7 +134,7 @@ public abstract class AbstractSchemaPars
{
String schemaName = schemaExtension.get( 0 );
- if ( StringTools.isEmpty( schemaName ) )
+ if ( Strings.isEmpty(schemaName) )
{
schemaObject.setSchemaName( MetaSchemaConstants.SCHEMA_OTHER );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AbstractSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AbstractSchemaLoader.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AbstractSchemaLoader.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AbstractSchemaLoader.java Sat Jan 22 20:08:48 2011
@@ -34,7 +34,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.StringConstants;
+import org.apache.directory.shared.util.Strings;
/**
@@ -65,7 +66,7 @@ public abstract class AbstractSchemaLoad
@Override
public Schema put( String key, Schema value )
{
- return super.put( StringTools.lowerCase( key ), value );
+ return super.put( Strings.lowerCase(key), value );
}
@Override
@@ -140,7 +141,7 @@ public abstract class AbstractSchemaLoad
*/
public Schema getSchema( String schemaName )
{
- return schemaMap.get( StringTools.toLowerCase( schemaName ) );
+ return schemaMap.get( Strings.toLowerCase(schemaName) );
}
@@ -158,7 +159,7 @@ public abstract class AbstractSchemaLoad
*/
public void removeSchema( Schema schema )
{
- schemaMap.remove( StringTools.toLowerCase ( schema.getSchemaName() ) );
+ schemaMap.remove( Strings.toLowerCase(schema.getSchemaName()) );
}
@@ -195,7 +196,7 @@ public abstract class AbstractSchemaLoad
String name;
String owner;
- String[] dependencies = StringTools.EMPTY_STRINGS;
+ String[] dependencies = StringConstants.EMPTY_STRINGS;
boolean isDisabled = false;
if ( entry.get( SchemaConstants.CN_AT ) == null )
@@ -230,7 +231,7 @@ public abstract class AbstractSchemaLoad
depsSet.add( value.getString() );
}
- dependencies = depsSet.toArray( StringTools.EMPTY_STRINGS );
+ dependencies = depsSet.toArray( StringConstants.EMPTY_STRINGS );
}
return new DefaultSchema( name, owner, dependencies, isDisabled )
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchema.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchema.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchema.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchema.java Sat Jan 22 20:08:48 2011
@@ -26,8 +26,7 @@ import java.util.Set;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.schema.SchemaObjectWrapper;
-import org.apache.directory.shared.ldap.util.StringTools;
-
+import org.apache.directory.shared.util.StringConstants;
/**
@@ -124,7 +123,7 @@ public class DefaultSchema implements Sc
}
else
{
- this.dependencies = StringTools.EMPTY_STRINGS;
+ this.dependencies = StringConstants.EMPTY_STRINGS;
}
this.disabled = disabled;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java Sat Jan 22 20:08:48 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.schema.LoadableSchemaObject;
import org.apache.directory.shared.ldap.schema.SchemaObject;
import org.apache.directory.shared.ldap.schema.SchemaObjectType;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -78,7 +78,7 @@ public abstract class DefaultSchemaObjec
{
if ( !byName.containsKey( oid ) )
{
- return byName.containsKey( StringTools.toLowerCase( oid ) );
+ return byName.containsKey( Strings.toLowerCase(oid) );
}
return true;
@@ -165,7 +165,7 @@ public abstract class DefaultSchemaObjec
if ( schemaObject == null )
{
// let's try with trimming and lowercasing now
- schemaObject = byName.get( StringTools.trim( StringTools.toLowerCase( oid ) ) );
+ schemaObject = byName.get( Strings.trim(Strings.toLowerCase(oid)) );
}
if ( schemaObject == null )
@@ -206,7 +206,7 @@ public abstract class DefaultSchemaObjec
*/
for ( String name : schemaObject.getNames() )
{
- String lowerName = StringTools.trim( StringTools.toLowerCase( name ) );
+ String lowerName = Strings.trim(Strings.toLowerCase(name));
if ( byName.containsKey( lowerName ) )
{
@@ -284,7 +284,7 @@ public abstract class DefaultSchemaObjec
*/
for ( String name : schemaObject.getNames() )
{
- byName.remove( StringTools.trim( StringTools.toLowerCase( name ) ) );
+ byName.remove( Strings.trim(Strings.toLowerCase(name)) );
}
// And unregister the oid -> schemaObject relation
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/Registries.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/Registries.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/Registries.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/Registries.java Sat Jan 22 20:08:48 2011
@@ -50,7 +50,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.schema.SchemaObject;
import org.apache.directory.shared.ldap.schema.SchemaObjectWrapper;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -419,7 +419,7 @@ public class Registries implements Schem
*/
public Schema getLoadedSchema( String schemaName )
{
- return loadedSchemas.get( StringTools.toLowerCase( schemaName ) );
+ return loadedSchemas.get( Strings.toLowerCase(schemaName) );
}
@@ -431,7 +431,7 @@ public class Registries implements Schem
*/
public boolean isSchemaLoaded( String schemaName )
{
- return loadedSchemas.containsKey( StringTools.toLowerCase( schemaName ) );
+ return loadedSchemas.containsKey( Strings.toLowerCase(schemaName) );
}
@@ -1424,7 +1424,7 @@ public class Registries implements Schem
*/
public void schemaLoaded( Schema schema )
{
- this.loadedSchemas.put( StringTools.toLowerCase( schema.getSchemaName() ), schema );
+ this.loadedSchemas.put( Strings.toLowerCase(schema.getSchemaName()), schema );
}
@@ -1436,7 +1436,7 @@ public class Registries implements Schem
*/
public void schemaUnloaded( Schema schema )
{
- this.loadedSchemas.remove( StringTools.toLowerCase( schema.getSchemaName() ) );
+ this.loadedSchemas.remove( Strings.toLowerCase(schema.getSchemaName()) );
}
@@ -1466,7 +1466,7 @@ public class Registries implements Schem
*/
private String getSchemaName( SchemaObject schemaObject )
{
- String schemaName = StringTools.toLowerCase( schemaObject.getSchemaName() );
+ String schemaName = Strings.toLowerCase(schemaObject.getSchemaName());
if ( loadedSchemas.containsKey( schemaName ) )
{
@@ -1632,7 +1632,7 @@ public class Registries implements Schem
if ( content == null )
{
content = new HashSet<SchemaObjectWrapper>();
- schemaObjects.put( StringTools.toLowerCase( schemaName ), content );
+ schemaObjects.put( Strings.toLowerCase(schemaName), content );
}
SchemaObjectWrapper schemaObjectWrapper = new SchemaObjectWrapper( schemaObject );
@@ -1825,7 +1825,7 @@ public class Registries implements Schem
public void dissociateFromSchema( SchemaObject schemaObject ) throws LdapException
{
// And unregister the schemaObject within its schema
- Set<SchemaObjectWrapper> content = schemaObjects.get( StringTools.toLowerCase( schemaObject.getSchemaName() ) );
+ Set<SchemaObjectWrapper> content = schemaObjects.get( Strings.toLowerCase(schemaObject.getSchemaName()) );
if ( content != null )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ACIItemSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ACIItemSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ACIItemSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ACIItemSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -25,7 +25,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -75,7 +75,7 @@ public class ACIItemSyntaxChecker extend
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -25,7 +25,7 @@ import java.text.ParseException;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -111,7 +111,7 @@ public class AttributeTypeDescriptionSyn
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/AttributeTypeUsageSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/AttributeTypeUsageSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/AttributeTypeUsageSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/AttributeTypeUsageSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -75,7 +75,7 @@ public class AttributeTypeUsageSyntaxChe
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/BitStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/BitStringSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/BitStringSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/BitStringSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Chars;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,13 +86,13 @@ public class BitStringSyntaxChecker exte
}
// We must have at least one bit
- if ( ! StringTools.isBit( strValue, pos++ ) )
+ if ( ! Chars.isBit(strValue, pos++) )
{
LOG.debug( "Syntax invalid for '{}'", strValue );
return false;
}
- while ( StringTools.isBit( strValue, pos ) )
+ while ( Chars.isBit(strValue, pos) )
{
// Loop until we get a char which is not a 0 or a 1
pos++;
@@ -135,7 +135,7 @@ public class BitStringSyntaxChecker exte
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/BooleanSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/BooleanSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/BooleanSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/BooleanSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,7 +73,7 @@ public class BooleanSyntaxChecker extend
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/CountrySyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/CountrySyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/CountrySyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/CountrySyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -25,7 +25,7 @@ import java.util.Set;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -122,7 +122,7 @@ public class CountrySyntaxChecker extend
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
@@ -135,7 +135,7 @@ public class CountrySyntaxChecker extend
return false;
}
- boolean result = COUNTRIES.contains( StringTools.toUpperCase( strValue ) );
+ boolean result = COUNTRIES.contains( Strings.toUpperCase(strValue) );
if ( result )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DITContentRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DITContentRuleDescriptionSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DITContentRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DITContentRuleDescriptionSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -25,7 +25,7 @@ import java.text.ParseException;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.ldap.schema.parsers.DITContentRuleDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -89,7 +89,7 @@ public class DITContentRuleDescriptionSy
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DITStructureRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DITStructureRuleDescriptionSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DITStructureRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DITStructureRuleDescriptionSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -25,7 +25,7 @@ import java.text.ParseException;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.ldap.schema.parsers.DITStructureRuleDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -91,7 +91,7 @@ public class DITStructureRuleDescription
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DNSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DNSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DNSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DNSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,7 +70,7 @@ public class DNSyntaxChecker extends Syn
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DSAQualitySyntaxSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DSAQualitySyntaxSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DSAQualitySyntaxSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DSAQualitySyntaxSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -77,7 +77,7 @@ public class DSAQualitySyntaxSyntaxCheck
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
@@ -165,7 +165,7 @@ public class DSAQualitySyntaxSyntaxCheck
}
// Check that the description is a PrintableString
- boolean result = StringTools.isPrintableString( remaining.substring( 1 ) );
+ boolean result = Strings.isPrintableString(remaining.substring(1));
if ( result )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DSETypeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DSETypeSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DSETypeSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DSETypeSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -25,7 +25,8 @@ import java.util.Set;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Chars;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -103,7 +104,7 @@ public class DSETypeSyntaxChecker extend
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
@@ -141,7 +142,7 @@ public class DSETypeSyntaxChecker extend
int pos = i;
// Search for a keyword
- while ( ( i < len ) && StringTools.isAlphaASCII( strValue, pos ) )
+ while ( ( i < len ) && Chars.isAlphaASCII(strValue, pos) )
{
pos++;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DeliveryMethodSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DeliveryMethodSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DeliveryMethodSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DeliveryMethodSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -25,7 +25,7 @@ import java.util.Set;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Chars;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -101,7 +101,7 @@ public class DeliveryMethodSyntaxChecker
{
int pos = start;
- while ( StringTools.isAlphaDigit( strValue, pos ) )
+ while ( Chars.isAlphaDigit(strValue, pos) )
{
pos++;
}
@@ -154,7 +154,7 @@ public class DeliveryMethodSyntaxChecker
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DirectoryStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DirectoryStringSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DirectoryStringSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DirectoryStringSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,7 +71,7 @@ public class DirectoryStringSyntaxChecke
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/FacsimileTelephoneNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/FacsimileTelephoneNumberSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/FacsimileTelephoneNumberSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/FacsimileTelephoneNumberSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -24,7 +24,7 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -111,7 +111,7 @@ public class FacsimileTelephoneNumberSyn
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/GeneralizedTimeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/GeneralizedTimeSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/GeneralizedTimeSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/GeneralizedTimeSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -24,7 +24,7 @@ import java.util.regex.Pattern;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -120,7 +120,7 @@ public class GeneralizedTimeSyntaxChecke
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/Ia5StringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/Ia5StringSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/Ia5StringSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/Ia5StringSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,14 +71,14 @@ public class Ia5StringSyntaxChecker exte
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
strValue = value.toString();
}
- boolean result = StringTools.isIA5String( strValue );
+ boolean result = Strings.isIA5String(strValue);
if ( result )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/IntegerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/IntegerSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/IntegerSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/IntegerSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Chars;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,7 +80,7 @@ public class IntegerSyntaxChecker extend
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
@@ -102,7 +102,7 @@ public class IntegerSyntaxChecker extend
{
pos = 1;
}
- else if ( !StringTools.isDigit( c ) )
+ else if ( !Chars.isDigit(c) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -122,7 +122,7 @@ public class IntegerSyntaxChecker extend
}
// We must have at least a digit which is not '0'
- if ( !StringTools.isDigit( strValue, pos ) )
+ if ( !Chars.isDigit(strValue, pos) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -137,7 +137,7 @@ public class IntegerSyntaxChecker extend
pos++;
}
- while ( StringTools.isDigit( strValue, pos) )
+ while ( Chars.isDigit(strValue, pos) )
{
pos++;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/JavaByteSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/JavaByteSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/JavaByteSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/JavaByteSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Chars;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,7 +80,7 @@ public class JavaByteSyntaxChecker exten
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
@@ -102,7 +102,7 @@ public class JavaByteSyntaxChecker exten
{
pos = 1;
}
- else if ( !StringTools.isDigit( c ) )
+ else if ( !Chars.isDigit(c) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -122,7 +122,7 @@ public class JavaByteSyntaxChecker exten
}
// We must have at least a digit which is not '0'
- if ( !StringTools.isDigit( strValue, pos ) )
+ if ( !Chars.isDigit(strValue, pos) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -137,7 +137,7 @@ public class JavaByteSyntaxChecker exten
pos++;
}
- while ( StringTools.isDigit( strValue, pos) )
+ while ( Chars.isDigit(strValue, pos) )
{
pos++;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/JavaIntegerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/JavaIntegerSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/JavaIntegerSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/JavaIntegerSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Chars;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -81,7 +81,7 @@ public class JavaIntegerSyntaxChecker ex
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
@@ -103,7 +103,7 @@ public class JavaIntegerSyntaxChecker ex
{
pos = 1;
}
- else if ( !StringTools.isDigit( c ) )
+ else if ( !Chars.isDigit(c) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -125,7 +125,7 @@ public class JavaIntegerSyntaxChecker ex
}
// We must have at least a digit which is not '0'
- if ( !StringTools.isDigit( strValue, pos ) )
+ if ( !Chars.isDigit(strValue, pos) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -140,7 +140,7 @@ public class JavaIntegerSyntaxChecker ex
pos++;
}
- while ( StringTools.isDigit( strValue, pos) )
+ while ( Chars.isDigit(strValue, pos) )
{
pos++;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/JavaLongSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/JavaLongSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/JavaLongSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/JavaLongSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Chars;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,7 +80,7 @@ public class JavaLongSyntaxChecker exten
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
@@ -102,7 +102,7 @@ public class JavaLongSyntaxChecker exten
{
pos = 1;
}
- else if ( !StringTools.isDigit( c ) )
+ else if ( !Chars.isDigit(c) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -122,7 +122,7 @@ public class JavaLongSyntaxChecker exten
}
// We must have at least a digit which is not '0'
- if ( !StringTools.isDigit( strValue, pos ) )
+ if ( !Chars.isDigit(strValue, pos) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -137,7 +137,7 @@ public class JavaLongSyntaxChecker exten
pos++;
}
- while ( StringTools.isDigit( strValue, pos) )
+ while ( Chars.isDigit(strValue, pos) )
{
pos++;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/JavaShortSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/JavaShortSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/JavaShortSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/JavaShortSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Chars;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,7 +80,7 @@ public class JavaShortSyntaxChecker exte
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
@@ -102,7 +102,7 @@ public class JavaShortSyntaxChecker exte
{
pos = 1;
}
- else if ( !StringTools.isDigit( c ) )
+ else if ( !Chars.isDigit(c) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -122,7 +122,7 @@ public class JavaShortSyntaxChecker exte
}
// We must have at least a digit which is not '0'
- if ( !StringTools.isDigit( strValue, pos ) )
+ if ( !Chars.isDigit(strValue, pos) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -137,7 +137,7 @@ public class JavaShortSyntaxChecker exte
pos++;
}
- while ( StringTools.isDigit( strValue, pos) )
+ while ( Chars.isDigit(strValue, pos) )
{
pos++;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -25,7 +25,7 @@ import java.text.ParseException;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -84,7 +84,7 @@ public class LdapSyntaxDescriptionSyntax
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/MailPreferenceSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/MailPreferenceSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/MailPreferenceSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/MailPreferenceSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -85,7 +85,7 @@ public class MailPreferenceSyntaxChecker
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -25,7 +25,7 @@ import java.text.ParseException;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -92,7 +92,7 @@ public class MatchingRuleDescriptionSynt
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -25,7 +25,7 @@ import java.text.ParseException;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleUseDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -89,7 +89,7 @@ public class MatchingRuleUseDescriptionS
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -78,7 +78,7 @@ public class NameAndOptionalUIDSyntaxChe
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -25,7 +25,7 @@ import java.text.ParseException;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.ldap.schema.parsers.NameFormDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -90,7 +90,7 @@ public class NameFormDescriptionSyntaxCh
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumberSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumberSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumberSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,7 +74,7 @@ public class NumberSyntaxChecker extends
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericOidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericOidSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericOidSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericOidSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -24,7 +24,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.asn1.util.OID;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,7 +80,7 @@ public class NumericOidSyntaxChecker ext
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericStringSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericStringSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericStringSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -78,7 +78,7 @@ public class NumericStringSyntaxChecker
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -25,7 +25,7 @@ import java.text.ParseException;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -93,7 +93,7 @@ public class ObjectClassDescriptionSynta
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ObjectClassTypeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ObjectClassTypeSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ObjectClassTypeSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ObjectClassTypeSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,7 +69,7 @@ public class ObjectClassTypeSyntaxChecke
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ObjectNameSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ObjectNameSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ObjectNameSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ObjectNameSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -25,7 +25,7 @@ import java.util.regex.Pattern;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,7 +86,7 @@ public class ObjectNameSyntaxChecker ext
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidLenSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidLenSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidLenSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidLenSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.asn1.util.OID;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -85,7 +85,7 @@ public class OidLenSyntaxChecker extends
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -23,7 +23,8 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.asn1.util.OID;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Chars;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -85,7 +86,7 @@ public class OidSyntaxChecker extends Sy
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
@@ -100,7 +101,7 @@ public class OidSyntaxChecker extends Sy
// if the first character is a digit it's an attempt at an OID and must be
// checked to make sure there are no other chars except '.' and digits.
- if ( StringTools.isDigit( strValue.charAt( 0 ) ) )
+ if ( Chars.isDigit(strValue.charAt(0)) )
{
if ( ! OID.isOID(strValue) )
{
@@ -116,11 +117,11 @@ public class OidSyntaxChecker extends Sy
// here we just need to make sure that we have the right characters in the
// string and that it starts with a letter.
- if ( StringTools.isAlphaASCII( strValue, 0 ) )
+ if ( Chars.isAlphaASCII(strValue, 0) )
{
for ( int index = 0; index < strValue.length(); index++ )
{
- if ( ! StringTools.isAlphaDigitMinus( strValue, index ))
+ if ( ! Chars.isAlphaDigitMinus(strValue, index))
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OtherMailboxSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OtherMailboxSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OtherMailboxSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OtherMailboxSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,7 +73,7 @@ public class OtherMailboxSyntaxChecker e
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
@@ -109,14 +109,14 @@ public class OtherMailboxSyntaxChecker e
}
// Check that the mailboxType is a PrintableString
- if ( !StringTools.isPrintableString( mailboxType ) )
+ if ( !Strings.isPrintableString(mailboxType) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
// Check that the mailbox is an IA5String
- boolean result = ( StringTools.isIA5String( mailbox ) );
+ boolean result = ( Strings.isIA5String(mailbox) );
if ( result )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/PostalAddressSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/PostalAddressSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/PostalAddressSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/PostalAddressSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -72,7 +72,7 @@ public class PostalAddressSyntaxChecker
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
@@ -101,7 +101,7 @@ public class PostalAddressSyntaxChecker
// check that the element between each '$' is not empty
String address = strValue.substring( pos, dollar );
- if ( StringTools.isEmpty( address ) )
+ if ( Strings.isEmpty(address) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/PrintableStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/PrintableStringSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/PrintableStringSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/PrintableStringSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -93,7 +93,7 @@ public class PrintableStringSyntaxChecke
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
@@ -113,7 +113,7 @@ public class PrintableStringSyntaxChecke
return false;
}
- boolean result = StringTools.isPrintableString( strValue );
+ boolean result = Strings.isPrintableString(strValue);
if ( result )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -25,7 +25,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.ldap.subtree.SubtreeSpecificationChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -76,7 +76,7 @@ public class SubtreeSpecificationSyntaxC
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -27,7 +27,7 @@ import java.util.regex.PatternSyntaxExce
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -148,7 +148,7 @@ public class TelephoneNumberSyntaxChecke
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -77,7 +77,7 @@ public class TeletexTerminalIdentifierSy
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
@@ -102,7 +102,7 @@ public class TeletexTerminalIdentifierSy
return false;
}
- if ( !StringTools.isPrintableString( terminalIdentifier ) )
+ if ( !Strings.isPrintableString(terminalIdentifier) )
{
// It's not a valid PrintableString
LOG.debug( "Syntax invalid for '{}'", value );
@@ -152,7 +152,7 @@ public class TeletexTerminalIdentifierSy
boolean hasEsc = false;
- for ( byte b:StringTools.getBytesUtf8( ttxParam ) )
+ for ( byte b: Strings.getBytesUtf8(ttxParam) )
{
switch ( b )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/TelexNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/TelexNumberSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/TelexNumberSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/TelexNumberSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,7 +74,7 @@ public class TelexNumberSyntaxChecker ex
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
@@ -108,7 +108,7 @@ public class TelexNumberSyntaxChecker ex
}
// The actual number should be a PrintableString
- if ( ! StringTools.isPrintableString( actualNumber ) )
+ if ( ! Strings.isPrintableString(actualNumber) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -135,7 +135,7 @@ public class TelexNumberSyntaxChecker ex
}
// The country Code should be a PrintableString
- if ( ! StringTools.isPrintableString( countryCode ) )
+ if ( ! Strings.isPrintableString(countryCode) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -152,14 +152,14 @@ public class TelexNumberSyntaxChecker ex
String answerBack = strValue.substring( dollar2 + 1 );
// The answerBack should be a PrintableString
- if ( ! StringTools.isPrintableString( answerBack ) )
+ if ( ! Strings.isPrintableString(answerBack) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
// Check that the mailboxType is a PrintableString
- boolean result = StringTools.isPrintableString( answerBack );
+ boolean result = Strings.isPrintableString(answerBack);
if ( result )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/UtcTimeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/UtcTimeSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/UtcTimeSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/UtcTimeSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -24,7 +24,7 @@ import java.util.regex.Pattern;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -114,7 +114,7 @@ public class UtcTimeSyntaxChecker extend
}
else if ( value instanceof byte[] )
{
- strValue = StringTools.utf8ToString( ( byte[] ) value );
+ strValue = Strings.utf8ToString((byte[]) value);
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/UuidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/UuidSyntaxChecker.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/UuidSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/UuidSyntaxChecker.java Sat Jan 22 20:08:48 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Chars;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +44,7 @@ public class UuidSyntaxChecker extends S
// Tells if the byte is alphanumeric
private static boolean isHex( byte b )
{
- return StringTools.isHex( b );
+ return Chars.isHex(b);
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/AdministrativeRole.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/AdministrativeRole.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/AdministrativeRole.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/AdministrativeRole.java Sat Jan 22 20:08:48 2011
@@ -19,7 +19,7 @@
*/
package org.apache.directory.shared.ldap.subtree;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
/**
* The Administrative roles
@@ -60,7 +60,7 @@ public enum AdministrativeRole
*/
private AdministrativeRole( String role )
{
- this.role = StringTools.toLowerCase( StringTools.trim( role ) );
+ this.role = Strings.toLowerCase(Strings.trim(role));
}