You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2005/12/27 00:40:42 UTC
svn commit: r359132 - in
/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server:
DefaultDirectoryService.java jndi/ServerContext.java
partition/DefaultDirectoryPartitionNexus.java schema/SchemaService.java
Author: elecharny
Date: Mon Dec 26 15:40:34 2005
New Revision: 359132
URL: http://svn.apache.org/viewcvs?rev=359132&view=rev
Log:
Use StringTools instead of StringUtils
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java?rev=359132&r1=359131&r2=359132&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java Mon Dec 26 15:40:34 2005
@@ -37,6 +37,7 @@
import org.apache.ldap.common.name.LdapName;
import org.apache.ldap.common.name.NameComponentNormalizer;
import org.apache.ldap.common.util.DateUtils;
+import org.apache.ldap.common.util.StringTools;
import org.apache.ldap.common.schema.AttributeType;
import org.apache.ldap.server.authz.AuthorizationService;
import org.apache.ldap.server.configuration.Configuration;
@@ -52,7 +53,6 @@
import org.apache.ldap.server.schema.GlobalRegistries;
import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries;
import org.apache.ldap.server.schema.bootstrap.BootstrapSchemaLoader;
-import org.apache.asn1.codec.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -701,13 +701,13 @@
}
else
{
- if ( ! StringUtils.isEmpty( binaryIds ) )
+ if ( ! StringTools.isEmpty( binaryIds ) )
{
String[] binaryArray = binaryIds.split( " " );
for ( int i = 0; i < binaryArray.length; i++ )
{
- binaries.add( StringUtils.lowerCase( StringUtils.trim( binaryArray[i] ) ) );
+ binaries.add( StringTools.lowerCase( StringTools.trim( binaryArray[i] ) ) );
}
}
@@ -734,7 +734,7 @@
String[] names = type.getNames();
for ( int ii = 0; ii < names.length; ii++ )
{
- binaries.add( StringUtils.lowerCase( StringUtils.trim( names[ii] ) ) );
+ binaries.add( StringTools.lowerCase( StringTools.trim( names[ii] ) ) );
}
}
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java?rev=359132&r1=359131&r2=359132&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java Mon Dec 26 15:40:34 2005
@@ -43,13 +43,13 @@
import javax.naming.spi.DirStateFactory;
import javax.naming.spi.DirectoryManager;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.exception.LdapNoPermissionException;
import org.apache.ldap.common.filter.ExprNode;
import org.apache.ldap.common.filter.PresenceNode;
import org.apache.ldap.common.message.LockableAttributesImpl;
import org.apache.ldap.common.name.LdapName;
import org.apache.ldap.common.util.NamespaceTools;
+import org.apache.ldap.common.util.StringTools;
import org.apache.ldap.server.DirectoryServiceConfiguration;
import org.apache.ldap.server.DirectoryService;
import org.apache.ldap.server.authn.AuthenticationService;
@@ -568,7 +568,7 @@
*/
public Object lookup( String name ) throws NamingException
{
- if ( StringUtils.isEmpty( name ) )
+ if ( StringTools.isEmpty( name ) )
{
return lookup( LdapName.EMPTY_LDAP_NAME );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java?rev=359132&r1=359131&r2=359132&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java Mon Dec 26 15:40:34 2005
@@ -41,7 +41,6 @@
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.MultiException;
import org.apache.ldap.common.NotImplementedException;
import org.apache.ldap.common.schema.AttributeType;
@@ -58,6 +57,7 @@
import org.apache.ldap.common.util.DateUtils;
import org.apache.ldap.common.util.NamespaceTools;
import org.apache.ldap.common.util.SingletonEnumeration;
+import org.apache.ldap.common.util.StringTools;
import org.apache.ldap.server.DirectoryServiceConfiguration;
import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
import org.apache.ldap.server.configuration.MutableDirectoryPartitionConfiguration;
@@ -390,7 +390,7 @@
}
else if ( reqVal instanceof String )
{
- return Arrays.equals( attrVal, StringUtils.getBytesUtf8( (String)reqVal ) );
+ return Arrays.equals( attrVal, StringTools.getBytesUtf8( (String)reqVal ) );
}
}
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java?rev=359132&r1=359131&r2=359132&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java Mon Dec 26 15:40:34 2005
@@ -27,7 +27,6 @@
import javax.naming.NamingException;
import javax.naming.directory.*;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.filter.ExprNode;
import org.apache.ldap.common.filter.PresenceNode;
import org.apache.ldap.common.filter.SimpleNode;
@@ -47,6 +46,7 @@
import org.apache.ldap.common.util.SingletonEnumeration;
import org.apache.ldap.common.util.DateUtils;
import org.apache.ldap.common.util.AttributeUtils;
+import org.apache.ldap.common.util.StringTools;
import org.apache.ldap.common.exception.LdapSchemaViolationException;
import org.apache.ldap.common.exception.LdapInvalidAttributeIdentifierException;
import org.apache.ldap.common.exception.LdapNoSuchAttributeException;
@@ -132,7 +132,7 @@
*/
public boolean isBinary( String id )
{
- return binaries.contains( StringUtils.lowerCase( StringUtils.trim( id ) ) );
+ return binaries.contains( StringTools.lowerCase( StringTools.trim( id ) ) );
}
@@ -668,7 +668,7 @@
if ( value instanceof String )
{
- binary.add( i, StringUtils.getBytesUtf8( ( String ) value ) );
+ binary.add( i, StringTools.getBytesUtf8( ( String ) value ) );
}
else
{