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:15:28 UTC
svn commit: r359124 - in
/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1:
decoder/ decoder/add/ decoder/bind/ decoder/compare/ decoder/delete/
decoder/extended/ decoder/modify/ decoder/modifydn/ decoder/sea...
Author: elecharny
Date: Mon Dec 26 15:15:04 2005
New Revision: 359124
URL: http://svn.apache.org/viewcvs?rev=359124&view=rev
Log:
Use StringTools instead of StringUtils
Modified:
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ErrorMessageRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ReferralUrlRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ResultMatchedDNRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ResultRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/add/AddAttributeValueRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/add/AddRequestEntryDnRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/bind/BindNameRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/compare/CompareAVARule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/compare/CompareEntryRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/delete/DeleteRequestRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/extended/ExtendedRequestOidRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/extended/ExtendedResponseOidRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modify/ModificationItemRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modify/ModifyRequestAttributeValueRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modify/ModifyRequestEntryDnRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ModifyDnRequestEntryRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ModifyDnRequestNewRdnRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ModifyDnRequestNewSuperiorRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ApproxMatchRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/BaseObjectRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/EqualityMatchRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchMatchingRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchTypeRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchValueRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/GreaterOrEqualRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/LessOrEqualRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/PresentRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/RequestedAttributesRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryDnRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchAnyRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchFinalRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchInitialRule.java
directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/encoder/EncoderUtils.java
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ErrorMessageRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ErrorMessageRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ErrorMessageRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ErrorMessageRule.java Mon Dec 26 15:15:04 2005
@@ -19,10 +19,10 @@
import org.apache.asn1.ber.TypeClass;
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.berlib.asn1.BufferUtils;
import org.apache.ldap.common.message.LdapResult;
import org.apache.ldap.common.message.ResultResponse;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -104,7 +104,7 @@
}
ByteBuffer buf = getAccumulator().drain( 0 ) ;
- String errorMsg = StringUtils.utf8ToString( BufferUtils.getArray( buf ) ) ;
+ String errorMsg = StringTools.utf8ToString( BufferUtils.getArray( buf ) ) ;
result.setErrorMessage( errorMsg ) ;
// clean up
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ReferralUrlRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ReferralUrlRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ReferralUrlRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ReferralUrlRule.java Mon Dec 26 15:15:04 2005
@@ -18,8 +18,8 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.message.Referral;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -60,6 +60,6 @@
buf.get( url ) ;
}
- ref.addLdapUrl( StringUtils.utf8ToString( url ) ) ;
+ ref.addLdapUrl( StringTools.utf8ToString( url ) ) ;
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ResultMatchedDNRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ResultMatchedDNRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ResultMatchedDNRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ResultMatchedDNRule.java Mon Dec 26 15:15:04 2005
@@ -19,10 +19,10 @@
import org.apache.asn1.ber.TypeClass;
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.berlib.asn1.BufferUtils;
import org.apache.ldap.common.message.LdapResult;
import org.apache.ldap.common.message.ResultResponse;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -98,7 +98,7 @@
}
ByteBuffer buf = getAccumulator().drain( 0 ) ;
- String dn = StringUtils.utf8ToString( BufferUtils.getArray( buf ) ) ;
+ String dn = StringTools.utf8ToString( BufferUtils.getArray( buf ) ) ;
result.setMatchedDn( dn );
// clean up
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ResultRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ResultRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ResultRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/ResultRule.java Mon Dec 26 15:15:04 2005
@@ -18,12 +18,12 @@
import org.apache.asn1.ber.TypeClass;
import org.apache.asn1.ber.digester.AbstractRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.berlib.asn1.BufferUtils;
import org.apache.ldap.common.message.LdapResult;
import org.apache.ldap.common.message.LdapResultImpl;
import org.apache.ldap.common.message.ResultCodeEnum;
import org.apache.ldap.common.message.ResultResponse;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -60,9 +60,9 @@
super.finish() ;
ByteBuffer buf = ( ByteBuffer ) getDigester().pop() ;
- result.setErrorMessage( StringUtils.utf8ToString( BufferUtils.getArray( buf ) ) ) ;
+ result.setErrorMessage( StringTools.utf8ToString( BufferUtils.getArray( buf ) ) ) ;
buf = ( ByteBuffer ) getDigester().pop() ;
- result.setMatchedDn( StringUtils.utf8ToString( BufferUtils.getArray( buf ) ) ) ;
+ result.setMatchedDn( StringTools.utf8ToString( BufferUtils.getArray( buf ) ) ) ;
int resultCode = getDigester().popInt() ;
result.setResultCode( ResultCodeEnum.getResultCodeEnum( resultCode ) ) ;
getDigester().pop() ;
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/add/AddAttributeValueRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/add/AddAttributeValueRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/add/AddAttributeValueRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/add/AddAttributeValueRule.java Mon Dec 26 15:15:04 2005
@@ -19,8 +19,8 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
import org.apache.asn1.ber.primitives.UniversalTag;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.message.LockableAttributeImpl;
+import org.apache.ldap.common.util.StringTools;
import javax.naming.directory.Attributes;
import javax.naming.directory.Attribute;
@@ -100,7 +100,7 @@
}
else
{
- attr.add( StringUtils.utf8ToString( octets ) );
+ attr.add( StringTools.utf8ToString( octets ) );
}
// clean up
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/add/AddRequestEntryDnRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/add/AddRequestEntryDnRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/add/AddRequestEntryDnRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/add/AddRequestEntryDnRule.java Mon Dec 26 15:15:04 2005
@@ -19,8 +19,8 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
import org.apache.asn1.ber.primitives.UniversalTag;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.message.AddRequest;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -77,6 +77,6 @@
buf.get( octets ) ;
}
- req.setEntry( StringUtils.utf8ToString( octets ) ) ;
+ req.setEntry( StringTools.utf8ToString( octets ) ) ;
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/bind/BindNameRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/bind/BindNameRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/bind/BindNameRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/bind/BindNameRule.java Mon Dec 26 15:15:04 2005
@@ -18,8 +18,8 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.message.BindRequest;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -70,6 +70,6 @@
}
// The byte array is an UTF-8 encoded String
- req.setName( StringUtils.utf8ToString( name ) ) ;
+ req.setName( StringTools.utf8ToString( name ) ) ;
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/compare/CompareAVARule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/compare/CompareAVARule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/compare/CompareAVARule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/compare/CompareAVARule.java Mon Dec 26 15:15:04 2005
@@ -18,8 +18,8 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.message.CompareRequest;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -72,7 +72,7 @@
if ( req.getAttributeId() == null )
{
- req.setAttributeId( StringUtils.utf8ToString( octets ) ) ;
+ req.setAttributeId( StringTools.utf8ToString( octets ) ) ;
}
else
{
@@ -82,7 +82,7 @@
}
else
{
- req.setAssertionValue( StringUtils.utf8ToString( octets ) );
+ req.setAssertionValue( StringTools.utf8ToString( octets ) );
}
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/compare/CompareEntryRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/compare/CompareEntryRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/compare/CompareEntryRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/compare/CompareEntryRule.java Mon Dec 26 15:15:04 2005
@@ -18,8 +18,8 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.message.CompareRequest;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -70,6 +70,6 @@
buf.get( name ) ;
}
- req.setName( StringUtils.utf8ToString( name ) ) ;
+ req.setName( StringTools.utf8ToString( name ) ) ;
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/delete/DeleteRequestRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/delete/DeleteRequestRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/delete/DeleteRequestRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/delete/DeleteRequestRule.java Mon Dec 26 15:15:04 2005
@@ -19,11 +19,11 @@
import org.apache.asn1.ber.TypeClass;
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.berlib.asn1.BufferUtils;
import org.apache.ldap.common.berlib.asn1.LdapTag;
import org.apache.ldap.common.message.DeleteRequest;
import org.apache.ldap.common.message.DeleteRequestImpl;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -67,7 +67,7 @@
super.finish() ;
ByteBuffer buf = ( ByteBuffer ) getDigester().pop() ;
- String name = StringUtils.utf8ToString( BufferUtils.getArray( buf ) );
+ String name = StringTools.utf8ToString( BufferUtils.getArray( buf ) );
DeleteRequest req = ( DeleteRequest ) getDigester().pop() ;
req.setName( name ) ;
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/extended/ExtendedRequestOidRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/extended/ExtendedRequestOidRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/extended/ExtendedRequestOidRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/extended/ExtendedRequestOidRule.java Mon Dec 26 15:15:04 2005
@@ -18,9 +18,9 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.berlib.asn1.LdapTag;
import org.apache.ldap.common.message.ExtendedRequest;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -77,6 +77,6 @@
buf.get( octets ) ;
}
- req.setOid( StringUtils.utf8ToString( octets ) ) ;
+ req.setOid( StringTools.utf8ToString( octets ) ) ;
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/extended/ExtendedResponseOidRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/extended/ExtendedResponseOidRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/extended/ExtendedResponseOidRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/extended/ExtendedResponseOidRule.java Mon Dec 26 15:15:04 2005
@@ -18,9 +18,9 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.berlib.asn1.LdapTag;
import org.apache.ldap.common.message.ExtendedResponse;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -77,6 +77,6 @@
buf.get( octets ) ;
}
- resp.setResponseName( StringUtils.utf8ToString( octets ) ) ;
+ resp.setResponseName( StringTools.utf8ToString( octets ) ) ;
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modify/ModificationItemRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modify/ModificationItemRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modify/ModificationItemRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modify/ModificationItemRule.java Mon Dec 26 15:15:04 2005
@@ -19,9 +19,9 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
import org.apache.asn1.ber.primitives.UniversalTag;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.message.LockableAttributeImpl;
import org.apache.ldap.common.message.ModifyRequest;
+import org.apache.ldap.common.util.StringTools;
import javax.naming.directory.DirContext;
import javax.naming.directory.ModificationItem;
@@ -104,7 +104,7 @@
}
LockableAttributeImpl attr =
- new LockableAttributeImpl( StringUtils.utf8ToString( octets ) ) ;
+ new LockableAttributeImpl( StringTools.utf8ToString( octets ) ) ;
ModifyRequest req = ( ModifyRequest ) getDigester().peek() ;
ModificationItem mods = new ModificationItem( modCode, attr ) ;
req.addModification( mods ) ;
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modify/ModifyRequestAttributeValueRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modify/ModifyRequestAttributeValueRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modify/ModifyRequestAttributeValueRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modify/ModifyRequestAttributeValueRule.java Mon Dec 26 15:15:04 2005
@@ -19,7 +19,7 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
import org.apache.asn1.ber.primitives.UniversalTag;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import javax.naming.directory.ModificationItem;
import java.nio.ByteBuffer;
@@ -87,7 +87,7 @@
}
else
{
- mods.getAttribute().add( StringUtils.utf8ToString( octets ) ) ;
+ mods.getAttribute().add( StringTools.utf8ToString( octets ) ) ;
}
// clean up
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modify/ModifyRequestEntryDnRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modify/ModifyRequestEntryDnRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modify/ModifyRequestEntryDnRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modify/ModifyRequestEntryDnRule.java Mon Dec 26 15:15:04 2005
@@ -19,8 +19,8 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
import org.apache.asn1.ber.primitives.UniversalTag;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.message.ModifyRequest;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -77,6 +77,6 @@
buf.get( octets ) ;
}
- req.setName( StringUtils.utf8ToString( octets ) ) ;
+ req.setName( StringTools.utf8ToString( octets ) ) ;
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ModifyDnRequestEntryRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ModifyDnRequestEntryRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ModifyDnRequestEntryRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ModifyDnRequestEntryRule.java Mon Dec 26 15:15:04 2005
@@ -20,8 +20,8 @@
import org.apache.asn1.ber.TypeClass;
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
import org.apache.asn1.ber.primitives.UniversalTag;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.message.ModifyDnRequest;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -132,7 +132,7 @@
buf.get( octets ) ;
}
- req.setName( StringUtils.utf8ToString( octets ) ) ;
+ req.setName( StringTools.utf8ToString( octets ) ) ;
byPass = false ;
req = null ;
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ModifyDnRequestNewRdnRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ModifyDnRequestNewRdnRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ModifyDnRequestNewRdnRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ModifyDnRequestNewRdnRule.java Mon Dec 26 15:15:04 2005
@@ -20,8 +20,8 @@
import org.apache.asn1.ber.TypeClass;
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
import org.apache.asn1.ber.primitives.UniversalTag;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.message.ModifyDnRequest;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -135,7 +135,7 @@
buf.get( octets ) ;
}
- req.setNewRdn( StringUtils.utf8ToString( octets ) ) ;
+ req.setNewRdn( StringTools.utf8ToString( octets ) ) ;
byPass = false ;
req = null ;
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ModifyDnRequestNewSuperiorRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ModifyDnRequestNewSuperiorRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ModifyDnRequestNewSuperiorRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/modifydn/ModifyDnRequestNewSuperiorRule.java Mon Dec 26 15:15:04 2005
@@ -19,9 +19,9 @@
import org.apache.asn1.ber.TypeClass;
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.berlib.asn1.LdapTag;
import org.apache.ldap.common.message.ModifyDnRequest;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -92,6 +92,6 @@
buf.get( octets ) ;
}
- req.setNewSuperior( StringUtils.utf8ToString( octets ) ) ;
+ req.setNewSuperior( StringTools.utf8ToString( octets ) ) ;
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ApproxMatchRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ApproxMatchRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ApproxMatchRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ApproxMatchRule.java Mon Dec 26 15:15:04 2005
@@ -19,9 +19,9 @@
import org.apache.asn1.ber.TypeClass;
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.berlib.asn1.LdapTag;
import org.apache.ldap.common.filter.SimpleNode;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -134,7 +134,7 @@
if ( name == null )
{
- name = StringUtils.utf8ToString( octets );
+ name = StringTools.utf8ToString( octets );
}
else
{
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/BaseObjectRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/BaseObjectRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/BaseObjectRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/BaseObjectRule.java Mon Dec 26 15:15:04 2005
@@ -19,8 +19,8 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
import org.apache.asn1.ber.primitives.UniversalTag;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.message.SearchRequestImpl;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -76,7 +76,7 @@
buf.get( octets );
}
- req.setBase( StringUtils.utf8ToString( octets ) );
+ req.setBase( StringTools.utf8ToString( octets ) );
( ( SearchRequestProcessing ) getDigester().peek() ).next();
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/EqualityMatchRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/EqualityMatchRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/EqualityMatchRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/EqualityMatchRule.java Mon Dec 26 15:15:04 2005
@@ -19,9 +19,9 @@
import org.apache.asn1.ber.TypeClass;
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.berlib.asn1.LdapTag;
import org.apache.ldap.common.filter.SimpleNode;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -141,7 +141,7 @@
if ( name == null )
{
- name = StringUtils.utf8ToString( octets ) ;
+ name = StringTools.utf8ToString( octets ) ;
}
else
{
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchMatchingRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchMatchingRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchMatchingRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchMatchingRule.java Mon Dec 26 15:15:04 2005
@@ -18,8 +18,8 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.berlib.asn1.LdapTag;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -67,6 +67,6 @@
}
ExtensibleMatchRule rule = ( ExtensibleMatchRule ) getDigester().peek();
- rule.setMatchingRule( StringUtils.utf8ToString( octets ) );
+ rule.setMatchingRule( StringTools.utf8ToString( octets ) );
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchTypeRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchTypeRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchTypeRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchTypeRule.java Mon Dec 26 15:15:04 2005
@@ -18,8 +18,8 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.berlib.asn1.LdapTag;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -67,6 +67,6 @@
}
ExtensibleMatchRule rule = ( ExtensibleMatchRule ) getDigester().peek();
- rule.setType( StringUtils.utf8ToString( octets ) );
+ rule.setType( StringTools.utf8ToString( octets ) );
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchValueRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchValueRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchValueRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchValueRule.java Mon Dec 26 15:15:04 2005
@@ -18,8 +18,8 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.berlib.asn1.LdapTag;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -67,6 +67,6 @@
}
ExtensibleMatchRule rule = ( ExtensibleMatchRule ) getDigester().peek();
- rule.setValue( StringUtils.utf8ToString( octets ) );
+ rule.setValue( StringTools.utf8ToString( octets ) );
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/GreaterOrEqualRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/GreaterOrEqualRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/GreaterOrEqualRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/GreaterOrEqualRule.java Mon Dec 26 15:15:04 2005
@@ -19,8 +19,8 @@
import org.apache.asn1.ber.TypeClass;
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.filter.SimpleNode;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -113,7 +113,7 @@
if ( name == null )
{
- name = StringUtils.utf8ToString( octets );
+ name = StringTools.utf8ToString( octets );
}
else
{
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/LessOrEqualRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/LessOrEqualRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/LessOrEqualRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/LessOrEqualRule.java Mon Dec 26 15:15:04 2005
@@ -19,8 +19,8 @@
import org.apache.asn1.ber.TypeClass;
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.filter.SimpleNode;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -113,7 +113,7 @@
if ( name == null )
{
- name = StringUtils.utf8ToString( octets );
+ name = StringTools.utf8ToString( octets );
}
else
{
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/PresentRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/PresentRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/PresentRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/PresentRule.java Mon Dec 26 15:15:04 2005
@@ -19,9 +19,9 @@
import org.apache.asn1.ber.TypeClass;
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.berlib.asn1.LdapTag;
import org.apache.ldap.common.filter.PresenceNode;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -132,7 +132,7 @@
buf.get( octets );
}
- getDigester().push( new PresenceNode( StringUtils.utf8ToString( octets ) ) );
+ getDigester().push( new PresenceNode( StringTools.utf8ToString( octets ) ) );
}
isEnabled = true ;
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/RequestedAttributesRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/RequestedAttributesRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/RequestedAttributesRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/RequestedAttributesRule.java Mon Dec 26 15:15:04 2005
@@ -19,8 +19,8 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
import org.apache.asn1.ber.primitives.UniversalTag;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.message.SearchRequestImpl;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -77,6 +77,6 @@
buf.get( octets );
}
- req.addAttribute( StringUtils.utf8ToString( octets ) );
+ req.addAttribute( StringTools.utf8ToString( octets ) );
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryDnRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryDnRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryDnRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryDnRule.java Mon Dec 26 15:15:04 2005
@@ -19,8 +19,8 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
import org.apache.asn1.ber.primitives.UniversalTag;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.message.SearchResponseEntry;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -78,6 +78,6 @@
buf.get( octets ) ;
}
- req.setObjectName( StringUtils.utf8ToString( octets ) ) ;
+ req.setObjectName( StringTools.utf8ToString( octets ) ) ;
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchAnyRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchAnyRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchAnyRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchAnyRule.java Mon Dec 26 15:15:04 2005
@@ -18,8 +18,8 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.berlib.asn1.LdapTag;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -66,6 +66,6 @@
}
SubstringMatchRule rule = ( SubstringMatchRule ) getDigester().peek() ;
- rule.addAny( StringUtils.utf8ToString( octets ) );
+ rule.addAny( StringTools.utf8ToString( octets ) );
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchFinalRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchFinalRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchFinalRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchFinalRule.java Mon Dec 26 15:15:04 2005
@@ -18,8 +18,8 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.berlib.asn1.LdapTag;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -67,6 +67,6 @@
}
SubstringMatchRule rule = ( SubstringMatchRule ) getDigester().peek() ;
- rule.setFinalStr( StringUtils.utf8ToString( octets ) );
+ rule.setFinalStr( StringTools.utf8ToString( octets ) );
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchInitialRule.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchInitialRule.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchInitialRule.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchInitialRule.java Mon Dec 26 15:15:04 2005
@@ -18,8 +18,8 @@
import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.berlib.asn1.LdapTag;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -67,6 +67,6 @@
}
SubstringMatchRule rule = ( SubstringMatchRule ) getDigester().peek() ;
- rule.setInitial( StringUtils.utf8ToString( octets ) );
+ rule.setInitial( StringTools.utf8ToString( octets ) );
}
}
Modified: directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/encoder/EncoderUtils.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/encoder/EncoderUtils.java?rev=359124&r1=359123&r2=359124&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/encoder/EncoderUtils.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/main/java/org/apache/ldap/common/berlib/asn1/encoder/EncoderUtils.java Mon Dec 26 15:15:04 2005
@@ -23,7 +23,7 @@
import org.apache.asn1.ber.TupleNode;
import org.apache.asn1.ber.primitives.PrimitiveUtils;
import org.apache.asn1.ber.primitives.UniversalTag;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -61,7 +61,7 @@
{
Tuple t = new Tuple();
t.setTag( tag, true );
- ByteBuffer chunk = ByteBuffer.wrap( StringUtils.getBytesUtf8( octets ) );
+ ByteBuffer chunk = ByteBuffer.wrap( StringTools.getBytesUtf8( octets ) );
t.setLength( chunk.remaining() );
t.setLastValueChunk( chunk );
return new DefaultMutableTupleNode( t );