directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1332641 - in /directory/shared/trunk: asn1/ber/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ integ/src/test/java/org/apache/directory/shared/ldap/entry/ ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/...
Date Tue, 01 May 2012 13:25:58 GMT
Author: elecharny
Date: Tue May  1 13:25:57 2012
New Revision: 1332641

URL: http://svn.apache.org/viewvc?rev=1332641&view=rev
Log:
o Remove unused imports
o Complete the Value -> BerValue rename
o Removed dead code

Modified:
    directory/shared/trunk/asn1/ber/src/test/java/org/apache/directory/shared/asn1/ber/tlv/PrimitivesTest.java
    directory/shared/trunk/asn1/ber/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java
    directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/TestEntryUtils.java
    directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
    directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueGrammar.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueGrammar.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueGrammar.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueGrammar.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/Cancel.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelGrammar.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnect.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectGrammar.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdown.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownGrammar.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java
    directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureTest.java
    directory/shared/trunk/util/src/main/java/org/apache/directory/shared/util/OsgiUtils.java

Modified: directory/shared/trunk/asn1/ber/src/test/java/org/apache/directory/shared/asn1/ber/tlv/PrimitivesTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/ber/src/test/java/org/apache/directory/shared/asn1/ber/tlv/PrimitivesTest.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/asn1/ber/src/test/java/org/apache/directory/shared/asn1/ber/tlv/PrimitivesTest.java (original)
+++ directory/shared/trunk/asn1/ber/src/test/java/org/apache/directory/shared/asn1/ber/tlv/PrimitivesTest.java Tue May  1 13:25:57 2012
@@ -44,7 +44,7 @@ public class PrimitivesTest
     @Test
     public void testIntegerPrimitive() throws IntegerDecoderException
     {
-        Value value = new Value();
+        BerValue value = new BerValue();
 
         value.init( 1 );
         value.setData( new byte[]

Modified: directory/shared/trunk/asn1/ber/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/ber/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/asn1/ber/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java (original)
+++ directory/shared/trunk/asn1/ber/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java Tue May  1 13:25:57 2012
@@ -55,17 +55,17 @@ public class ValueTest
     @Test
     public void testValueIntGetNbBytes()
     {
-        assertEquals( 1, Value.getNbBytes( 0x00000000 ) );
-        assertEquals( 1, Value.getNbBytes( 0x00000001 ) );
-        assertEquals( 2, Value.getNbBytes( 0x000000FF ) );
-        assertEquals( 2, Value.getNbBytes( 0x00000100 ) );
-        assertEquals( 3, Value.getNbBytes( 0x0000FFFF ) );
-        assertEquals( 3, Value.getNbBytes( 0x00010000 ) );
-        assertEquals( 4, Value.getNbBytes( 0x00FFFFFF ) );
-        assertEquals( 4, Value.getNbBytes( 0x01000000 ) );
-        assertEquals( 1, Value.getNbBytes( -1 ) );
-        assertEquals( 4, Value.getNbBytes( 0x7FFFFFFF ) );
-        assertEquals( 1, Value.getNbBytes( 0xFFFFFFFF ) );
+        assertEquals( 1, BerValue.getNbBytes( 0x00000000 ) );
+        assertEquals( 1, BerValue.getNbBytes( 0x00000001 ) );
+        assertEquals( 2, BerValue.getNbBytes( 0x000000FF ) );
+        assertEquals( 2, BerValue.getNbBytes( 0x00000100 ) );
+        assertEquals( 3, BerValue.getNbBytes( 0x0000FFFF ) );
+        assertEquals( 3, BerValue.getNbBytes( 0x00010000 ) );
+        assertEquals( 4, BerValue.getNbBytes( 0x00FFFFFF ) );
+        assertEquals( 4, BerValue.getNbBytes( 0x01000000 ) );
+        assertEquals( 1, BerValue.getNbBytes( -1 ) );
+        assertEquals( 4, BerValue.getNbBytes( 0x7FFFFFFF ) );
+        assertEquals( 1, BerValue.getNbBytes( 0xFFFFFFFF ) );
     }
 
 
@@ -75,25 +75,25 @@ public class ValueTest
     @Test
     public void testValueLongGetNbBytes()
     {
-        assertEquals( 1, Value.getNbBytes( 0x0000000000000000L ) );
-        assertEquals( 1, Value.getNbBytes( 0x0000000000000001L ) );
-        assertEquals( 2, Value.getNbBytes( 0x00000000000000FFL ) );
-        assertEquals( 2, Value.getNbBytes( 0x0000000000000100L ) );
-        assertEquals( 3, Value.getNbBytes( 0x000000000000FFFFL ) );
-        assertEquals( 3, Value.getNbBytes( 0x0000000000010000L ) );
-        assertEquals( 4, Value.getNbBytes( 0x0000000000FFFFFFL ) );
-        assertEquals( 4, Value.getNbBytes( 0x0000000001000000L ) );
-        assertEquals( 5, Value.getNbBytes( 0x00000000FFFFFFFFL ) );
-        assertEquals( 5, Value.getNbBytes( 0x0000000100000000L ) );
-        assertEquals( 6, Value.getNbBytes( 0x000000FFFFFFFFFFL ) );
-        assertEquals( 6, Value.getNbBytes( 0x0000010000000000L ) );
-        assertEquals( 7, Value.getNbBytes( 0x0000FFFFFFFFFFFFL ) );
-        assertEquals( 7, Value.getNbBytes( 0x0001000000000000L ) );
-        assertEquals( 8, Value.getNbBytes( 0x00FFFFFFFFFFFFFFL ) );
-        assertEquals( 8, Value.getNbBytes( 0x0100000000000000L ) );
-        assertEquals( 1, Value.getNbBytes( -1L ) );
-        assertEquals( 8, Value.getNbBytes( 0x7FFFFFFFFFFFFFFFL ) );
-        assertEquals( 1, Value.getNbBytes( 0xFFFFFFFFFFFFFFFFL ) );
+        assertEquals( 1, BerValue.getNbBytes( 0x0000000000000000L ) );
+        assertEquals( 1, BerValue.getNbBytes( 0x0000000000000001L ) );
+        assertEquals( 2, BerValue.getNbBytes( 0x00000000000000FFL ) );
+        assertEquals( 2, BerValue.getNbBytes( 0x0000000000000100L ) );
+        assertEquals( 3, BerValue.getNbBytes( 0x000000000000FFFFL ) );
+        assertEquals( 3, BerValue.getNbBytes( 0x0000000000010000L ) );
+        assertEquals( 4, BerValue.getNbBytes( 0x0000000000FFFFFFL ) );
+        assertEquals( 4, BerValue.getNbBytes( 0x0000000001000000L ) );
+        assertEquals( 5, BerValue.getNbBytes( 0x00000000FFFFFFFFL ) );
+        assertEquals( 5, BerValue.getNbBytes( 0x0000000100000000L ) );
+        assertEquals( 6, BerValue.getNbBytes( 0x000000FFFFFFFFFFL ) );
+        assertEquals( 6, BerValue.getNbBytes( 0x0000010000000000L ) );
+        assertEquals( 7, BerValue.getNbBytes( 0x0000FFFFFFFFFFFFL ) );
+        assertEquals( 7, BerValue.getNbBytes( 0x0001000000000000L ) );
+        assertEquals( 8, BerValue.getNbBytes( 0x00FFFFFFFFFFFFFFL ) );
+        assertEquals( 8, BerValue.getNbBytes( 0x0100000000000000L ) );
+        assertEquals( 1, BerValue.getNbBytes( -1L ) );
+        assertEquals( 8, BerValue.getNbBytes( 0x7FFFFFFFFFFFFFFFL ) );
+        assertEquals( 1, BerValue.getNbBytes( 0xFFFFFFFFFFFFFFFFL ) );
     }
 
 
@@ -186,7 +186,7 @@ public class ValueTest
          
          for ( int value:positiveValues )
          {
-             byte[] bb = Value.getBytes( value );
+             byte[] bb = BerValue.getBytes( value );
              assertEquals( expectedPositiveBytes[i].length, bb.length );
              assertTrue( Arrays.equals( expectedPositiveBytes[i], bb ) );
              i++;
@@ -196,154 +196,154 @@ public class ValueTest
          
          for ( int value:negativeValues )
          {
-             byte[] bb = Value.getBytes( value );
+             byte[] bb = BerValue.getBytes( value );
              assertEquals( expectedNegativeBytes[i].length, bb.length );
              assertTrue( Arrays.equals( expectedNegativeBytes[i], bb ) );
              i++;
          }
 
-        byte[] bb = Value.getBytes( 0x00000000 );
+        byte[] bb = BerValue.getBytes( 0x00000000 );
         assertEquals( 1, bb.length );
         assertEquals( 0, bb[0] );
 
-        bb = Value.getBytes( 0x00000001 );
+        bb = BerValue.getBytes( 0x00000001 );
         assertEquals( 1, bb.length );
         assertEquals( 1, bb[0] );
 
-        bb = Value.getBytes( 0x0000007F );
+        bb = BerValue.getBytes( 0x0000007F );
         assertEquals( 1, bb.length );
         assertEquals( 0x7F, bb[0] );
 
-        bb = Value.getBytes( 0x00000080 );
+        bb = BerValue.getBytes( 0x00000080 );
         assertEquals( 2, bb.length );
         assertEquals( 0x00, bb[0] );
         assertEquals( (byte)0x80, bb[1] );
 
-        bb = Value.getBytes( 0x000000FF );
+        bb = BerValue.getBytes( 0x000000FF );
         assertEquals( 2, bb.length );
         assertEquals( 0x00, bb[0] );
         assertEquals( (byte)0xFF, bb[1] );
 
-        bb = Value.getBytes( 0x00007FFF );
+        bb = BerValue.getBytes( 0x00007FFF );
         assertEquals( 2, bb.length );
         assertEquals( 0x7F, bb[0] );
         assertEquals( (byte)0xFF, bb[1] );
 
-        bb = Value.getBytes( 0x00008000 );
+        bb = BerValue.getBytes( 0x00008000 );
         assertEquals( 3, bb.length );
         assertEquals( 0x00, bb[0] );
         assertEquals( (byte)0x80, bb[1] );
         assertEquals( 0x00, bb[2] );
 
-        bb = Value.getBytes( 0x0000FFFF );
+        bb = BerValue.getBytes( 0x0000FFFF );
         assertEquals( 3, bb.length );
         assertEquals( 0x00, bb[0] );
         assertEquals( (byte)0xFF, bb[1] );
         assertEquals( (byte)0xFF, bb[2] );
 
-        bb = Value.getBytes( 0x00010000 );
+        bb = BerValue.getBytes( 0x00010000 );
         assertEquals( 3, bb.length );
         assertEquals( 0x01, bb[0] );
         assertEquals( 0x00, bb[1] );
         assertEquals( 0x00, bb[2] );
 
-        bb = Value.getBytes( 0x007FFFFF );
+        bb = BerValue.getBytes( 0x007FFFFF );
         assertEquals( 3, bb.length );
         assertEquals( 0x7F, bb[0] );
         assertEquals( (byte)0xFF, bb[1] );
         assertEquals( (byte)0xFF, bb[2] );
 
-        bb = Value.getBytes( 0x00800000 );
+        bb = BerValue.getBytes( 0x00800000 );
         assertEquals( 4, bb.length );
         assertEquals( 0x00, bb[0] );
         assertEquals( (byte)0x80, bb[1] );
         assertEquals( 0x00, bb[2] );
         assertEquals( 0x00, bb[3] );
 
-        bb = Value.getBytes( 0x00FFFFFF );
+        bb = BerValue.getBytes( 0x00FFFFFF );
         assertEquals( 4, bb.length );
         assertEquals( 0x00, bb[0] );
         assertEquals( (byte)0xFF, bb[1] );
         assertEquals( (byte)0xFF, bb[2] );
         assertEquals( (byte)0xFF, bb[3] );
 
-        bb = Value.getBytes( 0x01000000 );
+        bb = BerValue.getBytes( 0x01000000 );
         assertEquals( 4, bb.length );
         assertEquals( 0x01, bb[0] );
         assertEquals( 0x00, bb[1] );
         assertEquals( 0x00, bb[2] );
         assertEquals( 0x00, bb[3] );
 
-        bb = Value.getBytes( 0x7FFFFFFF );
+        bb = BerValue.getBytes( 0x7FFFFFFF );
         assertEquals( 4, bb.length );
         assertEquals( 0x7F, bb[0] );
         assertEquals( (byte)0xFF, bb[1] );
         assertEquals( (byte)0xFF, bb[2] );
         assertEquals( (byte)0xFF, bb[3] );
 
-        bb = Value.getBytes( 0x80000000 );
+        bb = BerValue.getBytes( 0x80000000 );
         assertEquals( 4, bb.length );
         assertEquals( (byte)0x80, bb[0] );
         assertEquals( (byte)0x00, bb[1] );
         assertEquals( (byte)0x00, bb[2] );
         assertEquals( (byte)0x00, bb[3] );
         
-        bb = Value.getBytes( 0xFFFFFFFF );
+        bb = BerValue.getBytes( 0xFFFFFFFF );
         assertEquals( 1, bb.length );
         assertEquals( (byte)0xFF, bb[0] );
         
-        bb = Value.getBytes( 0xFFFFFF80 );
+        bb = BerValue.getBytes( 0xFFFFFF80 );
         assertEquals( 1, bb.length );
         assertEquals( (byte)0x80, bb[0] );
 
-        bb = Value.getBytes( 0xFFFFFF7F );
+        bb = BerValue.getBytes( 0xFFFFFF7F );
         assertEquals( 2, bb.length );
         assertEquals( (byte)0xFF, bb[0] );
         assertEquals( 0x7F, bb[1] );
 
-        bb = Value.getBytes( 0xFFFFFF00 );
+        bb = BerValue.getBytes( 0xFFFFFF00 );
         assertEquals( 2, bb.length );
         assertEquals( (byte)0xFF, bb[0] );
         assertEquals( 0x00, bb[1] );
 
-        bb = Value.getBytes( 0xFFFF8000 );
+        bb = BerValue.getBytes( 0xFFFF8000 );
         assertEquals( 2, bb.length );
         assertEquals( (byte)0x80, bb[0] );
         assertEquals( 0x00, bb[1] );
 
-        bb = Value.getBytes( 0xFFFF7FFF );
+        bb = BerValue.getBytes( 0xFFFF7FFF );
         assertEquals( 3, bb.length );
         assertEquals( (byte)0xFF, bb[0] );
         assertEquals( 0x7F, bb[1] );
         assertEquals( (byte)0xFF, bb[2] );
 
-        bb = Value.getBytes( 0xFFFF0000 );
+        bb = BerValue.getBytes( 0xFFFF0000 );
         assertEquals( 3, bb.length );
         assertEquals( (byte)0xFF, bb[0] );
         assertEquals( 0x00, bb[1] );
         assertEquals( 0x00, bb[2] );
 
-        bb = Value.getBytes( 0xFF800000 );
+        bb = BerValue.getBytes( 0xFF800000 );
         assertEquals( 3, bb.length );
         assertEquals( (byte)0x80, bb[0] );
         assertEquals( 0x00, bb[1] );
         assertEquals( 0x00, bb[2] );
 
-        bb = Value.getBytes( 0xFF7FFFFF );
+        bb = BerValue.getBytes( 0xFF7FFFFF );
         assertEquals( 4, bb.length );
         assertEquals( (byte)0xFF, bb[0] );
         assertEquals( 0x7F, bb[1] );
         assertEquals( (byte)0xFF, bb[2] );
         assertEquals( (byte)0xFF, bb[3] );
 
-        bb = Value.getBytes( 0xFF000000 );
+        bb = BerValue.getBytes( 0xFF000000 );
         assertEquals( 4, bb.length );
         assertEquals( (byte)0xFF, bb[0] );
         assertEquals( 0x00, bb[1] );
         assertEquals( 0x00, bb[2] );
         assertEquals( 0x00, bb[3] );
 
-        bb = Value.getBytes( 0x80000000 );
+        bb = BerValue.getBytes( 0x80000000 );
         assertEquals( 4, bb.length );
         assertEquals( (byte)0x80, bb[0] );
         assertEquals( 0x00, bb[1] );
@@ -512,7 +512,7 @@ public class ValueTest
         
         for ( long value:positiveValues )
         {
-            byte[] bb = Value.getBytes( value );
+            byte[] bb = BerValue.getBytes( value );
             assertEquals( expectedPositiveBytes[i].length, bb.length );
             assertTrue( Arrays.equals( expectedPositiveBytes[i], bb ) );
             i++;
@@ -522,7 +522,7 @@ public class ValueTest
         
         for ( long value:negativeValues )
         {
-            byte[] bb = Value.getBytes( value );
+            byte[] bb = BerValue.getBytes( value );
             assertEquals( expectedNegativeBytes[i].length, bb.length );
             assertTrue( Arrays.equals( expectedNegativeBytes[i], bb ) );
             i++;
@@ -533,12 +533,12 @@ public class ValueTest
     @Test
     public void testEncodeInt2Bytes()
     {
-        byte[] encoded = Value.getBytes( 128 );
+        byte[] encoded = BerValue.getBytes( 128 );
 
         assertEquals( 0x00, encoded[0] );
         assertEquals( ( byte ) 0x80, encoded[1] );
 
-        encoded = Value.getBytes( -27066 );
+        encoded = BerValue.getBytes( -27066 );
 
         assertEquals( ( byte ) 0x96, encoded[0] );
         assertEquals( 0x46, encoded[1] );
@@ -550,7 +550,7 @@ public class ValueTest
     public void testEncodeInt3Bytes()
     {
 
-        byte[] encoded = Value.getBytes( 32787 );
+        byte[] encoded = BerValue.getBytes( 32787 );
 
         assertEquals( 0x00, encoded[0] );
         assertEquals( ( byte ) 0x80, encoded[1] );
@@ -597,7 +597,7 @@ public class ValueTest
 
         for ( int i:testedInt )
         {
-            encoded = Value.getBytes( i );
+            encoded = BerValue.getBytes( i );
 
             int value = new BigInteger( encoded ).intValue();
 
@@ -649,7 +649,7 @@ public class ValueTest
         {
             encoded = new BigInteger( Integer.toString( i ) ).toByteArray();
 
-            int value = IntegerDecoder.parse( new Value( encoded ) );
+            int value = IntegerDecoder.parse( new BerValue( encoded ) );
 
             assertEquals( i, value );
         }
@@ -741,7 +741,7 @@ public class ValueTest
         {
             encoded = new BigInteger( Long.toString( i ) ).toByteArray();
 
-            long value = LongDecoder.parse( new Value( encoded ) );
+            long value = LongDecoder.parse( new BerValue( encoded ) );
 
             assertEquals( i, value );
         }
@@ -754,7 +754,7 @@ public class ValueTest
     {
         byte[] bb = new byte[]{0x01, (byte)0xFF};
         
-        Value v = new Value( bb );
+        BerValue v = new BerValue( bb );
         byte[] vv = v.getData();
         
         assertEquals( 0x01, vv[0] );
@@ -775,7 +775,7 @@ public class ValueTest
         
         try
         {
-            Value.encode( buffer, bs );
+            BerValue.encode( buffer, bs );
         }
         catch ( EncoderException ee )
         {

Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/TestEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/TestEntryUtils.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/TestEntryUtils.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/TestEntryUtils.java Tue May  1 13:25:57 2012
@@ -143,25 +143,6 @@ public class TestEntryUtils
                     ( o2 == null ? 0 : -1 ) :
                     ( o2 == null ? 1 : o1.compareTo( o2 ) ) );
             }
-
-
-            int getValue( String val )
-            {
-                if ( val.equals( "LOW" ) )
-                {
-                    return 0;
-                }
-                else if ( val.equals( "MEDIUM" ) )
-                {
-                    return 1;
-                }
-                else if ( val.equals( "HIGH" ) )
-                {
-                    return 2;
-                }
-
-                throw new IllegalArgumentException();
-            }
         } );
 
         Normalizer normalizer = new Normalizer( "1.1.1" )

Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java Tue May  1 13:25:57 2012
@@ -61,7 +61,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.SearchRequest;
 import org.apache.directory.shared.ldap.model.message.SearchResultDoneImpl;
 import org.apache.directory.shared.ldap.model.message.SearchScope;
-import org.apache.directory.shared.ldap.model.message.controls.Subentries;
 import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.ldap.model.schema.normalizers.OidNormalizer;
 import org.apache.directory.shared.util.Strings;

Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java Tue May  1 13:25:57 2012
@@ -25,7 +25,7 @@ import java.util.List;
 
 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.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.AbstractExtendedRequest;
 import org.apache.directory.shared.util.exception.NotImplementedException;
@@ -254,7 +254,7 @@ public class StoredProcedureRequestImpl 
                 {
                     try
                     {
-                        return IntegerDecoder.parse( new Value( ( byte[] ) obj ) );
+                        return IntegerDecoder.parse( new BerValue( ( byte[] ) obj ) );
                     }
                     catch ( IntegerDecoderException e )
                     {

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java Tue May  1 13:25:57 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;
@@ -172,13 +172,13 @@ public class PasswordPolicyDecorator ext
                 {
                     buffer.put( ( byte ) PasswordPolicyTags.TIME_BEFORE_EXPIRATION_TAG.getValue() );
                     buffer.put( TLV.getBytes( timeBeforeExpirationTagLength ) );
-                    buffer.put( Value.getBytes( getResponse().getTimeBeforeExpiration() ) );
+                    buffer.put( BerValue.getBytes( getResponse().getTimeBeforeExpiration() ) );
                 }
                 else if ( getResponse().getGraceAuthNsRemaining() >= 0 )
                 {
                     buffer.put( ( byte ) PasswordPolicyTags.GRACE_AUTHNS_REMAINING_TAG.getValue() );
                     buffer.put( TLV.getBytes( graceAuthNsRemainingTagLength ) );
-                    buffer.put( Value.getBytes( getResponse().getGraceAuthNsRemaining() ) );
+                    buffer.put( BerValue.getBytes( getResponse().getGraceAuthNsRemaining() ) );
                 }
             }
 
@@ -186,7 +186,7 @@ public class PasswordPolicyDecorator ext
             {
                 buffer.put( ( byte ) PasswordPolicyTags.PPOLICY_ERROR_TAG.getValue() );
                 buffer.put( ( byte ) 0x01 );
-                buffer.put( Value.getBytes( getResponse().getPasswordPolicyError().getValue() ) );
+                buffer.put( BerValue.getBytes( getResponse().getPasswordPolicyError().getValue() ) );
             }
         }
 

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java Tue May  1 13:25:57 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;
@@ -122,12 +122,12 @@ public class SyncDoneValueDecorator exte
 
         if ( getCookie() != null )
         {
-            Value.encode( buffer, getCookie() );
+            BerValue.encode( buffer, getCookie() );
         }
 
         if ( isRefreshDeletes() )
         {
-            Value.encode( buffer, isRefreshDeletes() );
+            BerValue.encode( buffer, isRefreshDeletes() );
         }
 
         return buffer;
@@ -153,12 +153,12 @@ public class SyncDoneValueDecorator exte
 
                 if ( getCookie() != null )
                 {
-                    Value.encode( buffer, getCookie() );
+                    BerValue.encode( buffer, getCookie() );
                 }
 
                 if ( isRefreshDeletes() )
                 {
-                    Value.encode( buffer, isRefreshDeletes() );
+                    BerValue.encode( buffer, isRefreshDeletes() );
                 }
 
                 value = buffer.array();

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueGrammar.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueGrammar.java Tue May  1 13:25:57 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.BooleanDecoderException;
 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.i18n.I18n;
 import org.apache.directory.shared.util.Strings;
@@ -109,7 +109,7 @@ public final class SyncDoneValueGrammar 
                 {
                     public void action( SyncDoneValueContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         byte[] cookie = value.getData();
 
@@ -129,7 +129,7 @@ public final class SyncDoneValueGrammar 
             {
                 public void action( SyncDoneValueContainer container ) throws DecoderException
                 {
-                    Value value = container.getCurrentTLV().getValue();
+                    BerValue value = container.getCurrentTLV().getValue();
 
                     try
                     {

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java Tue May  1 13:25:57 2012
@@ -30,7 +30,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;
@@ -355,13 +355,13 @@ public class SyncInfoValueDecorator exte
                 // The cookie, if any
                 if ( getCookie() != null )
                 {
-                    Value.encode( buffer, getCookie() );
+                    BerValue.encode( buffer, getCookie() );
                 }
 
                 // The refreshDone flag
                 if ( !isRefreshDone() )
                 {
-                    Value.encode( buffer, isRefreshDone() );
+                    BerValue.encode( buffer, isRefreshDone() );
                 }
 
                 break;
@@ -374,13 +374,13 @@ public class SyncInfoValueDecorator exte
                 // The cookie, if any
                 if ( getCookie() != null )
                 {
-                    Value.encode( buffer, getCookie() );
+                    BerValue.encode( buffer, getCookie() );
                 }
 
                 // The refreshDone flag
                 if ( !isRefreshDone() )
                 {
-                    Value.encode( buffer, isRefreshDone() );
+                    BerValue.encode( buffer, isRefreshDone() );
                 }
 
                 break;
@@ -393,13 +393,13 @@ public class SyncInfoValueDecorator exte
                 // The cookie, if any
                 if ( getCookie() != null )
                 {
-                    Value.encode( buffer, getCookie() );
+                    BerValue.encode( buffer, getCookie() );
                 }
 
                 // The refreshDeletes flag if not false
                 if ( isRefreshDeletes() )
                 {
-                    Value.encode( buffer, isRefreshDeletes() );
+                    BerValue.encode( buffer, isRefreshDeletes() );
                 }
 
                 // The syncUUIDs
@@ -411,7 +411,7 @@ public class SyncInfoValueDecorator exte
                 {
                     for ( byte[] syncUUID : getSyncUUIDs() )
                     {
-                        Value.encode( buffer, syncUUID );
+                        BerValue.encode( buffer, syncUUID );
                     }
                 }
         }
@@ -461,13 +461,13 @@ public class SyncInfoValueDecorator exte
                         // The cookie, if any
                         if ( getCookie() != null )
                         {
-                            Value.encode( buffer, getCookie() );
+                            BerValue.encode( buffer, getCookie() );
                         }
 
                         // The refreshDone flag
                         if ( !isRefreshDone() )
                         {
-                            Value.encode( buffer, isRefreshDone() );
+                            BerValue.encode( buffer, isRefreshDone() );
                         }
 
                         break;
@@ -480,13 +480,13 @@ public class SyncInfoValueDecorator exte
                         // The cookie, if any
                         if ( getCookie() != null )
                         {
-                            Value.encode( buffer, getCookie() );
+                            BerValue.encode( buffer, getCookie() );
                         }
 
                         // The refreshDone flag
                         if ( !isRefreshDone() )
                         {
-                            Value.encode( buffer, isRefreshDone() );
+                            BerValue.encode( buffer, isRefreshDone() );
                         }
 
                         break;
@@ -499,13 +499,13 @@ public class SyncInfoValueDecorator exte
                         // The cookie, if any
                         if ( getCookie() != null )
                         {
-                            Value.encode( buffer, getCookie() );
+                            BerValue.encode( buffer, getCookie() );
                         }
 
                         // The refreshDeletes flag if not false
                         if ( isRefreshDeletes() )
                         {
-                            Value.encode( buffer, isRefreshDeletes() );
+                            BerValue.encode( buffer, isRefreshDeletes() );
                         }
 
                         // The syncUUIDs
@@ -517,7 +517,7 @@ public class SyncInfoValueDecorator exte
                         {
                             for ( byte[] syncUUID : getSyncUUIDs() )
                             {
-                                Value.encode( buffer, syncUUID );
+                                BerValue.encode( buffer, syncUUID );
                             }
                         }
                 }

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueGrammar.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueGrammar.java Tue May  1 13:25:57 2012
@@ -28,7 +28,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.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.extras.controls.SyncInfoValue;
 import org.apache.directory.shared.util.Strings;
@@ -101,7 +101,7 @@ public final class SyncInfoValueGrammar 
                     {
                         SyncInfoValue control = container.getSyncInfoValueControl();
 
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         byte[] newCookie = value.getData();
 
@@ -164,7 +164,7 @@ public final class SyncInfoValueGrammar 
                     {
                         SyncInfoValue control = container.getSyncInfoValueControl();
 
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         byte[] cookie = value.getData();
 
@@ -201,7 +201,7 @@ public final class SyncInfoValueGrammar 
                     {
                         SyncInfoValue control = container.getSyncInfoValueControl();
 
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         try
                         {
@@ -250,7 +250,7 @@ public final class SyncInfoValueGrammar 
                     {
                         SyncInfoValue control = container.getSyncInfoValueControl();
 
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         try
                         {
@@ -325,7 +325,7 @@ public final class SyncInfoValueGrammar 
                     {
                         SyncInfoValue control = container.getSyncInfoValueControl();
 
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         byte[] cookie = value.getData();
 
@@ -362,7 +362,7 @@ public final class SyncInfoValueGrammar 
                     {
                         SyncInfoValue control = container.getSyncInfoValueControl();
 
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         try
                         {
@@ -411,7 +411,7 @@ public final class SyncInfoValueGrammar 
                     {
                         SyncInfoValue control = container.getSyncInfoValueControl();
 
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         try
                         {
@@ -482,7 +482,7 @@ public final class SyncInfoValueGrammar 
                     {
                         SyncInfoValue control = container.getSyncInfoValueControl();
 
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         byte[] cookie = value.getData();
 
@@ -515,7 +515,7 @@ public final class SyncInfoValueGrammar 
                     {
                         SyncInfoValue control = container.getSyncInfoValueControl();
 
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         try
                         {
@@ -558,7 +558,7 @@ public final class SyncInfoValueGrammar 
                     {
                         SyncInfoValue control = container.getSyncInfoValueControl();
 
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         try
                         {
@@ -669,7 +669,7 @@ public final class SyncInfoValueGrammar 
                     {
                         SyncInfoValue control = container.getSyncInfoValueControl();
 
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         byte[] uuid = value.getData();
 
@@ -714,7 +714,7 @@ public final class SyncInfoValueGrammar 
                     {
                         SyncInfoValue control = container.getSyncInfoValueControl();
 
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         byte[] uuid = value.getData();
 

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java Tue May  1 13:25:57 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;
@@ -186,18 +186,18 @@ public class SyncRequestValueDecorator e
         // The mode
         buffer.put( UniversalTag.ENUMERATED.getValue() );
         buffer.put( ( byte ) 0x01 );
-        buffer.put( Value.getBytes( getMode().getValue() ) );
+        buffer.put( BerValue.getBytes( getMode().getValue() ) );
 
         // The cookie
         if ( getCookie() != null )
         {
-            Value.encode( buffer, getCookie() );
+            BerValue.encode( buffer, getCookie() );
         }
 
         // The reloadHint if not false
         if ( isReloadHint() )
         {
-            Value.encode( buffer, isReloadHint() );
+            BerValue.encode( buffer, isReloadHint() );
         }
 
         return buffer;
@@ -224,18 +224,18 @@ public class SyncRequestValueDecorator e
                 // The mode
                 buffer.put( UniversalTag.ENUMERATED.getValue() );
                 buffer.put( ( byte ) 0x01 );
-                buffer.put( Value.getBytes( getMode().getValue() ) );
+                buffer.put( BerValue.getBytes( getMode().getValue() ) );
 
                 // The cookie
                 if ( getCookie() != null )
                 {
-                    Value.encode( buffer, getCookie() );
+                    BerValue.encode( buffer, getCookie() );
                 }
 
                 // The reloadHint if not false
                 if ( isReloadHint() )
                 {
-                    Value.encode( buffer, isReloadHint() );
+                    BerValue.encode( buffer, isReloadHint() );
                 }
 
                 value = buffer.array();

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueGrammar.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueGrammar.java Tue May  1 13:25:57 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.extras.controls.SynchronizationModeEnum;
 import org.apache.directory.shared.util.Strings;
@@ -114,7 +114,7 @@ public final class SyncRequestValueGramm
                 {
                     public void action( SyncRequestValueContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         try
                         {
@@ -160,7 +160,7 @@ public final class SyncRequestValueGramm
                 {
                     public void action( SyncRequestValueContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         byte[] cookie = value.getData();
 
@@ -192,7 +192,7 @@ public final class SyncRequestValueGramm
                 {
                     public void action( SyncRequestValueContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         try
                         {
@@ -233,7 +233,7 @@ public final class SyncRequestValueGramm
                 {
                     public void action( SyncRequestValueContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         try
                         {

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java Tue May  1 13:25:57 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;
@@ -170,15 +170,15 @@ public class SyncStateValueDecorator ext
         // The mode
         buffer.put( UniversalTag.ENUMERATED.getValue() );
         buffer.put( ( byte ) 0x01 );
-        buffer.put( Value.getBytes( getSyncStateType().getValue() ) );
+        buffer.put( BerValue.getBytes( getSyncStateType().getValue() ) );
 
         // the entryUUID
-        Value.encode( buffer, getEntryUUID() );
+        BerValue.encode( buffer, getEntryUUID() );
 
         // The cookie
         if ( getCookie() != null )
         {
-            Value.encode( buffer, getCookie() );
+            BerValue.encode( buffer, getCookie() );
         }
 
         return buffer;
@@ -205,15 +205,15 @@ public class SyncStateValueDecorator ext
                 // The mode
                 buffer.put( UniversalTag.ENUMERATED.getValue() );
                 buffer.put( ( byte ) 0x01 );
-                buffer.put( Value.getBytes( getSyncStateType().getValue() ) );
+                buffer.put( BerValue.getBytes( getSyncStateType().getValue() ) );
 
                 // the entryUUID
-                Value.encode( buffer, getEntryUUID() );
+                BerValue.encode( buffer, getEntryUUID() );
 
                 // The cookie
                 if ( getCookie() != null )
                 {
-                    Value.encode( buffer, getCookie() );
+                    BerValue.encode( buffer, getCookie() );
                 }
 
                 value = buffer.array();

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueGrammar.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueGrammar.java Tue May  1 13:25:57 2012
@@ -27,7 +27,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.asn1.DecoderException;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.extras.controls.SyncStateTypeEnum;
@@ -109,7 +109,7 @@ public final class SyncStateValueGrammar
             {
                 public void action( SyncStateValueContainer container ) throws DecoderException
                 {
-                    Value value = container.getCurrentTLV().getValue();
+                    BerValue value = container.getCurrentTLV().getValue();
 
                     try
                     {
@@ -154,7 +154,7 @@ public final class SyncStateValueGrammar
             {
                 public void action( SyncStateValueContainer container ) throws DecoderException
                 {
-                    Value value = container.getCurrentTLV().getValue();
+                    BerValue value = container.getCurrentTLV().getValue();
 
                     byte[] entryUUID = value.getData();
 
@@ -186,7 +186,7 @@ public final class SyncStateValueGrammar
             {
                 public void action( SyncStateValueContainer container ) throws DecoderException
                 {
-                    Value value = container.getCurrentTLV().getValue();
+                    BerValue value = container.getCurrentTLV().getValue();
 
                     byte[] cookie = value.getData();
 

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/Cancel.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/Cancel.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/Cancel.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/Cancel.java Tue May  1 13:25:57 2012
@@ -26,7 +26,7 @@ import org.apache.directory.shared.asn1.
 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;
 
 
 /**
@@ -103,7 +103,7 @@ public class Cancel extends AbstractAsn1
     public int computeLength()
     {
         // The messageId length
-        cancelSequenceLength = 1 + 1 + Value.getNbBytes( cancelId );
+        cancelSequenceLength = 1 + 1 + BerValue.getNbBytes( cancelId );
 
         // Add the sequence and the length
         return 1 + 1 + cancelSequenceLength;
@@ -126,7 +126,7 @@ public class Cancel extends AbstractAsn1
         bb.put( TLV.getBytes( cancelSequenceLength ) );
 
         // The messageId
-        Value.encode( bb, cancelId );
+        BerValue.encode( bb, cancelId );
 
         return bb;
     }

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelGrammar.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelGrammar.java Tue May  1 13:25:57 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.DecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
@@ -113,7 +113,7 @@ public final class CancelGrammar extends
                     public void action( Asn1Container container ) throws DecoderException
                     {
                         CancelContainer cancelContainer = ( CancelContainer ) container;
-                        Value value = cancelContainer.getCurrentTLV().getValue();
+                        BerValue value = cancelContainer.getCurrentTLV().getValue();
 
                         try
                         {

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java Tue May  1 13:25:57 2012
@@ -25,7 +25,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.DecoderException;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
@@ -115,7 +115,7 @@ public class CertGenerationGrammar exten
                 {
                     public void action( CertGenerationContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         String targetDN = Strings.utf8ToString( value.getData() );
 
@@ -161,7 +161,7 @@ public class CertGenerationGrammar exten
                 {
                     public void action( CertGenerationContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         String issuerDN = Strings.utf8ToString( value.getData() );
 
@@ -201,7 +201,7 @@ public class CertGenerationGrammar exten
                 {
                     public void action( CertGenerationContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         String subjectDN = Strings.utf8ToString( value.getData() );
 
@@ -247,7 +247,7 @@ public class CertGenerationGrammar exten
                 {
                     public void action( CertGenerationContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         String keyAlgorithm = Strings.utf8ToString( value.getData() );
 

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.java Tue May  1 13:25:57 2012
@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;
 import org.apache.directory.shared.asn1.AbstractAsn1Object;
 import org.apache.directory.shared.asn1.EncoderException;
 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.ldap.extras.extended.CertGenerationRequest;
 import org.apache.directory.shared.util.Strings;
 
@@ -65,18 +65,18 @@ public class CertGenerationObject extend
     public int computeLength()
     {
         int len = Strings.getBytesUtf8( request.getTargetDN() ).length;
-        requestLength = 1 + Value.getNbBytes( len ) + len;
+        requestLength = 1 + BerValue.getNbBytes( len ) + len;
 
         len = Strings.getBytesUtf8( request.getIssuerDN() ).length;
-        requestLength += 1 + Value.getNbBytes( len ) + len;
+        requestLength += 1 + BerValue.getNbBytes( len ) + len;
 
         len = Strings.getBytesUtf8( request.getSubjectDN() ).length;
-        requestLength += 1 + Value.getNbBytes( len ) + len;
+        requestLength += 1 + BerValue.getNbBytes( len ) + len;
 
         len = Strings.getBytesUtf8( request.getKeyAlgorithm() ).length;
-        requestLength += 1 + Value.getNbBytes( len ) + len;
+        requestLength += 1 + BerValue.getNbBytes( len ) + len;
 
-        return 1 + Value.getNbBytes( requestLength ) + requestLength;
+        return 1 + BerValue.getNbBytes( requestLength ) + requestLength;
     }
 
 
@@ -85,12 +85,12 @@ public class CertGenerationObject extend
         ByteBuffer bb = ByteBuffer.allocate( computeLength() );
 
         bb.put( UniversalTag.SEQUENCE.getValue() );
-        bb.put( Value.getBytes( requestLength ) );
+        bb.put( BerValue.getBytes( requestLength ) );
 
-        Value.encode( bb, request.getTargetDN() );
-        Value.encode( bb, request.getIssuerDN() );
-        Value.encode( bb, request.getSubjectDN() );
-        Value.encode( bb, request.getKeyAlgorithm() );
+        BerValue.encode( bb, request.getTargetDN() );
+        BerValue.encode( bb, request.getIssuerDN() );
+        BerValue.encode( bb, request.getSubjectDN() );
+        BerValue.encode( bb, request.getKeyAlgorithm() );
 
         return bb;
     }

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnect.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnect.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnect.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnect.java Tue May  1 13:25:57 2012
@@ -27,7 +27,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.ldap.model.url.LdapUrl;
 
 
@@ -118,12 +118,12 @@ public class GracefulDisconnect extends 
 
         if ( timeOffline != 0 )
         {
-            gracefulDisconnectSequenceLength += 1 + 1 + Value.getNbBytes( timeOffline );
+            gracefulDisconnectSequenceLength += 1 + 1 + BerValue.getNbBytes( timeOffline );
         }
 
         if ( delay != 0 )
         {
-            gracefulDisconnectSequenceLength += 1 + 1 + Value.getNbBytes( delay );
+            gracefulDisconnectSequenceLength += 1 + 1 + BerValue.getNbBytes( delay );
         }
 
         if ( replicatedContexts.size() > 0 )
@@ -161,14 +161,14 @@ public class GracefulDisconnect extends 
 
         if ( timeOffline != 0 )
         {
-            Value.encode( bb, timeOffline );
+            BerValue.encode( bb, timeOffline );
         }
 
         if ( delay != 0 )
         {
             bb.put( ( byte ) GracefulActionConstants.GRACEFUL_ACTION_DELAY_TAG );
             bb.put( ( byte ) TLV.getNbBytes( delay ) );
-            bb.put( Value.getBytes( delay ) );
+            bb.put( BerValue.getBytes( delay ) );
         }
 
         if ( replicatedContexts.size() != 0 )
@@ -179,7 +179,7 @@ public class GracefulDisconnect extends 
             // We may have more than one reference.
             for ( LdapUrl replicatedContext : replicatedContexts )
             {
-                Value.encode( bb, replicatedContext.getBytesReference() );
+                BerValue.encode( bb, replicatedContext.getBytesReference() );
             }
         }
 

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectGrammar.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectGrammar.java Tue May  1 13:25:57 2012
@@ -27,7 +27,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.exception.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.model.url.LdapUrl;
@@ -76,7 +76,7 @@ public final class GracefulDisconnectGra
         {
             public void action( GracefulDisconnectContainer container ) throws DecoderException
             {
-                Value value = container.getCurrentTLV().getValue();
+                BerValue value = container.getCurrentTLV().getValue();
 
                 try
                 {
@@ -107,7 +107,7 @@ public final class GracefulDisconnectGra
         {
             public void action( GracefulDisconnectContainer container ) throws DecoderException
             {
-                Value value = container.getCurrentTLV().getValue();
+                BerValue value = container.getCurrentTLV().getValue();
 
                 try
                 {
@@ -146,7 +146,7 @@ public final class GracefulDisconnectGra
         {
             public void action( GracefulDisconnectContainer container ) throws DecoderException
             {
-                Value value = container.getCurrentTLV().getValue();
+                BerValue value = container.getCurrentTLV().getValue();
 
                 try
                 {

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdown.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdown.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdown.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdown.java Tue May  1 13:25:57 2012
@@ -24,7 +24,7 @@ import java.nio.ByteBuffer;
 
 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.EncoderException;
 import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulAction;
 import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulActionConstants;
@@ -76,12 +76,12 @@ public class GracefulShutdown extends Gr
 
         if ( timeOffline != 0 )
         {
-            gracefulSequenceLength += 1 + 1 + Value.getNbBytes( timeOffline );
+            gracefulSequenceLength += 1 + 1 + BerValue.getNbBytes( timeOffline );
         }
 
         if ( delay != 0 )
         {
-            gracefulSequenceLength += 1 + 1 + Value.getNbBytes( delay );
+            gracefulSequenceLength += 1 + 1 + BerValue.getNbBytes( delay );
         }
 
         return gracefulLength + gracefulSequenceLength;
@@ -104,14 +104,14 @@ public class GracefulShutdown extends Gr
 
         if ( timeOffline != 0 )
         {
-            Value.encode( bb, timeOffline );
+            BerValue.encode( bb, timeOffline );
         }
 
         if ( delay != 0 )
         {
             bb.put( ( byte ) GracefulActionConstants.GRACEFUL_ACTION_DELAY_TAG );
-            bb.put( ( byte ) Value.getNbBytes( delay ) );
-            bb.put( Value.getBytes( delay ) );
+            bb.put( ( byte ) BerValue.getNbBytes( delay ) );
+            bb.put( BerValue.getBytes( delay ) );
         }
         return bb;
     }

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownGrammar.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownGrammar.java Tue May  1 13:25:57 2012
@@ -26,7 +26,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
 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.asn1.ber.tlv.IntegerDecoder;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulActionConstants;
@@ -114,7 +114,7 @@ public final class GracefulShutdownGramm
                 {
                     public void action( GracefulShutdownContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         try
                         {
@@ -156,7 +156,7 @@ public final class GracefulShutdownGramm
                 {
                     public void action( GracefulShutdownContainer container ) throws DecoderException
                     {
-                        Value value = container.getCurrentTLV().getValue();
+                        BerValue value = container.getCurrentTLV().getValue();
 
                         try
                         {
@@ -200,7 +200,7 @@ public final class GracefulShutdownGramm
                     public void action( GracefulShutdownContainer container ) throws DecoderException
                     {
                         GracefulShutdownContainer gracefulShutdownContainer = ( GracefulShutdownContainer ) container;
-                        Value value = gracefulShutdownContainer.getCurrentTLV().getValue();
+                        BerValue value = gracefulShutdownContainer.getCurrentTLV().getValue();
 
                         try
                         {

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java Tue May  1 13:25:57 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.ExtendedRequestDecorator;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
@@ -188,10 +188,10 @@ public class StoredProcedureRequestDecor
             bb.put( TLV.getBytes( storedProcedureLength ) );
 
             // The language
-            Value.encode( bb, getDecorated().getLanguage() );
+            BerValue.encode( bb, getDecorated().getLanguage() );
 
             // The procedure
-            Value.encode( bb, getDecorated().getProcedure() );
+            BerValue.encode( bb, getDecorated().getProcedure() );
 
             // The parameters sequence
             bb.put( UniversalTag.SEQUENCE.getValue() );
@@ -210,10 +210,10 @@ public class StoredProcedureRequestDecor
                     bb.put( TLV.getBytes( localParameterLength ) );
 
                     // The parameter type
-                    Value.encode( bb, spParam.getType() );
+                    BerValue.encode( bb, spParam.getType() );
 
                     // The parameter value
-                    Value.encode( bb, spParam.getValue() );
+                    BerValue.encode( bb, spParam.getValue() );
 
                     // Go to the next parameter;
                     parameterNumber++;

Modified: directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureTest.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureTest.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureTest.java Tue May  1 13:25:57 2012
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 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.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureContainer;
 import org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureDecoder;
@@ -102,7 +102,7 @@ public class StoredProcedureTest
         assertEquals( 3, storedProcedure.size() );
 
         assertEquals( "int", Strings.utf8ToString( ( byte[] ) storedProcedure.getParameterType( 0 ) ) );
-        assertEquals( 1, IntegerDecoder.parse( new Value( ( byte[] ) storedProcedure.getParameterValue( 0 ) ) ) );
+        assertEquals( 1, IntegerDecoder.parse( new BerValue( ( byte[] ) storedProcedure.getParameterValue( 0 ) ) ) );
 
         assertEquals( "boolean", Strings.utf8ToString( ( byte[] ) storedProcedure.getParameterType( 1 ) ) );
         assertEquals( "true", Strings.utf8ToString( ( byte[] ) storedProcedure.getParameterValue( 1 ) ) );
@@ -226,7 +226,7 @@ public class StoredProcedureTest
         assertEquals( 1, storedProcedure.size() );
 
         assertEquals( "int", Strings.utf8ToString( ( byte[] ) storedProcedure.getParameterType( 0 ) ) );
-        assertEquals( 1, IntegerDecoder.parse( new Value( ( byte[] ) storedProcedure.getParameterValue( 0 ) ) ) );
+        assertEquals( 1, IntegerDecoder.parse( new BerValue( ( byte[] ) storedProcedure.getParameterValue( 0 ) ) ) );
 
         // Check the encoding
         try

Modified: directory/shared/trunk/util/src/main/java/org/apache/directory/shared/util/OsgiUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/main/java/org/apache/directory/shared/util/OsgiUtils.java?rev=1332641&r1=1332640&r2=1332641&view=diff
==============================================================================
--- directory/shared/trunk/util/src/main/java/org/apache/directory/shared/util/OsgiUtils.java (original)
+++ directory/shared/trunk/util/src/main/java/org/apache/directory/shared/util/OsgiUtils.java Tue May  1 13:25:57 2012
@@ -26,7 +26,6 @@ import java.io.IOException;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 
@@ -46,8 +45,8 @@ public class OsgiUtils
 
 
     /**
-     * All the packages that are exported from all bundles found on the system 
-     * classpath. The provided filter if not null is used to prune classpath 
+     * All the packages that are exported from all bundles found on the system
+     * classpath. The provided filter if not null is used to prune classpath
      * elements. Any uses terms found are stripped from the bundles.
      *
      * @return All the exported packages of all bundles on the classpath.
@@ -80,7 +79,7 @@ public class OsgiUtils
 
 
     /**
-     * Splits an Package-Export OSGi Manifest Attribute value into packages 
+     * Splits an Package-Export OSGi Manifest Attribute value into packages
      * while stripping away the key/value properties.
      *
      * @param exports The Package-Export OSGi Manifest Attribute value.
@@ -176,8 +175,8 @@ public class OsgiUtils
      * Gets the attribute value for the Export-Bundle OSGi Manifest Attribute.
      * 
      * @param bundle The absolute path to a file bundle.
-     * @return The value as it appears in the Manifest, as a comma delimited 
-     * list of packages with possible "uses" phrases appended to each package 
+     * @return The value as it appears in the Manifest, as a comma delimited
+     * list of packages with possible "uses" phrases appended to each package
      * or null if the attribute does not exist.
      */
     public static String getBundleExports( File bundle )



Mime
View raw message