directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1332606 [1/2] - in /directory/shared/trunk: asn1/ber/src/main/java/org/apache/directory/shared/asn1/actions/ asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/ asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/ ldap...
Date Tue, 01 May 2012 10:24:33 GMT
Author: elecharny
Date: Tue May  1 10:24:31 2012
New Revision: 1332606

URL: http://svn.apache.org/viewvc?rev=1332606&view=rev
Log:
o Renamed the o.a.directory.shared.asn1.ber.tlv.Value class to BerValue in order to get rid of the FQCN we must use in the decoder to avoid conflics with the Value<?> class
o Added a dnBytes field in the AddRequestDecorator to speed up the encoding of Add requests

Added:
    directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/BerValue.java
      - copied, changed from r1332307, directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java
Removed:
    directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java
Modified:
    directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadInteger.java
    directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadOctetString.java
    directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java
    directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/BooleanDecoder.java
    directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/IntegerDecoder.java
    directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/LongDecoder.java
    directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLV.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/abandonRequest/InitAbandonRequest.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/bindRequest/StoreVersion.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/controls/StoreControlCriticality.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/controls/StoreControlValue.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapMessage/StoreMessageId.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapResult/StoreResultCode.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/modifyDnRequest/StoreModifyDnRequestDeleteOldRdn.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestDerefAlias.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestScope.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestSizeLimit.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestTimeLimit.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestTypesOnly.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/filter/StoreMatchingRuleDnAttributes.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapEncoder.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeGrammar.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchGrammar.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesGrammar.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/search/ExtensibleMatchFilter.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/search/SubstringFilter.java

Modified: directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadInteger.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadInteger.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadInteger.java (original)
+++ directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadInteger.java Tue May  1 10:24:31 2012
@@ -26,7 +26,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
@@ -109,7 +109,7 @@ public abstract class AbstractReadIntege
             throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
         }
 
-        Value value = tlv.getValue();
+        BerValue value = tlv.getValue();
 
         try
         {

Modified: directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadOctetString.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadOctetString.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadOctetString.java (original)
+++ directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/actions/AbstractReadOctetString.java Tue May  1 10:24:31 2012
@@ -24,7 +24,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.Asn1Container;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -96,7 +96,7 @@ public abstract class AbstractReadOctetS
             throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
         }
 
-        Value value = tlv.getValue();
+        BerValue value = tlv.getValue();
 
         // The data should not be null
         if ( ( value.getData() == null ) && ( !canBeNull ) )

Modified: directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java (original)
+++ directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java Tue May  1 10:24:31 2012
@@ -26,7 +26,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.TLVBerDecoderMBean;
 import org.apache.directory.shared.asn1.ber.tlv.TLVStateEnum;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.asn1.util.Asn1StringUtils;
 import org.apache.directory.shared.i18n.I18n;
 import org.slf4j.Logger;
@@ -168,7 +168,7 @@ public class Asn1Decoder implements TLVB
             parent = parent.getParent();
         }
 
