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 2015/01/10 10:22:13 UTC
svn commit: r1650727 [3/3] - in /directory/shared/trunk:
dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/
ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/
ldap/codec/core/src/main/java/org/apache/directory/api/ldap/...
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/modifyRequest/StoreOperationType.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/modifyRequest/StoreOperationType.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/modifyRequest/StoreOperationType.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/modifyRequest/StoreOperationType.java Sat Jan 10 09:22:12 2015
@@ -26,7 +26,7 @@ import org.apache.directory.api.asn1.ber
import org.apache.directory.api.asn1.ber.tlv.IntegerDecoderException;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.codec.decorators.ModifyRequestDecorator;
import org.apache.directory.api.util.Strings;
@@ -95,15 +95,15 @@ public class StoreOperationType extends
{
switch ( operation )
{
- case LdapConstants.OPERATION_ADD:
+ case LdapCodecConstants.OPERATION_ADD:
LOG.debug( "Modification operation : ADD" );
break;
- case LdapConstants.OPERATION_DELETE:
+ case LdapCodecConstants.OPERATION_DELETE:
LOG.debug( "Modification operation : DELETE" );
break;
- case LdapConstants.OPERATION_REPLACE:
+ case LdapCodecConstants.OPERATION_REPLACE:
LOG.debug( "Modification operation : REPLACE" );
break;
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/StoreSearchRequestDerefAlias.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/StoreSearchRequestDerefAlias.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/StoreSearchRequestDerefAlias.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/StoreSearchRequestDerefAlias.java Sat Jan 10 09:22:12 2015
@@ -27,7 +27,7 @@ import org.apache.directory.api.asn1.ber
import org.apache.directory.api.asn1.ber.tlv.IntegerDecoderException;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.codec.decorators.SearchRequestDecorator;
import org.apache.directory.api.ldap.model.message.AliasDerefMode;
@@ -83,8 +83,8 @@ public class StoreSearchRequestDerefAlia
try
{
- derefAliases = IntegerDecoder.parse( value, LdapConstants.NEVER_DEREF_ALIASES,
- LdapConstants.DEREF_ALWAYS );
+ derefAliases = IntegerDecoder.parse( value, LdapCodecConstants.NEVER_DEREF_ALIASES,
+ LdapCodecConstants.DEREF_ALWAYS );
}
catch ( IntegerDecoderException ide )
{
@@ -99,19 +99,19 @@ public class StoreSearchRequestDerefAlia
{
switch ( derefAliases )
{
- case LdapConstants.NEVER_DEREF_ALIASES:
+ case LdapCodecConstants.NEVER_DEREF_ALIASES:
LOG.debug( "Handling object strategy : NEVER_DEREF_ALIASES" );
break;
- case LdapConstants.DEREF_IN_SEARCHING:
+ case LdapCodecConstants.DEREF_IN_SEARCHING:
LOG.debug( "Handling object strategy : DEREF_IN_SEARCHING" );
break;
- case LdapConstants.DEREF_FINDING_BASE_OBJ:
+ case LdapCodecConstants.DEREF_FINDING_BASE_OBJ:
LOG.debug( "Handling object strategy : DEREF_FINDING_BASE_OBJ" );
break;
- case LdapConstants.DEREF_ALWAYS:
+ case LdapCodecConstants.DEREF_ALWAYS:
LOG.debug( "Handling object strategy : DEREF_ALWAYS" );
break;
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/StoreSearchRequestScope.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/StoreSearchRequestScope.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/StoreSearchRequestScope.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/StoreSearchRequestScope.java Sat Jan 10 09:22:12 2015
@@ -27,7 +27,7 @@ import org.apache.directory.api.asn1.ber
import org.apache.directory.api.asn1.ber.tlv.IntegerDecoderException;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.codec.decorators.SearchRequestDecorator;
import org.apache.directory.api.ldap.model.message.SearchRequest;
@@ -82,8 +82,8 @@ public class StoreSearchRequestScope ext
try
{
- scope = IntegerDecoder.parse( value, LdapConstants.SCOPE_BASE_OBJECT,
- LdapConstants.SCOPE_WHOLE_SUBTREE );
+ scope = IntegerDecoder.parse( value, LdapCodecConstants.SCOPE_BASE_OBJECT,
+ LdapCodecConstants.SCOPE_WHOLE_SUBTREE );
}
catch ( IntegerDecoderException ide )
{
@@ -98,15 +98,15 @@ public class StoreSearchRequestScope ext
{
switch ( scope )
{
- case LdapConstants.SCOPE_BASE_OBJECT:
+ case LdapCodecConstants.SCOPE_BASE_OBJECT:
LOG.debug( "Searching within BASE_OBJECT scope " );
break;
- case LdapConstants.SCOPE_SINGLE_LEVEL:
+ case LdapCodecConstants.SCOPE_SINGLE_LEVEL:
LOG.debug( "Searching within SINGLE_LEVEL scope " );
break;
- case LdapConstants.SCOPE_WHOLE_SUBTREE:
+ case LdapCodecConstants.SCOPE_WHOLE_SUBTREE:
LOG.debug( "Searching within WHOLE_SUBTREE scope " );
break;
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitApproxMatchFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitApproxMatchFilter.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitApproxMatchFilter.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitApproxMatchFilter.java Sat Jan 10 09:22:12 2015
@@ -22,7 +22,7 @@ package org.apache.directory.api.ldap.co
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.codec.decorators.SearchRequestDecorator;
import org.apache.directory.api.ldap.codec.search.AttributeValueAssertionFilter;
@@ -63,7 +63,7 @@ public class InitApproxMatchFilter exten
// We can allocate the Attribute Value Assertion
Filter filter = new AttributeValueAssertionFilter( container.getTlvId(),
- LdapConstants.APPROX_MATCH_FILTER );
+ LdapCodecConstants.APPROX_MATCH_FILTER );
searchRequestDecorator.addCurrentFilter( filter );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitEqualityMatchFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitEqualityMatchFilter.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitEqualityMatchFilter.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitEqualityMatchFilter.java Sat Jan 10 09:22:12 2015
@@ -22,7 +22,7 @@ package org.apache.directory.api.ldap.co
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.codec.decorators.SearchRequestDecorator;
import org.apache.directory.api.ldap.codec.search.AttributeValueAssertionFilter;
@@ -63,7 +63,7 @@ public class InitEqualityMatchFilter ext
// We can allocate the Attribute Value Assertion
Filter filter = new AttributeValueAssertionFilter( container.getTlvId(),
- LdapConstants.EQUALITY_MATCH_FILTER );
+ LdapCodecConstants.EQUALITY_MATCH_FILTER );
searchRequestDecorator.addCurrentFilter( filter );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitGreaterOrEqualFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitGreaterOrEqualFilter.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitGreaterOrEqualFilter.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitGreaterOrEqualFilter.java Sat Jan 10 09:22:12 2015
@@ -22,7 +22,7 @@ package org.apache.directory.api.ldap.co
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.codec.decorators.SearchRequestDecorator;
import org.apache.directory.api.ldap.codec.search.AttributeValueAssertionFilter;
@@ -63,7 +63,7 @@ public class InitGreaterOrEqualFilter ex
// We can allocate the Attribute Value Assertion
Filter filter = new AttributeValueAssertionFilter( container.getTlvId(),
- LdapConstants.GREATER_OR_EQUAL_FILTER );
+ LdapCodecConstants.GREATER_OR_EQUAL_FILTER );
searchRequestDecorator.addCurrentFilter( filter );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitLessOrEqualFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitLessOrEqualFilter.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitLessOrEqualFilter.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitLessOrEqualFilter.java Sat Jan 10 09:22:12 2015
@@ -22,7 +22,7 @@ package org.apache.directory.api.ldap.co
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.codec.decorators.SearchRequestDecorator;
import org.apache.directory.api.ldap.codec.search.AttributeValueAssertionFilter;
@@ -63,7 +63,7 @@ public class InitLessOrEqualFilter exten
// We can allocate the Attribute Value Assertion
Filter filter = new AttributeValueAssertionFilter( container.getTlvId(),
- LdapConstants.LESS_OR_EQUAL_FILTER );
+ LdapCodecConstants.LESS_OR_EQUAL_FILTER );
searchRequestDecorator.addCurrentFilter( filter );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestDecorator.java Sat Jan 10 09:22:12 2015
@@ -237,7 +237,7 @@ public class ExtendedRequestDecorator<Q
try
{
// The BindResponse Tag
- buffer.put( LdapConstants.EXTENDED_REQUEST_TAG );
+ buffer.put( LdapCodecConstants.EXTENDED_REQUEST_TAG );
buffer.put( TLV.getBytes( getExtendedRequestLength() ) );
// The requestName, if any
@@ -246,7 +246,7 @@ public class ExtendedRequestDecorator<Q
throw new EncoderException( I18n.err( I18n.ERR_04043 ) );
}
- buffer.put( ( byte ) LdapConstants.EXTENDED_REQUEST_NAME_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.EXTENDED_REQUEST_NAME_TAG );
buffer.put( TLV.getBytes( getRequestNameBytes().length ) );
if ( getRequestNameBytes().length != 0 )
@@ -257,7 +257,7 @@ public class ExtendedRequestDecorator<Q
// The requestValue, if any
if ( getRequestValue() != null )
{
- buffer.put( ( byte ) LdapConstants.EXTENDED_REQUEST_VALUE_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.EXTENDED_REQUEST_VALUE_TAG );
buffer.put( TLV.getBytes( getRequestValue().length ) );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedResponseDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedResponseDecorator.java Sat Jan 10 09:22:12 2015
@@ -208,7 +208,7 @@ public class ExtendedResponseDecorator<R
try
{
// The ExtendedResponse Tag
- buffer.put( LdapConstants.EXTENDED_RESPONSE_TAG );
+ buffer.put( LdapCodecConstants.EXTENDED_RESPONSE_TAG );
buffer.put( TLV.getBytes( getExtendedResponseLength() ) );
// The LdapResult
@@ -219,7 +219,7 @@ public class ExtendedResponseDecorator<R
if ( idBytes != null )
{
- buffer.put( ( byte ) LdapConstants.EXTENDED_RESPONSE_RESPONSE_NAME_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.EXTENDED_RESPONSE_RESPONSE_NAME_TAG );
buffer.put( TLV.getBytes( idBytes.length ) );
if ( idBytes.length != 0 )
@@ -233,7 +233,7 @@ public class ExtendedResponseDecorator<R
if ( encodedValue != null )
{
- buffer.put( ( byte ) LdapConstants.EXTENDED_RESPONSE_RESPONSE_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.EXTENDED_RESPONSE_RESPONSE_TAG );
buffer.put( TLV.getBytes( encodedValue.length ) );
Copied: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapCodecConstants.java (from r1650712, directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapConstants.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapCodecConstants.java?p2=directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapCodecConstants.java&p1=directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapConstants.java&r1=1650712&r2=1650727&rev=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapConstants.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapCodecConstants.java Sat Jan 10 09:22:12 2015
@@ -21,14 +21,16 @@ package org.apache.directory.api.ldap.co
/**
+ * This class contains a list of constants used in the LDAP coder/decoder.
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public final class LdapConstants
+public final class LdapCodecConstants
{
/**
* Private constructor.
*/
- private LdapConstants()
+ private LdapCodecConstants()
{
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapEncoder.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapEncoder.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapEncoder.java Sat Jan 10 09:22:12 2015
@@ -186,7 +186,7 @@ public class LdapEncoder
if ( ( controls != null ) && ( controls.size() > 0 ) )
{
// Encode the controls
- buffer.put( ( byte ) LdapConstants.CONTROLS_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.CONTROLS_TAG );
buffer.put( TLV.getBytes( decorator.getControlsLength() ) );
// Encode each control
@@ -314,7 +314,7 @@ public class LdapEncoder
{
// Encode the referrals sequence
// The referrals length MUST have been computed before !
- buffer.put( ( byte ) LdapConstants.LDAP_RESULT_REFERRAL_SEQUENCE_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.LDAP_RESULT_REFERRAL_SEQUENCE_TAG );
buffer.put( TLV.getBytes( referral.getReferralLength() ) );
// Each referral
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java Sat Jan 10 09:22:12 2015
@@ -27,7 +27,7 @@ import org.apache.directory.api.asn1.Enc
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.model.message.AbandonRequest;
import org.apache.directory.api.ldap.model.message.Control;
@@ -124,7 +124,7 @@ public final class AbandonRequestDecorat
try
{
// The tag
- buffer.put( LdapConstants.ABANDON_REQUEST_TAG );
+ buffer.put( LdapCodecConstants.ABANDON_REQUEST_TAG );
// The length. It has to be evaluated depending on
// the abandoned messageId value.
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java Sat Jan 10 09:22:12 2015
@@ -31,7 +31,7 @@ import org.apache.directory.api.asn1.ber
import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
import org.apache.directory.api.ldap.model.entry.Entry;
@@ -460,7 +460,7 @@ public final class AddRequestDecorator e
try
{
// The AddRequest Tag
- buffer.put( LdapConstants.ADD_REQUEST_TAG );
+ buffer.put( LdapCodecConstants.ADD_REQUEST_TAG );
buffer.put( TLV.getBytes( getAddRequestLength() ) );
// The entry
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddResponseDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddResponseDecorator.java Sat Jan 10 09:22:12 2015
@@ -27,7 +27,7 @@ import org.apache.directory.api.asn1.Enc
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.model.message.AddResponse;
@@ -120,7 +120,7 @@ public class AddResponseDecorator extend
try
{
// The AddResponse Tag
- buffer.put( LdapConstants.ADD_RESPONSE_TAG );
+ buffer.put( LdapCodecConstants.ADD_RESPONSE_TAG );
buffer.put( TLV.getBytes( getAddResponseLength() ) );
// The LdapResult
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java Sat Jan 10 09:22:12 2015
@@ -28,7 +28,7 @@ import org.apache.directory.api.asn1.ber
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.model.message.BindRequest;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.name.Dn;
@@ -428,7 +428,7 @@ public class BindRequestDecorator extend
try
{
// The BindRequest Tag
- buffer.put( LdapConstants.BIND_REQUEST_TAG );
+ buffer.put( LdapCodecConstants.BIND_REQUEST_TAG );
buffer.put( TLV.getBytes( getBindRequestLength() ) );
}
@@ -462,7 +462,7 @@ public class BindRequestDecorator extend
try
{
// The simpleAuthentication Tag
- buffer.put( ( byte ) LdapConstants.BIND_REQUEST_SIMPLE_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.BIND_REQUEST_SIMPLE_TAG );
if ( credentials != null )
{
@@ -490,7 +490,7 @@ public class BindRequestDecorator extend
try
{
// The saslAuthentication Tag
- buffer.put( ( byte ) LdapConstants.BIND_REQUEST_SASL_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.BIND_REQUEST_SASL_TAG );
buffer.put( TLV
.getBytes( saslMechanismLength + saslCredentialsLength ) );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindResponseDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindResponseDecorator.java Sat Jan 10 09:22:12 2015
@@ -27,7 +27,7 @@ import org.apache.directory.api.asn1.Enc
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.model.message.BindResponse;
@@ -151,7 +151,7 @@ public class BindResponseDecorator exten
try
{
// The BindResponse Tag
- buffer.put( LdapConstants.BIND_RESPONSE_TAG );
+ buffer.put( LdapCodecConstants.BIND_RESPONSE_TAG );
buffer.put( TLV.getBytes( getBindResponseLength() ) );
// The LdapResult
@@ -162,7 +162,7 @@ public class BindResponseDecorator exten
if ( serverSaslCreds != null )
{
- buffer.put( ( byte ) LdapConstants.SERVER_SASL_CREDENTIAL_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.SERVER_SASL_CREDENTIAL_TAG );
buffer.put( TLV.getBytes( serverSaslCreds.length ) );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java Sat Jan 10 09:22:12 2015
@@ -29,7 +29,7 @@ import org.apache.directory.api.asn1.ber
import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.model.entry.BinaryValue;
import org.apache.directory.api.ldap.model.entry.Value;
import org.apache.directory.api.ldap.model.message.CompareRequest;
@@ -338,7 +338,7 @@ public class CompareRequestDecorator ext
try
{
// The CompareRequest Tag
- buffer.put( LdapConstants.COMPARE_REQUEST_TAG );
+ buffer.put( LdapCodecConstants.COMPARE_REQUEST_TAG );
buffer.put( TLV.getBytes( getCompareRequestLength() ) );
// The entry
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareResponseDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareResponseDecorator.java Sat Jan 10 09:22:12 2015
@@ -27,7 +27,7 @@ import org.apache.directory.api.asn1.Enc
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.model.message.CompareResponse;
@@ -124,7 +124,7 @@ public class CompareResponseDecorator ex
try
{
// The CompareResponse Tag
- buffer.put( LdapConstants.COMPARE_RESPONSE_TAG );
+ buffer.put( LdapCodecConstants.COMPARE_RESPONSE_TAG );
buffer.put( TLV.getBytes( getCompareResponseLength() ) );
// The LdapResult
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java Sat Jan 10 09:22:12 2015
@@ -27,7 +27,7 @@ import org.apache.directory.api.asn1.Enc
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.message.DeleteRequest;
import org.apache.directory.api.ldap.model.name.Dn;
@@ -155,7 +155,7 @@ public class DeleteRequestDecorator exte
try
{
// The DelRequest Tag
- buffer.put( LdapConstants.DEL_REQUEST_TAG );
+ buffer.put( LdapCodecConstants.DEL_REQUEST_TAG );
// The entry
buffer.put( TLV.getBytes( dnBytes.length ) );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteResponseDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteResponseDecorator.java Sat Jan 10 09:22:12 2015
@@ -27,7 +27,7 @@ import org.apache.directory.api.asn1.Enc
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.model.message.DeleteResponse;
@@ -110,7 +110,7 @@ public class DeleteResponseDecorator ext
try
{
// The DelResponse Tag
- buffer.put( LdapConstants.DEL_RESPONSE_TAG );
+ buffer.put( LdapCodecConstants.DEL_RESPONSE_TAG );
buffer.put( TLV.getBytes( getDeleteResponseLength() ) );
// The LdapResult
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/IntermediateResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/IntermediateResponseDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/IntermediateResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/IntermediateResponseDecorator.java Sat Jan 10 09:22:12 2015
@@ -27,7 +27,7 @@ import org.apache.directory.api.asn1.Enc
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.codec.api.MessageDecorator;
import org.apache.directory.api.ldap.model.message.IntermediateResponse;
import org.apache.directory.api.util.Strings;
@@ -201,7 +201,7 @@ public class IntermediateResponseDecorat
try
{
// The ExtendedResponse Tag
- buffer.put( LdapConstants.INTERMEDIATE_RESPONSE_TAG );
+ buffer.put( LdapCodecConstants.INTERMEDIATE_RESPONSE_TAG );
buffer.put( TLV.getBytes( getIntermediateResponseLength() ) );
// The responseName, if any
@@ -209,7 +209,7 @@ public class IntermediateResponseDecorat
if ( ( responseNameBytes != null ) && ( responseNameBytes.length != 0 ) )
{
- buffer.put( ( byte ) LdapConstants.INTERMEDIATE_RESPONSE_NAME_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.INTERMEDIATE_RESPONSE_NAME_TAG );
buffer.put( TLV.getBytes( responseNameBytes.length ) );
buffer.put( responseNameBytes );
}
@@ -219,7 +219,7 @@ public class IntermediateResponseDecorat
if ( encodedValue != null )
{
- buffer.put( ( byte ) LdapConstants.INTERMEDIATE_RESPONSE_VALUE_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.INTERMEDIATE_RESPONSE_VALUE_TAG );
buffer.put( TLV.getBytes( encodedValue.length ) );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java Sat Jan 10 09:22:12 2015
@@ -28,7 +28,7 @@ import org.apache.directory.api.asn1.ber
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.message.ModifyDnRequest;
import org.apache.directory.api.ldap.model.name.Dn;
@@ -274,7 +274,7 @@ public class ModifyDnRequestDecorator ex
try
{
// The ModifyDNRequest Tag
- buffer.put( LdapConstants.MODIFY_DN_REQUEST_TAG );
+ buffer.put( LdapCodecConstants.MODIFY_DN_REQUEST_TAG );
buffer.put( TLV.getBytes( getModifyDnResponseLength() ) );
// The entry
@@ -291,7 +291,7 @@ public class ModifyDnRequestDecorator ex
if ( getNewSuperior() != null )
{
// Encode the reference
- buffer.put( ( byte ) LdapConstants.MODIFY_DN_REQUEST_NEW_SUPERIOR_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.MODIFY_DN_REQUEST_NEW_SUPERIOR_TAG );
int newSuperiorLength = Dn.getNbBytes( getNewSuperior() );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnResponseDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnResponseDecorator.java Sat Jan 10 09:22:12 2015
@@ -27,7 +27,7 @@ import org.apache.directory.api.asn1.Enc
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.model.message.ModifyDnResponse;
@@ -109,7 +109,7 @@ public class ModifyDnResponseDecorator e
try
{
// The ModifyResponse Tag
- buffer.put( LdapConstants.MODIFY_DN_RESPONSE_TAG );
+ buffer.put( LdapCodecConstants.MODIFY_DN_RESPONSE_TAG );
buffer.put( TLV.getBytes( getModifyDnResponseLength() ) );
// The LdapResult
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java Sat Jan 10 09:22:12 2015
@@ -32,7 +32,7 @@ import org.apache.directory.api.asn1.ber
import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
import org.apache.directory.api.ldap.model.entry.DefaultModification;
@@ -591,7 +591,7 @@ public class ModifyRequestDecorator exte
try
{
// The AddRequest Tag
- buffer.put( LdapConstants.MODIFY_REQUEST_TAG );
+ buffer.put( LdapCodecConstants.MODIFY_REQUEST_TAG );
buffer.put( TLV.getBytes( getModifyRequestLength() ) );
// The entry
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyResponseDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyResponseDecorator.java Sat Jan 10 09:22:12 2015
@@ -27,7 +27,7 @@ import org.apache.directory.api.asn1.Enc
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.model.message.ModifyResponse;
@@ -110,7 +110,7 @@ public class ModifyResponseDecorator ext
try
{
// The ModifyResponse Tag
- buffer.put( LdapConstants.MODIFY_RESPONSE_TAG );
+ buffer.put( LdapCodecConstants.MODIFY_RESPONSE_TAG );
buffer.put( TLV.getBytes( getModifyResponseLength() ) );
// The LdapResult
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchRequestDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchRequestDecorator.java Sat Jan 10 09:22:12 2015
@@ -34,7 +34,7 @@ import org.apache.directory.api.asn1.ber
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.AttributeValueAssertion;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.codec.api.MessageDecorator;
import org.apache.directory.api.ldap.codec.search.AndFilter;
@@ -409,22 +409,22 @@ public class SearchRequestDecorator exte
// Transform =, >=, <=, ~= filters
switch ( ( ( AttributeValueAssertionFilter ) filter ).getFilterType() )
{
- case LdapConstants.EQUALITY_MATCH_FILTER:
+ case LdapCodecConstants.EQUALITY_MATCH_FILTER:
branch = new EqualityNode( ava.getAttributeDesc(), ava.getAssertionValue() );
break;
- case LdapConstants.GREATER_OR_EQUAL_FILTER:
+ case LdapCodecConstants.GREATER_OR_EQUAL_FILTER:
branch = new GreaterEqNode( ava.getAttributeDesc(), ava.getAssertionValue() );
break;
- case LdapConstants.LESS_OR_EQUAL_FILTER:
+ case LdapCodecConstants.LESS_OR_EQUAL_FILTER:
branch = new LessEqNode( ava.getAttributeDesc(), ava.getAssertionValue() );
break;
- case LdapConstants.APPROX_MATCH_FILTER:
+ case LdapCodecConstants.APPROX_MATCH_FILTER:
branch = new ApproximateNode( ava.getAttributeDesc(), ava.getAssertionValue() );
break;
@@ -546,7 +546,7 @@ public class SearchRequestDecorator exte
{
if ( exprNode instanceof EqualityNode<?> )
{
- filter = new AttributeValueAssertionFilter( LdapConstants.EQUALITY_MATCH_FILTER );
+ filter = new AttributeValueAssertionFilter( LdapCodecConstants.EQUALITY_MATCH_FILTER );
AttributeValueAssertion assertion = new AttributeValueAssertion();
assertion.setAttributeDesc( ( ( EqualityNode<?> ) exprNode ).getAttribute() );
assertion.setAssertionValue( ( ( EqualityNode<?> ) exprNode ).getValue() );
@@ -554,7 +554,7 @@ public class SearchRequestDecorator exte
}
else if ( exprNode instanceof GreaterEqNode<?> )
{
- filter = new AttributeValueAssertionFilter( LdapConstants.GREATER_OR_EQUAL_FILTER );
+ filter = new AttributeValueAssertionFilter( LdapCodecConstants.GREATER_OR_EQUAL_FILTER );
AttributeValueAssertion assertion = new AttributeValueAssertion();
assertion.setAttributeDesc( ( ( GreaterEqNode<?> ) exprNode ).getAttribute() );
assertion.setAssertionValue( ( ( GreaterEqNode<?> ) exprNode ).getValue() );
@@ -562,7 +562,7 @@ public class SearchRequestDecorator exte
}
else if ( exprNode instanceof LessEqNode<?> )
{
- filter = new AttributeValueAssertionFilter( LdapConstants.LESS_OR_EQUAL_FILTER );
+ filter = new AttributeValueAssertionFilter( LdapCodecConstants.LESS_OR_EQUAL_FILTER );
AttributeValueAssertion assertion = new AttributeValueAssertion();
assertion.setAttributeDesc( ( ( LessEqNode<?> ) exprNode ).getAttribute() );
assertion.setAssertionValue( ( ( LessEqNode<?> ) exprNode ).getValue() );
@@ -570,7 +570,7 @@ public class SearchRequestDecorator exte
}
else if ( exprNode instanceof ApproximateNode<?> )
{
- filter = new AttributeValueAssertionFilter( LdapConstants.APPROX_MATCH_FILTER );
+ filter = new AttributeValueAssertionFilter( LdapCodecConstants.APPROX_MATCH_FILTER );
AttributeValueAssertion assertion = new AttributeValueAssertion();
assertion.setAttributeDesc( ( ( ApproximateNode<?> ) exprNode ).getAttribute() );
assertion.setAssertionValue( ( ( ApproximateNode<?> ) exprNode ).getValue() );
@@ -1015,7 +1015,7 @@ public class SearchRequestDecorator exte
try
{
// The SearchRequest Tag
- buffer.put( LdapConstants.SEARCH_REQUEST_TAG );
+ buffer.put( LdapCodecConstants.SEARCH_REQUEST_TAG );
buffer.put( TLV.getBytes( getSearchRequestLength() ) );
// The baseObject
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultDoneDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultDoneDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultDoneDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultDoneDecorator.java Sat Jan 10 09:22:12 2015
@@ -27,7 +27,7 @@ import org.apache.directory.api.asn1.Enc
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.model.message.SearchResultDone;
@@ -110,7 +110,7 @@ public class SearchResultDoneDecorator e
try
{
// The searchResultDone Tag
- buffer.put( LdapConstants.SEARCH_RESULT_DONE_TAG );
+ buffer.put( LdapCodecConstants.SEARCH_RESULT_DONE_TAG );
buffer.put( TLV.getBytes( getSearchResultDoneLength() ) );
// The LdapResult
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultEntryDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultEntryDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultEntryDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultEntryDecorator.java Sat Jan 10 09:22:12 2015
@@ -31,7 +31,7 @@ import org.apache.directory.api.asn1.ber
import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.codec.api.MessageDecorator;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
@@ -435,7 +435,7 @@ public class SearchResultEntryDecorator
try
{
// The SearchResultEntry Tag
- buffer.put( LdapConstants.SEARCH_RESULT_ENTRY_TAG );
+ buffer.put( LdapCodecConstants.SEARCH_RESULT_ENTRY_TAG );
buffer.put( TLV.getBytes( getSearchResultEntryLength() ) );
// The objectName
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultReferenceDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultReferenceDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultReferenceDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultReferenceDecorator.java Sat Jan 10 09:22:12 2015
@@ -28,7 +28,7 @@ import org.apache.directory.api.asn1.ber
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.codec.api.LdapEncoder;
import org.apache.directory.api.ldap.codec.api.MessageDecorator;
import org.apache.directory.api.ldap.model.message.Referral;
@@ -186,7 +186,7 @@ public class SearchResultReferenceDecora
try
{
// The SearchResultReference Tag
- buffer.put( LdapConstants.SEARCH_RESULT_REFERENCE_TAG );
+ buffer.put( LdapCodecConstants.SEARCH_RESULT_REFERENCE_TAG );
buffer.put( TLV.getBytes( getSearchResultReferenceLength() ) );
// The referrals, if any
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/UnbindRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/UnbindRequestDecorator.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/UnbindRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/UnbindRequestDecorator.java Sat Jan 10 09:22:12 2015
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.message.UnbindRequest;
@@ -111,7 +111,7 @@ public class UnbindRequestDecorator exte
try
{
// The tag
- buffer.put( LdapConstants.UNBIND_REQUEST_TAG );
+ buffer.put( LdapCodecConstants.UNBIND_REQUEST_TAG );
// The length is always null.
buffer.put( ( byte ) 0 );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AndFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AndFilter.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AndFilter.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AndFilter.java Sat Jan 10 09:22:12 2015
@@ -27,7 +27,7 @@ import java.util.List;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
/**
@@ -108,7 +108,7 @@ public class AndFilter extends Connector
try
{
// The AndFilter Tag
- buffer.put( ( byte ) LdapConstants.AND_FILTER_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.AND_FILTER_TAG );
buffer.put( TLV.getBytes( filtersLength ) );
}
catch ( BufferOverflowException boe )
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AttributeValueAssertionFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AttributeValueAssertionFilter.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AttributeValueAssertionFilter.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AttributeValueAssertionFilter.java Sat Jan 10 09:22:12 2015
@@ -28,7 +28,7 @@ import org.apache.directory.api.asn1.ber
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.AttributeValueAssertion;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
/**
@@ -193,20 +193,20 @@ public class AttributeValueAssertionFilt
// The AttributeValueAssertion Tag
switch ( filterType )
{
- case LdapConstants.EQUALITY_MATCH_FILTER:
- buffer.put( ( byte ) LdapConstants.EQUALITY_MATCH_FILTER_TAG );
+ case LdapCodecConstants.EQUALITY_MATCH_FILTER:
+ buffer.put( ( byte ) LdapCodecConstants.EQUALITY_MATCH_FILTER_TAG );
break;
- case LdapConstants.LESS_OR_EQUAL_FILTER:
- buffer.put( ( byte ) LdapConstants.LESS_OR_EQUAL_FILTER_TAG );
+ case LdapCodecConstants.LESS_OR_EQUAL_FILTER:
+ buffer.put( ( byte ) LdapCodecConstants.LESS_OR_EQUAL_FILTER_TAG );
break;
- case LdapConstants.GREATER_OR_EQUAL_FILTER:
- buffer.put( ( byte ) LdapConstants.GREATER_OR_EQUAL_FILTER_TAG );
+ case LdapCodecConstants.GREATER_OR_EQUAL_FILTER:
+ buffer.put( ( byte ) LdapCodecConstants.GREATER_OR_EQUAL_FILTER_TAG );
break;
- case LdapConstants.APPROX_MATCH_FILTER:
- buffer.put( ( byte ) LdapConstants.APPROX_MATCH_FILTER_TAG );
+ case LdapCodecConstants.APPROX_MATCH_FILTER:
+ buffer.put( ( byte ) LdapCodecConstants.APPROX_MATCH_FILTER_TAG );
break;
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/ExtensibleMatchFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/ExtensibleMatchFilter.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/ExtensibleMatchFilter.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/ExtensibleMatchFilter.java Sat Jan 10 09:22:12 2015
@@ -27,7 +27,7 @@ import org.apache.directory.api.asn1.Enc
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.util.Strings;
@@ -268,7 +268,7 @@ public class ExtensibleMatchFilter exten
try
{
// The ExtensibleMatch Tag
- buffer.put( ( byte ) LdapConstants.EXTENSIBLE_MATCH_FILTER_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.EXTENSIBLE_MATCH_FILTER_TAG );
buffer.put( TLV.getBytes( extensibleMatchLength ) );
if ( ( matchingRule == null ) && ( type == null ) )
@@ -279,7 +279,7 @@ public class ExtensibleMatchFilter exten
// The matching rule
if ( matchingRule != null )
{
- buffer.put( ( byte ) LdapConstants.MATCHING_RULE_ID_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.MATCHING_RULE_ID_TAG );
buffer.put( TLV.getBytes( matchingRuleBytes.length ) );
buffer.put( matchingRuleBytes );
}
@@ -287,7 +287,7 @@ public class ExtensibleMatchFilter exten
// The type
if ( type != null )
{
- buffer.put( ( byte ) LdapConstants.MATCHING_RULE_TYPE_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.MATCHING_RULE_TYPE_TAG );
buffer.put( TLV.getBytes( typeBytes.length ) );
buffer.put( typeBytes );
}
@@ -295,7 +295,7 @@ public class ExtensibleMatchFilter exten
// The match value
if ( matchValue != null )
{
- buffer.put( ( byte ) LdapConstants.MATCH_VALUE_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.MATCH_VALUE_TAG );
byte[] bytes = matchValue.getBytes();
int bytesLength = bytes.length;
@@ -311,7 +311,7 @@ public class ExtensibleMatchFilter exten
// The dnAttributes flag, if true only
if ( dnAttributes )
{
- buffer.put( ( byte ) LdapConstants.DN_ATTRIBUTES_FILTER_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.DN_ATTRIBUTES_FILTER_TAG );
buffer.put( ( byte ) 1 );
buffer.put( BerValue.TRUE_VALUE );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/NotFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/NotFilter.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/NotFilter.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/NotFilter.java Sat Jan 10 09:22:12 2015
@@ -27,7 +27,7 @@ import org.apache.directory.api.asn1.Dec
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
/**
@@ -136,7 +136,7 @@ public class NotFilter extends Connector
try
{
// The NotFilter Tag
- buffer.put( ( byte ) LdapConstants.NOT_FILTER_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.NOT_FILTER_TAG );
buffer.put( TLV.getBytes( filtersLength ) );
}
catch ( BufferOverflowException boe )
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/OrFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/OrFilter.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/OrFilter.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/OrFilter.java Sat Jan 10 09:22:12 2015
@@ -27,7 +27,7 @@ import java.util.List;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
/**
@@ -109,7 +109,7 @@ public class OrFilter extends ConnectorF
try
{
// The OrFilter Tag
- buffer.put( ( byte ) LdapConstants.OR_FILTER_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.OR_FILTER_TAG );
buffer.put( TLV.getBytes( filtersLength ) );
}
catch ( BufferOverflowException boe )
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/PresentFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/PresentFilter.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/PresentFilter.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/PresentFilter.java Sat Jan 10 09:22:12 2015
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.util.Strings;
@@ -125,7 +125,7 @@ public class PresentFilter extends Filte
try
{
// The PresentFilter Tag
- buffer.put( ( byte ) LdapConstants.PRESENT_FILTER_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.PRESENT_FILTER_TAG );
buffer.put( TLV.getBytes( attributeDescriptionBytes.length ) );
buffer.put( attributeDescriptionBytes );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/SubstringFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/SubstringFilter.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/SubstringFilter.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/SubstringFilter.java Sat Jan 10 09:22:12 2015
@@ -30,7 +30,7 @@ import org.apache.directory.api.asn1.ber
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.util.Strings;
@@ -292,7 +292,7 @@ public class SubstringFilter extends Fil
try
{
// The SubstringFilter Tag
- buffer.put( ( byte ) LdapConstants.SUBSTRINGS_FILTER_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.SUBSTRINGS_FILTER_TAG );
buffer.put( TLV.getBytes( substringsFilterLength ) );
// The type
@@ -312,7 +312,7 @@ public class SubstringFilter extends Fil
if ( initialSubstrings != null )
{
byte[] initialBytes = Strings.getBytesUtf8( initialSubstrings );
- buffer.put( ( byte ) LdapConstants.SUBSTRINGS_FILTER_INITIAL_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.SUBSTRINGS_FILTER_INITIAL_TAG );
buffer.put( TLV.getBytes( initialBytes.length ) );
buffer.put( initialBytes );
}
@@ -323,7 +323,7 @@ public class SubstringFilter extends Fil
for ( String any : anySubstrings )
{
byte[] anyBytes = Strings.getBytesUtf8( any );
- buffer.put( ( byte ) LdapConstants.SUBSTRINGS_FILTER_ANY_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.SUBSTRINGS_FILTER_ANY_TAG );
buffer.put( TLV.getBytes( anyBytes.length ) );
buffer.put( anyBytes );
}
@@ -333,7 +333,7 @@ public class SubstringFilter extends Fil
if ( finalSubstrings != null )
{
byte[] finalBytes = Strings.getBytesUtf8( finalSubstrings );
- buffer.put( ( byte ) LdapConstants.SUBSTRINGS_FILTER_FINAL_TAG );
+ buffer.put( ( byte ) LdapCodecConstants.SUBSTRINGS_FILTER_FINAL_TAG );
buffer.put( TLV.getBytes( finalBytes.length ) );
buffer.put( finalBytes );
}