-        Value value = current.getValue();
+        BerValue value = current.getValue();
 
         if ( ( value != null ) && ( value.getData() != null ) )
         {

Copied: directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/BerValue.java (from r1332307, directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/BerValue.java?p2=directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/BerValue.java&p1=directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java&r1=1332307&r2=1332606&rev=1332606&view=diff
==============================================================================
--- directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java (original)
+++ directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/BerValue.java Tue May  1 10:24:31 2012
@@ -35,7 +35,7 @@ import org.apache.directory.shared.i18n.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class Value
+public class BerValue
 {
     /** The data buffer. */
     private byte[] data;
@@ -105,7 +105,7 @@ public class Value
      *
      * @param value the associated value
      */
-    public Value( byte[] value )
+    public BerValue( byte[] value )
     {
         // Do a copy of the byte array
         data = new byte[value.length];
@@ -117,7 +117,7 @@ public class Value
     /**
      * The default constructor.
      */
-    public Value()
+    public BerValue()
     {
         data = null;
         currentPos = 0;

Modified: directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/BooleanDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/BooleanDecoder.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/BooleanDecoder.java (original)
+++ directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/BooleanDecoder.java Tue May  1 10:24:31 2012
@@ -44,7 +44,7 @@ public final class BooleanDecoder
      * @return A boolean.
      * @throws BooleanDecoderException Thrown if the Value does not contains a boolean
      */
-    public static boolean parse( Value value ) throws BooleanDecoderException
+    public static boolean parse( BerValue value ) throws BooleanDecoderException
     {
         byte[] bytes = value.getData();
 

Modified: directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/IntegerDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/IntegerDecoder.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/IntegerDecoder.java (original)
+++ directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/IntegerDecoder.java Tue May  1 10:24:31 2012
@@ -46,7 +46,7 @@ public final class IntegerDecoder
      * @return An integer
      * @throws IntegerDecoderException Thrown if the byte[] does not contains an integer
      */
-    public static int parse( Value value, int min, int max ) throws IntegerDecoderException
+    public static int parse( BerValue value, int min, int max ) throws IntegerDecoderException
     {
         int result = parseInt( value );
 
@@ -68,7 +68,7 @@ public final class IntegerDecoder
      * @return An integer
      * @throws IntegerDecoderException Thrown if the byte stream does not contains an integer
      */
-    public static int parse( Value value ) throws IntegerDecoderException
+    public static int parse( BerValue value ) throws IntegerDecoderException
     {
         return parseInt( value );
     }
@@ -78,7 +78,7 @@ public final class IntegerDecoder
      * Helper method used to parse the integer. We don't check any minimal or maximal
      * bound.
      */
-    private static int parseInt( Value value ) throws IntegerDecoderException
+    private static int parseInt( BerValue value ) throws IntegerDecoderException
     {
         int result = 0;
 

Modified: directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/LongDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/LongDecoder.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/LongDecoder.java (original)
+++ directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/LongDecoder.java Tue May  1 10:24:31 2012
@@ -46,7 +46,7 @@ public final class LongDecoder
      * @return An integer
      * @throws LongDecoderException Thrown if the byte stream does not contains an integer
      */
-    public static long parse( Value value, long min, long max ) throws LongDecoderException
+    public static long parse( BerValue value, long min, long max ) throws LongDecoderException
     {
         long result = parseLong( value );
 
@@ -68,7 +68,7 @@ public final class LongDecoder
      * @return An integer
      * @throws LongDecoderException Thrown if the byte stream does not contains an integer
      */
-    public static long parse( Value value ) throws LongDecoderException
+    public static long parse( BerValue value ) throws LongDecoderException
     {
         return parseLong( value );
     }
@@ -78,7 +78,7 @@ public final class LongDecoder
      * Helper method used to parse the long. We don't check any minimal or maximal
      * bound.
      */
-    public static long parseLong( Value value ) throws LongDecoderException
+    public static long parseLong( BerValue value ) throws LongDecoderException
     {
         long result = 0;
 

Modified: directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLV.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLV.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLV.java (original)
+++ directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLV.java Tue May  1 10:24:31 2012
@@ -43,7 +43,7 @@ public class TLV
     private int lengthBytesRead;
 
     /** The current Value being processed */
-    private Value value;
+    private BerValue value;
 
     /** An identity for the TLV. It store the TLV hashCode */
     private int id;
@@ -106,7 +106,7 @@ public class TLV
         tag = 0;
         length = 0;
         lengthNbBytes = 0;
-        value = new Value();
+        value = new BerValue();
         this.id = id;
 
         expectedLength = 0;
@@ -198,7 +198,7 @@ public class TLV
     /**
      * @return Returns the value.
      */
-    public Value getValue()
+    public BerValue getValue()
     {
         return value;
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/abandonRequest/InitAbandonRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/abandonRequest/InitAbandonRequest.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/abandonRequest/InitAbandonRequest.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/abandonRequest/InitAbandonRequest.java Tue May  1 10:24:31 2012
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.decorators.AbandonRequestDecorator;
@@ -78,7 +78,7 @@ public class InitAbandonRequest extends 
         // We get it and store it in MessageId
         TLV tlv = container.getCurrentTLV();
 
-        Value value = tlv.getValue();
+        BerValue value = tlv.getValue();
 
         if ( ( value == null ) || ( value.getData() == null ) )
         {

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/bindRequest/StoreVersion.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/bindRequest/StoreVersion.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/bindRequest/StoreVersion.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/bindRequest/StoreVersion.java Tue May  1 10:24:31 2012
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.decorators.BindRequestDecorator;
@@ -73,7 +73,7 @@ public class StoreVersion extends Gramma
         // We get it and store it in Version
         TLV tlv = container.getCurrentTLV();
 
-        Value value = tlv.getValue();
+        BerValue value = tlv.getValue();
 
         try
         {

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/controls/StoreControlCriticality.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/controls/StoreControlCriticality.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/controls/StoreControlCriticality.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/controls/StoreControlCriticality.java Tue May  1 10:24:31 2012
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.BooleanDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.BooleanDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
@@ -85,7 +85,7 @@ public class StoreControlCriticality ext
         // something
         // which is not 0, it will be interpreted as TRUE, but we
         // will generate a warning.
-        Value value = tlv.getValue();
+        BerValue value = tlv.getValue();
 
         try
         {

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/controls/StoreControlValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/controls/StoreControlValue.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/controls/StoreControlValue.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/controls/StoreControlValue.java Tue May  1 10:24:31 2012
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.ldap.codec.api.CodecControl;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
@@ -76,7 +76,7 @@ public class StoreControlValue extends G
         CodecControl<? extends Control> control = message.getCurrentControl();
 
         // Get the current control
-        Value value = tlv.getValue();
+        BerValue value = tlv.getValue();
 
         // Store the value - have to handle the special case of a 0 length value
         if ( tlv.getLength() == 0 )

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapMessage/StoreMessageId.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapMessage/StoreMessageId.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapMessage/StoreMessageId.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapMessage/StoreMessageId.java Tue May  1 10:24:31 2012
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
@@ -87,7 +87,7 @@ public class StoreMessageId extends Gram
             throw new DecoderException( I18n.err( I18n.ERR_04069 ) );
         }
 
-        Value value = tlv.getValue();
+        BerValue value = tlv.getValue();
 
         try
         {

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapResult/StoreResultCode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapResult/StoreResultCode.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapResult/StoreResultCode.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapResult/StoreResultCode.java Tue May  1 10:24:31 2012
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
@@ -74,7 +74,7 @@ public class StoreResultCode extends Gra
         // We get it and store it in MessageId
         TLV tlv = container.getCurrentTLV();
 
-        Value value = tlv.getValue();
+        BerValue value = tlv.getValue();
         ResultCodeEnum resultCode = ResultCodeEnum.SUCCESS;
 
         try

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/modifyDnRequest/StoreModifyDnRequestDeleteOldRdn.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/modifyDnRequest/StoreModifyDnRequestDeleteOldRdn.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/modifyDnRequest/StoreModifyDnRequestDeleteOldRdn.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/modifyDnRequest/StoreModifyDnRequestDeleteOldRdn.java Tue May  1 10:24:31 2012
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.BooleanDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.BooleanDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.decorators.ModifyDnRequestDecorator;
@@ -78,7 +78,7 @@ public class StoreModifyDnRequestDeleteO
         // something
         // which is not 0, it will be interpreted as TRUE, but we
         // will generate a warning.
-        Value value = tlv.getValue();
+        BerValue value = tlv.getValue();
 
         try
         {

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestDerefAlias.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestDerefAlias.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestDerefAlias.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestDerefAlias.java Tue May  1 10:24:31 2012
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
@@ -78,7 +78,7 @@ public class StoreSearchRequestDerefAlia
         TLV tlv = container.getCurrentTLV();
 
         // We have to check that this is a correct derefAliases
-        Value value = tlv.getValue();
+        BerValue value = tlv.getValue();
         int derefAliases = 0;
 
         try

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestScope.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestScope.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestScope.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestScope.java Tue May  1 10:24:31 2012
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
@@ -77,7 +77,7 @@ public class StoreSearchRequestScope ext
         TLV tlv = container.getCurrentTLV();
 
         // We have to check that this is a correct scope
-        Value value = tlv.getValue();
+        BerValue value = tlv.getValue();
         int scope = 0;
 
         try

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestSizeLimit.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestSizeLimit.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestSizeLimit.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestSizeLimit.java Tue May  1 10:24:31 2012
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.LongDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.LongDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.decorators.SearchRequestDecorator;
@@ -73,7 +73,7 @@ public class StoreSearchRequestSizeLimit
 
         // The current TLV should be a integer
         // We get it and store it in sizeLimit
-        Value value = tlv.getValue();
+        BerValue value = tlv.getValue();
         long sizeLimit = 0;
 
         try

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestTimeLimit.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestTimeLimit.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestTimeLimit.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestTimeLimit.java Tue May  1 10:24:31 2012
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.decorators.SearchRequestDecorator;
@@ -73,7 +73,7 @@ public class StoreSearchRequestTimeLimit
 
         // The current TLV should be a integer
         // We get it and store it in timeLimit
-        Value value = tlv.getValue();
+        BerValue value = tlv.getValue();
 
         int timeLimit = 0;
 

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestTypesOnly.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestTypesOnly.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestTypesOnly.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/StoreSearchRequestTypesOnly.java Tue May  1 10:24:31 2012
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.BooleanDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.BooleanDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.decorators.SearchRequestDecorator;
@@ -78,7 +78,7 @@ public class StoreSearchRequestTypesOnly
         // something
         // which is not 0, it will be interpreted as TRUE, but we
         // will generate a warning.
-        Value value = tlv.getValue();
+        BerValue value = tlv.getValue();
 
         try
         {

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/filter/StoreMatchingRuleDnAttributes.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/filter/StoreMatchingRuleDnAttributes.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/filter/StoreMatchingRuleDnAttributes.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchRequest/filter/StoreMatchingRuleDnAttributes.java Tue May  1 10:24:31 2012
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.BooleanDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.BooleanDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.decorators.SearchRequestDecorator;
@@ -81,7 +81,7 @@ public class StoreMatchingRuleDnAttribut
         // something
         // which is not 0, it will be interpreted as TRUE, but we
         // will generate a warning.
-        Value value = tlv.getValue();
+        BerValue value = tlv.getValue();
 
         try
         {

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapEncoder.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapEncoder.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapEncoder.java Tue May  1 10:24:31 2012
@@ -28,7 +28,7 @@ import java.util.Map;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.Message;
@@ -117,12 +117,12 @@ public class LdapEncoder
         }
 
         // The control type
-        Value.encode( buffer, control.getOid().getBytes() );
+        BerValue.encode( buffer, control.getOid().getBytes() );
 
         // The control criticality, if true
         if ( control.isCritical() )
         {
-            Value.encode( buffer, control.isCritical() );
+            BerValue.encode( buffer, control.isCritical() );
         }
 
         return buffer;
@@ -175,7 +175,7 @@ public class LdapEncoder
             }
 
             // The message Id
-            Value.encode( buffer, message.getMessageId() );
+            BerValue.encode( buffer, message.getMessageId() );
 
             // Add the protocolOp part
             decorator.encode( buffer );
@@ -241,7 +241,7 @@ public class LdapEncoder
         // - the tag (0x02), 1 byte
         // - the length of the Id length, 1 byte
         // - the Id length, 1 to 4 bytes
-        int ldapMessageLength = 1 + 1 + Value.getNbBytes( messageDecorator.getDecorated().getMessageId() );
+        int ldapMessageLength = 1 + 1 + BerValue.getNbBytes( messageDecorator.getDecorated().getMessageId() );
 
         // Get the protocolOp length
         ldapMessageLength += messageDecorator.computeLength();
@@ -321,7 +321,7 @@ public class LdapEncoder
             for ( byte[] ldapUrlBytes : ldapUrlsBytes )
             {
                 // Encode the current referral
-                Value.encode( buffer, ldapUrlBytes );
+                BerValue.encode( buffer, ldapUrlBytes );
             }
         }
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java Tue May  1 10:24:31 2012
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
@@ -118,7 +118,7 @@ public class EntryChangeDecorator extend
 
         if ( getChangeNumber() != UNDEFINED_CHANGE_NUMBER )
         {
-            changeNumberLength = 1 + 1 + Value.getNbBytes( getChangeNumber() );
+            changeNumberLength = 1 + 1 + BerValue.getNbBytes( getChangeNumber() );
         }
 
         eccSeqLength = changeTypesLength + previousDnLength + changeNumberLength;
@@ -147,16 +147,16 @@ public class EntryChangeDecorator extend
 
         buffer.put( UniversalTag.ENUMERATED.getValue() );
         buffer.put( ( byte ) 1 );
-        buffer.put( Value.getBytes( getChangeType().getValue() ) );
+        buffer.put( BerValue.getBytes( getChangeType().getValue() ) );
 
         if ( getPreviousDn() != null )
         {
-            Value.encode( buffer, previousDnBytes );
+            BerValue.encode( buffer, previousDnBytes );
         }
 
         if ( getChangeNumber() != UNDEFINED_CHANGE_NUMBER )
         {
-            Value.encode( buffer, getChangeNumber() );
+            BerValue.encode( buffer, getChangeNumber() );
         }
 
         return buffer;
@@ -180,16 +180,16 @@ public class EntryChangeDecorator extend
 
                 buffer.put( UniversalTag.ENUMERATED.getValue() );
                 buffer.put( ( byte ) 1 );
-                buffer.put( Value.getBytes( getChangeType().getValue() ) );
+                buffer.put( BerValue.getBytes( getChangeType().getValue() ) );
 
                 if ( getPreviousDn() != null )
                 {
-                    Value.encode( buffer, previousDnBytes );
+                    BerValue.encode( buffer, previousDnBytes );
                 }
 
                 if ( getChangeNumber() != UNDEFINED_CHANGE_NUMBER )
                 {
-                    Value.encode( buffer, getChangeNumber() );
+                    BerValue.encode( buffer, getChangeNumber() );
                 }
 
                 value = buffer.array();

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeGrammar.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeGrammar.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeGrammar.java Tue May  1 10:24:31 2012
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.LongDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.LongDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.message.controls.ChangeType;
@@ -97,7 +97,7 @@ public final class EntryChangeGrammar ex
                 {
                     public void action( EntryChangeContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         try
                         {
@@ -168,7 +168,7 @@ public final class EntryChangeGrammar ex
                         }
                         else
                         {
-                            Value value = container.getCurrentTLV().getValue();
+                            BerValue value = container.getCurrentTLV().getValue();
                             Dn previousDn;
 
                             try
@@ -200,7 +200,7 @@ public final class EntryChangeGrammar ex
         {
             public void action( EntryChangeContainer container ) throws DecoderException
             {
-                Value value = container.getCurrentTLV().getValue();
+                BerValue value = container.getCurrentTLV().getValue();
 
                 try
                 {

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java Tue May  1 10:24:31 2012
@@ -29,7 +29,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
@@ -89,7 +89,7 @@ public class PagedResultsDecorator exten
      */
     public int computeLength()
     {
-        int sizeLength = 1 + 1 + Value.getNbBytes( getSize() );
+        int sizeLength = 1 + 1 + BerValue.getNbBytes( getSize() );
 
         int cookieLength;
 
@@ -127,8 +127,8 @@ public class PagedResultsDecorator exten
         buffer.put( UniversalTag.SEQUENCE.getValue() );
         buffer.put( TLV.getBytes( pscSeqLength ) );
 
-        Value.encode( buffer, getSize() );
-        Value.encode( buffer, getCookie() );
+        BerValue.encode( buffer, getSize() );
+        BerValue.encode( buffer, getCookie() );
 
         return buffer;
     }
@@ -150,8 +150,8 @@ public class PagedResultsDecorator exten
                 buffer.put( UniversalTag.SEQUENCE.getValue() );
                 buffer.put( TLV.getBytes( pscSeqLength ) );
 
-                Value.encode( buffer, getSize() );
-                Value.encode( buffer, getCookie() );
+                BerValue.encode( buffer, getSize() );
+                BerValue.encode( buffer, getCookie() );
 
                 value = buffer.array();
             }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java Tue May  1 10:24:31 2012
@@ -26,7 +26,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
 import org.apache.directory.shared.i18n.I18n;
@@ -100,7 +100,7 @@ public final class PagedResultsGrammar e
                 {
                     public void action( PagedResultsContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         try
                         {
@@ -146,7 +146,7 @@ public final class PagedResultsGrammar e
                 {
                     public void action( PagedResultsContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         if ( container.getCurrentTLV().getLength() == 0 )
                         {

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java Tue May  1 10:24:31 2012
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
@@ -89,7 +89,7 @@ public class PersistentSearchDecorator e
      */
     public int computeLength()
     {
-        int changeTypesLength = 1 + 1 + Value.getNbBytes( getChangeTypes() );
+        int changeTypesLength = 1 + 1 + BerValue.getNbBytes( getChangeTypes() );
         int changesOnlyLength = 1 + 1 + 1;
         int returnRCsLength = 1 + 1 + 1;
 
@@ -118,9 +118,9 @@ public class PersistentSearchDecorator e
         buffer.put( UniversalTag.SEQUENCE.getValue() );
         buffer.put( TLV.getBytes( psearchSeqLength ) );
 
-        Value.encode( buffer, getChangeTypes() );
-        Value.encode( buffer, isChangesOnly() );
-        Value.encode( buffer, isReturnECs() );
+        BerValue.encode( buffer, getChangeTypes() );
+        BerValue.encode( buffer, isChangesOnly() );
+        BerValue.encode( buffer, isReturnECs() );
 
         return buffer;
     }
@@ -142,9 +142,9 @@ public class PersistentSearchDecorator e
                 buffer.put( UniversalTag.SEQUENCE.getValue() );
                 buffer.put( TLV.getBytes( psearchSeqLength ) );
 
-                Value.encode( buffer, getChangeTypes() );
-                Value.encode( buffer, isChangesOnly() );
-                Value.encode( buffer, isReturnECs() );
+                BerValue.encode( buffer, getChangeTypes() );
+                BerValue.encode( buffer, isChangesOnly() );
+                BerValue.encode( buffer, isReturnECs() );
 
                 value = buffer.array();
             }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchGrammar.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchGrammar.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchGrammar.java Tue May  1 10:24:31 2012
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch;
 import org.slf4j.Logger;
@@ -108,7 +108,7 @@ public final class PersistentSearchGramm
                 {
                     public void action( PersistentSearchContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         try
                         {
@@ -149,7 +149,7 @@ public final class PersistentSearchGramm
                 {
                     public void action( PersistentSearchContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         try
                         {
@@ -187,7 +187,7 @@ public final class PersistentSearchGramm
                 {
                     public void action( PersistentSearchContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         try
                         {

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java Tue May  1 10:24:31 2012
@@ -26,7 +26,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
@@ -91,7 +91,7 @@ public class SubentriesDecorator extends
         }
 
         // Now encode the Subentries specific part
-        Value.encode( buffer, isVisible() );
+        BerValue.encode( buffer, isVisible() );
 
         return buffer;
     }
@@ -110,7 +110,7 @@ public class SubentriesDecorator extends
                 ByteBuffer buffer = ByteBuffer.allocate( valueLength );
 
                 // Now encode the Subentries specific part
-                Value.encode( buffer, isVisible() );
+                BerValue.encode( buffer, isVisible() );
 
                 value = buffer.array();
             }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesGrammar.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesGrammar.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesGrammar.java Tue May  1 10:24:31 2012
@@ -27,7 +27,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.asn1.ber.tlv.BooleanDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.BooleanDecoderException;
 import org.apache.directory.shared.i18n.I18n;
@@ -77,7 +77,7 @@ public final class SubentriesGrammar ext
                         // something
                         // which is not 0, it will be interpreted as TRUE, but we
                         // will generate a warning.
-                        Value value = tlv.getValue();
+                        BerValue value = tlv.getValue();
 
                         try
                         {

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java Tue May  1 10:24:31 2012
@@ -24,7 +24,7 @@ import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 import org.apache.directory.shared.asn1.EncoderException;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
@@ -130,10 +130,10 @@ public final class AbandonRequestDecorat
 
             // The length. It has to be evaluated depending on
             // the abandoned messageId value.
-            buffer.put( ( byte ) Value.getNbBytes( getAbandoned() ) );
+            buffer.put( ( byte ) BerValue.getNbBytes( getAbandoned() ) );
 
             // The abandoned messageId
-            buffer.put( Value.getBytes( getAbandoned() ) );
+            buffer.put( BerValue.getBytes( getAbandoned() ) );
         }
         catch ( BufferOverflowException boe )
         {
@@ -155,7 +155,7 @@ public final class AbandonRequestDecorat
      */
     public int computeLength()
     {
-        int length = 1 + 1 + Value.getNbBytes( getAbandoned() );
+        int length = 1 + 1 + BerValue.getNbBytes( getAbandoned() );
 
         return length;
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java Tue May  1 10:24:31 2012
@@ -6,16 +6,16 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 package org.apache.directory.shared.ldap.codec.decorators;
 
@@ -26,6 +26,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 import org.apache.directory.shared.asn1.EncoderException;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.i18n.I18n;
@@ -66,6 +67,9 @@ public final class AddRequestDecorator e
 
     /** The current attribute being decoded */
     private Attribute currentAttribute;
+    
+    /** The bytes containing the Dn */
+    private byte[] dnBytes;
 
 
     /**
@@ -351,7 +355,8 @@ public final class AddRequestDecorator e
             throw new IllegalArgumentException( I18n.err( I18n.ERR_04481_ENTRY_NULL_VALUE ) );
         }
 
-        int dnLen = Strings.getBytesUtf8( entry.getDn().getName() ).length;
+        dnBytes = Strings.getBytesUtf8( entry.getDn().getName() );
+        int dnLen = dnBytes.length;
         
         // The entry Dn
         int addRequestLength = 1 + TLV.getNbBytes( dnLen ) + dnLen;
@@ -379,7 +384,7 @@ public final class AddRequestDecorator e
                 {
                     localValuesLength = 0;
 
-                    for ( org.apache.directory.shared.ldap.model.entry.Value<?> value : attribute )
+                    for ( Value<?> value : attribute )
                     {
                         int valueLength = value.getBytes().length;
                         localValuesLength += 1 + TLV.getNbBytes( valueLength ) + valueLength;
@@ -409,7 +414,7 @@ public final class AddRequestDecorator e
 
 
     /**
-     * Encode the AddRequest message to a PDU. 
+     * Encode the AddRequest message to a PDU.
      * 
      * AddRequest :
      * 
@@ -420,15 +425,15 @@ public final class AddRequestDecorator e
      *       0x04 LL attributeDescription
      *       0x31 LL attributeValues
      *         0x04 LL attributeValue
-     *         ... 
+     *         ...
      *         0x04 LL attributeValue
-     *     ... 
+     *     ...
      *     0x30 LL attributeList
      *       0x04 LL attributeDescription
      *       0x31 LL attributeValue
      *         0x04 LL attributeValue
-     *         ... 
-     *         0x04 LL attributeValue 
+     *         ...
+     *         0x04 LL attributeValue
      * 
      * @param buffer The buffer where to put the PDU
      */
@@ -441,7 +446,7 @@ public final class AddRequestDecorator e
             buffer.put( TLV.getBytes( getAddRequestLength() ) );
 
             // The entry
-            org.apache.directory.shared.asn1.ber.tlv.Value.encode( buffer, Strings.getBytesUtf8( getDecorated().getEntryDn().getName() ) );
+            BerValue.encode( buffer, dnBytes );
 
             // The attributes sequence
             buffer.put( UniversalTag.SEQUENCE.getValue() );
@@ -463,7 +468,7 @@ public final class AddRequestDecorator e
                     buffer.put( TLV.getBytes( localAttributeLength ) );
 
                     // The attribute type
-                    org.apache.directory.shared.asn1.ber.tlv.Value.encode( buffer, attribute.getUpId() );
+                    BerValue.encode( buffer, attribute.getUpId() );
 
                     // The values
                     buffer.put( UniversalTag.SET.getValue() );
@@ -472,15 +477,15 @@ public final class AddRequestDecorator e
 
                     if ( attribute.size() != 0 )
                     {
-                        for ( org.apache.directory.shared.ldap.model.entry.Value<?> value : attribute )
+                        for ( Value<?> value : attribute )
                         {
                             if ( value.isHumanReadable() )
                             {
-                                org.apache.directory.shared.asn1.ber.tlv.Value.encode( buffer, value.getString() );
+                                BerValue.encode( buffer, value.getString() );
                             }
                             else
                             {
-                                org.apache.directory.shared.asn1.ber.tlv.Value.encode( buffer, value.getBytes() );
+                                BerValue.encode( buffer, value.getBytes() );
                             }
                         }
                     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java Tue May  1 10:24:31 2012
@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;
 
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
@@ -435,7 +435,7 @@ public class BindRequestDecorator extend
         }
 
         // The version (LDAP V3 only)
-        Value.encode( buffer, 3 );
+        BerValue.encode( buffer, 3 );
 
         Dn dn = getDn();
 
@@ -443,7 +443,7 @@ public class BindRequestDecorator extend
         {
             // A DN has been provided
 
-            Value.encode( buffer, Dn.getBytes( dn ) );
+            BerValue.encode( buffer, Dn.getBytes( dn ) );
         }
         else
         {
@@ -456,7 +456,7 @@ public class BindRequestDecorator extend
                 name = "";
             }
 
-            Value.encode( buffer, name.getBytes() );
+            BerValue.encode( buffer, name.getBytes() );
         }
 
         byte[] credentials = getCredentials();
@@ -503,11 +503,11 @@ public class BindRequestDecorator extend
                 buffer.put( TLV
                     .getBytes( getSaslMechanismLength() + getSaslCredentialsLength() ) );
 
-                Value.encode( buffer, mechanismBytes );
+                BerValue.encode( buffer, mechanismBytes );
 
                 if ( credentials != null )
                 {
-                    Value.encode( buffer, credentials );
+                    BerValue.encode( buffer, credentials );
                 }
             }
             catch ( BufferOverflowException boe )

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java Tue May  1 10:24:31 2012
@@ -6,16 +6,16 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 package org.apache.directory.shared.ldap.codec.decorators;
 
@@ -24,6 +24,7 @@ import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 import org.apache.directory.shared.asn1.EncoderException;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.i18n.I18n;
@@ -270,19 +271,19 @@ public class CompareRequestDecorator ext
     // The Decorator methods
     //-------------------------------------------------------------------------
     /**
-     * Compute the CompareRequest length 
+     * Compute the CompareRequest length
+     * 
+     * CompareRequest :
+     * 0x6E L1
+     *   |
+     *   +--> 0x04 L2 entry
+     *   +--> 0x30 L3 (ava)
+     *         |
+     *         +--> 0x04 L4 attributeDesc
+     *         +--> 0x04 L5 assertionValue
      * 
-     * CompareRequest : 
-     * 0x6E L1 
-     *   | 
-     *   +--> 0x04 L2 entry 
-     *   +--> 0x30 L3 (ava) 
-     *         | 
-     *         +--> 0x04 L4 attributeDesc 
-     *         +--> 0x04 L5 assertionValue 
-     *         
      * L3 = Length(0x04) + Length(L4) + L4 + Length(0x04) +
-     *      Length(L5) + L5 
+     *      Length(L5) + L5
      * Length(CompareRequest) = Length(0x6E) + Length(L1) + L1 +
      *      Length(0x04) + Length(L2) + L2 + Length(0x30) + Length(L3) + L3
      * 
@@ -323,13 +324,13 @@ public class CompareRequestDecorator ext
 
 
     /**
-     * Encode the CompareRequest message to a PDU. 
+     * Encode the CompareRequest message to a PDU.
      * 
-     * CompareRequest : 
-     *   0x6E LL 
-     *     0x04 LL entry 
-     *     0x30 LL attributeValueAssertion 
-     *       0x04 LL attributeDesc 
+     * CompareRequest :
+     *   0x6E LL
+     *     0x04 LL entry
+     *     0x30 LL attributeValueAssertion
+     *       0x04 LL attributeDesc
      *       0x04 LL assertionValue
      * 
      * @param buffer The buffer where to put the PDU
@@ -343,7 +344,7 @@ public class CompareRequestDecorator ext
             buffer.put( TLV.getBytes( getCompareRequestLength() ) );
 
             // The entry
-            org.apache.directory.shared.asn1.ber.tlv.Value.encode( buffer, Dn.getBytes( getName() ) );
+            BerValue.encode( buffer, Dn.getBytes( getName() ) );
 
             // The attributeValueAssertion sequence Tag
             buffer.put( UniversalTag.SEQUENCE.getValue() );
@@ -355,10 +356,10 @@ public class CompareRequestDecorator ext
         }
 
         // The attributeDesc
-        org.apache.directory.shared.asn1.ber.tlv.Value.encode( buffer, getAttrIdBytes() );
+        BerValue.encode( buffer, getAttrIdBytes() );
 
         // The assertionValue
-        org.apache.directory.shared.asn1.ber.tlv.Value.encode( buffer, ( byte[] ) getAttrValBytes() );
+        BerValue.encode( buffer, getAttrValBytes() );
 
         return buffer;
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java Tue May  1 10:24:31 2012
@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;
 
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.Decorator;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
@@ -233,7 +233,7 @@ public class LdapResultDecorator impleme
         int ldapResultLength = 0;
 
         // The result code
-        ldapResultLength = 1 + 1 + Value.getNbBytes( getResultCode().getValue() );
+        ldapResultLength = 1 + 1 + BerValue.getNbBytes( getResultCode().getValue() );
 
         // The matchedDN length
         if ( getMatchedDn() == null )
@@ -280,7 +280,7 @@ public class LdapResultDecorator impleme
         try
         {
             // The result code
-            Value.encodeEnumerated( buffer, getResultCode().getValue() );
+            BerValue.encodeEnumerated( buffer, getResultCode().getValue() );
         }
         catch ( BufferOverflowException boe )
         {
@@ -288,10 +288,10 @@ public class LdapResultDecorator impleme
         }
 
         // The matchedDN
-        Value.encode( buffer, getMatchedDnBytes() );
+        BerValue.encode( buffer, getMatchedDnBytes() );
 
         // The error message
-        Value.encode( buffer, getErrorMessageBytes() );
+        BerValue.encode( buffer, getErrorMessageBytes() );
 
         // The referrals, if any
         Referral referral = getReferral();

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java Tue May  1 10:24:31 2012
@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;
 
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
@@ -281,13 +281,13 @@ public class ModifyDnRequestDecorator ex
 
             // The entry
 
-            Value.encode( buffer, Dn.getBytes( getName() ) );
+            BerValue.encode( buffer, Dn.getBytes( getName() ) );
 
             // The newRDN
-            Value.encode( buffer, getNewRdn().getName() );
+            BerValue.encode( buffer, getNewRdn().getName() );
 
             // The flag deleteOldRdn
-            Value.encode( buffer, getDeleteOldRdn() );
+            BerValue.encode( buffer, getDeleteOldRdn() );
 
             // The new superior, if any
             if ( getNewSuperior() != null )

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java Tue May  1 10:24:31 2012
@@ -29,7 +29,7 @@ import java.util.List;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
@@ -596,7 +596,7 @@ public class ModifyRequestDecorator exte
             buffer.put( TLV.getBytes( getModifyRequestLength() ) );
 
             // The entry
-            Value.encode( buffer, Dn.getBytes( getName() ) );
+            BerValue.encode( buffer, Dn.getBytes( getName() ) );
 
             // The modifications sequence
             buffer.put( UniversalTag.SEQUENCE.getValue() );
@@ -629,7 +629,7 @@ public class ModifyRequestDecorator exte
                     buffer.put( TLV.getBytes( localModificationLength ) );
 
                     // The modification type
-                    Value.encode( buffer, modification.getAttribute().getUpId() );
+                    BerValue.encode( buffer, modification.getAttribute().getUpId() );
 
                     // The values
                     buffer.put( UniversalTag.SET.getValue() );
@@ -642,11 +642,11 @@ public class ModifyRequestDecorator exte
                         {
                             if ( value.isHumanReadable() )
                             {
-                                Value.encode( buffer, value.getString() );
+                                BerValue.encode( buffer, value.getString() );
                             }
                             else
                             {
-                                Value.encode( buffer, value.getBytes() );
+                                BerValue.encode( buffer, value.getBytes() );
                             }
                         }
                     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java Tue May  1 10:24:31 2012
@@ -28,6 +28,7 @@ import java.util.List;
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.Asn1Container;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.i18n.I18n;
@@ -952,10 +953,10 @@ public class SearchRequestDecorator exte
         searchRequestLength += 1 + 1 + 1;
 
         // The sizeLimit
-        searchRequestLength += 1 + 1 + org.apache.directory.shared.asn1.ber.tlv.Value.getNbBytes( getSizeLimit() );
+        searchRequestLength += 1 + 1 + BerValue.getNbBytes( getSizeLimit() );
 
         // The timeLimit
-        searchRequestLength += 1 + 1 + org.apache.directory.shared.asn1.ber.tlv.Value.getNbBytes( getTimeLimit() );
+        searchRequestLength += 1 + 1 + BerValue.getNbBytes( getTimeLimit() );
 
         // The typesOnly
         searchRequestLength += 1 + 1 + 1;
@@ -1019,22 +1020,22 @@ public class SearchRequestDecorator exte
             buffer.put( TLV.getBytes( getSearchRequestLength() ) );
 
             // The baseObject
-            org.apache.directory.shared.asn1.ber.tlv.Value.encode( buffer, dnBytes );
+            BerValue.encode( buffer, dnBytes );
 
             // The scope
-            org.apache.directory.shared.asn1.ber.tlv.Value.encodeEnumerated( buffer, getScope().getScope() );
+            BerValue.encodeEnumerated( buffer, getScope().getScope() );
 
             // The derefAliases
-            org.apache.directory.shared.asn1.ber.tlv.Value.encodeEnumerated( buffer, getDerefAliases().getValue() );
+            BerValue.encodeEnumerated( buffer, getDerefAliases().getValue() );
 
             // The sizeLimit
-            org.apache.directory.shared.asn1.ber.tlv.Value.encode( buffer, getSizeLimit() );
+            BerValue.encode( buffer, getSizeLimit() );
 
             // The timeLimit
-            org.apache.directory.shared.asn1.ber.tlv.Value.encode( buffer, getTimeLimit() );
+            BerValue.encode( buffer, getTimeLimit() );
 
             // The typesOnly
-            org.apache.directory.shared.asn1.ber.tlv.Value.encode( buffer, getTypesOnly() );
+            BerValue.encode( buffer, getTypesOnly() );
 
             // The filter
             getCodecFilter().encode( buffer );
@@ -1048,7 +1049,7 @@ public class SearchRequestDecorator exte
                 // encode each attribute
                 for ( String attribute : getAttributes() )
                 {
-                    org.apache.directory.shared.asn1.ber.tlv.Value.encode( buffer, attribute );
+                    BerValue.encode( buffer, attribute );
                 }
             }
         }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java?rev=1332606&r1=1332605&r2=1332606&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java Tue May  1 10:24:31 2012
@@ -28,7 +28,7 @@ import java.util.List;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
@@ -425,7 +425,7 @@ public class SearchResultEntryDecorator 
             buffer.put( TLV.getBytes( getSearchResultEntryLength() ) );
 
             // The objectName
-            Value.encode( buffer, getObjectNameBytes() );
+            BerValue.encode( buffer, getObjectNameBytes() );
 
             // The attributes sequence
             buffer.put( UniversalTag.SEQUENCE.getValue() );
@@ -447,7 +447,7 @@ public class SearchResultEntryDecorator 
                     buffer.put( TLV.getBytes( localAttributeLength ) );
 
                     // The attribute type
-                    Value.encode( buffer, attributeIds.get( attributeNumber ) );
+                    BerValue.encode( buffer, attributeIds.get( attributeNumber ) );
 
                     // The values
                     buffer.put( UniversalTag.SET.getValue() );
@@ -458,7 +458,7 @@ public class SearchResultEntryDecorator 
                     {
                         for ( org.apache.directory.shared.ldap.model.entry.Value<?> value : attribute )
                         {
-                            Value.encode( buffer, value.getBytes() );
+                            BerValue.encode( buffer, value.getBytes() );
                         }
                     }
 



Mime
View raw message