directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r764131 [6/16] - in /directory: apacheds/trunk/ apacheds/trunk/core-avl/ apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/ apached...
Date Sat, 11 Apr 2009 01:03:25 GMT
Modified: directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/BitStringTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/BitStringTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/BitStringTest.java (original)
+++ directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/BitStringTest.java Sat Apr 11 01:03:00 2009
@@ -20,11 +20,12 @@
 package org.apache.directory.shared.asn1.primitives;
 
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.asn1.util.Asn1StringUtils;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
 
 
 /**
@@ -32,7 +33,7 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class BitStringTest extends TestCase
+public class BitStringTest
 {
     // ~ Methods
     // ------------------------------------------------------------------------------------
@@ -40,6 +41,7 @@
     /**
      * Test a null BitString
      */
+    @Test
     public void testBitStringNull()
     {
 
@@ -50,11 +52,11 @@
         try
         {
             bitString.getBit( 0 );
-            Assert.fail( "Should not reach this point ..." );
+            fail( "Should not reach this point ..." );
         }
         catch ( IndexOutOfBoundsException ioobe )
         {
-            Assert.assertTrue( true );
+            assertTrue( true );
         }
     }
 
@@ -62,6 +64,7 @@
     /**
      * Test an empty BitString
      */
+    @Test
     public void testBitStringEmpty()
     {
 
@@ -73,11 +76,11 @@
         try
         {
             bitString.getBit( 0 );
-            Assert.fail( "Should not reach this point ..." );
+            fail( "Should not reach this point ..." );
         }
         catch ( IndexOutOfBoundsException ioobe )
         {
-            Assert.assertTrue( true );
+            assertTrue( true );
         }
     }
 
@@ -85,6 +88,7 @@
     /**
      * Test a single bit BitString
      */
+    @Test
     public void testSingleBitBitString() throws DecoderException
     {
 
@@ -93,13 +97,14 @@
         bitString.setData( new byte[]
             { 0x07, ( byte ) 0x80 } );
 
-        Assert.assertEquals( true, bitString.getBit( 0 ) );
+        assertEquals( true, bitString.getBit( 0 ) );
     }
 
 
     /**
      * Test a 32 bits BitString
      */
+    @Test
     public void test32BitsBitString() throws DecoderException
     {
 
@@ -110,7 +115,7 @@
 
         for ( int i = 0; i < 32; i++ )
         {
-            Assert.assertEquals( true, bitString.getBit( i ) );
+            assertEquals( true, bitString.getBit( i ) );
         }
     }
 
@@ -118,6 +123,7 @@
     /**
      * Test a 33 bits BitString
      */
+    @Test
     public void test33BitsBitString() throws DecoderException
     {
 
@@ -128,16 +134,17 @@
 
         for ( int i = 0; i < 33; i++ )
         {
-            Assert.assertEquals( true, bitString.getBit( i ) );
+            assertEquals( true, bitString.getBit( i ) );
         }
 
-        Assert.assertEquals( true, bitString.getBit( 32 ) );
+        assertEquals( true, bitString.getBit( 32 ) );
     }
 
 
     /**
      * Test all bits from 0 to 128 BitString
      */
+    @Test
     public void test0to128BitString() throws DecoderException
     {
 
@@ -149,7 +156,7 @@
 
         for ( int i = 0; i < 14; i++ )
         {
-            Assert.assertEquals( true, bitString14.getBit( i ) );
+            assertEquals( true, bitString14.getBit( i ) );
         }
 
         // bit number 31
@@ -160,7 +167,7 @@
 
         for ( int i = 0; i < 31; i++ )
         {
-            Assert.assertEquals( true, bitString31.getBit( i ) );
+            assertEquals( true, bitString31.getBit( i ) );
         }
 
         // bit number 128
@@ -173,10 +180,11 @@
 
         for ( int i = 0; i < 128; i++ )
         {
-            Assert.assertEquals( true, bitString128.getBit( i ) );
+            assertEquals( true, bitString128.getBit( i ) );
         }
     }
     
+    @Test
     public void testBitStringSet()
     {
         BitString bitString = new BitString( 32 );
@@ -203,6 +211,7 @@
         assertEquals( Asn1StringUtils.dumpBytes( bytes ), Asn1StringUtils.dumpBytes( bitString.getData() ) );
     }
 
+    @Test
     public void testBitStringSetBit()
     {
         BitString bitString = new BitString( 32 );
@@ -230,6 +239,7 @@
         assertEquals( Asn1StringUtils.dumpBytes( bytesModified ), Asn1StringUtils.dumpBytes( bitString.getData() ) );
     }
 
+    @Test
     public void testBitStringClearBit()
     {
         BitString bitString = new BitString( 32 );

Modified: directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java (original)
+++ directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java Sat Apr 11 01:03:00 2009
@@ -20,10 +20,12 @@
 package org.apache.directory.shared.asn1.primitives;
 
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.asn1.codec.DecoderException;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 
 /**
@@ -31,7 +33,7 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class OIDTest extends TestCase
+public class OIDTest
 {
     // ~ Methods
     // ------------------------------------------------------------------------------------
@@ -39,6 +41,7 @@
     /**
      * Test a null OID
      */
+    @Test
     public void testOidNull()
     {
 
@@ -47,11 +50,11 @@
         try
         {
             oid.setOID( ( byte[] ) null );
-            Assert.fail( "Should not reach this point ..." );
+            fail( "Should not reach this point ..." );
         }
         catch ( DecoderException de )
         {
-            Assert.assertTrue( true );
+            assertTrue( true );
         }
     }
 
@@ -59,6 +62,7 @@
     /**
      * Test an empty OID
      */
+    @Test
     public void testOidEmpty()
     {
 
@@ -68,11 +72,11 @@
         {
             oid.setOID( new byte[]
                 {} );
-            Assert.fail( "Should not reach this point ..." );
+            fail( "Should not reach this point ..." );
         }
         catch ( DecoderException de )
         {
-            Assert.assertTrue( true );
+            assertTrue( true );
         }
     }
 
@@ -80,6 +84,7 @@
     /**
      * Test itu-t OID tree
      */
+    @Test
     public void testOidItuT()
     {
 
@@ -93,20 +98,20 @@
             {
                 oid.setOID( new byte[]
                     { 0x00, ( byte ) i } );
-                Assert.assertEquals( "0.0." + i, oid.toString() );
+                assertEquals( "0.0." + i, oid.toString() );
             }
 
             // itu-t(0), question(1)
             oid.setOID( new byte[]
                 { 0x01 } );
-            Assert.assertEquals( "0.1", oid.toString() );
+            assertEquals( "0.1", oid.toString() );
 
             // itu-t(0), administration(2), country(202 .. 748)
             for ( int i = 202; i < 748; i++ )
             {
                 oid.setOID( new byte[]
                     { 0x02, ( byte ) ( ( i / 128 ) | 0x0080 ), ( byte ) ( i % 128 ) } );
-                Assert.assertEquals( "0.2." + i, oid.toString() );
+                assertEquals( "0.2." + i, oid.toString() );
             }
 
             // itu-t(0), network-operator(3), operator(2023 .. 41363)
@@ -117,21 +122,21 @@
                 {
                     oid.setOID( new byte[]
                         { 0x03, ( byte ) ( ( i / 128 ) | 0x0080 ), ( byte ) ( i % 128 ) } );
-                    Assert.assertEquals( "0.3." + i, oid.toString() );
+                    assertEquals( "0.3." + i, oid.toString() );
                 }
                 else
                 {
                     oid.setOID( new byte[]
                         { 0x03, ( byte ) ( ( i / ( 128 * 128 ) ) | 0x0080 ),
                             ( byte ) ( ( ( i / 128 ) % 128 ) | 0x0080 ), ( byte ) ( i % 128 ) } );
-                    Assert.assertEquals( "0.3." + i, oid.toString() );
+                    assertEquals( "0.3." + i, oid.toString() );
 
                 }
             }
         }
         catch ( DecoderException de )
         {
-            Assert.fail();
+            fail();
         }
     }
 
@@ -139,6 +144,7 @@
     /**
      * Test iso OID tree
      */
+    @Test
     public void testOidIso()
     {
 
@@ -150,26 +156,26 @@
             // iso(1), standard(0)
             oid.setOID( new byte[]
                 { 40 + 0 } );
-            Assert.assertEquals( "1.0", oid.toString() );
+            assertEquals( "1.0", oid.toString() );
 
             // iso(1), registration-authority(1)
             oid.setOID( new byte[]
                 { 40 + 1 } );
-            Assert.assertEquals( "1.1", oid.toString() );
+            assertEquals( "1.1", oid.toString() );
 
             // iso(1), member-body(2)
             oid.setOID( new byte[]
                 { 40 + 2 } );
-            Assert.assertEquals( "1.2", oid.toString() );
+            assertEquals( "1.2", oid.toString() );
 
             // iso(1), identified-organization(3) | org(3) | organization(3)
             oid.setOID( new byte[]
                 { 40 + 3 } );
-            Assert.assertEquals( "1.3", oid.toString() );
+            assertEquals( "1.3", oid.toString() );
         }
         catch ( DecoderException de )
         {
-            Assert.fail();
+            fail();
         }
     }
 
@@ -177,6 +183,7 @@
     /**
      * Test joint-iso-itu-t OID tree
      */
+    @Test
     public void testOidJointIsoItuT()
     {
 
@@ -188,38 +195,38 @@
             // joint-iso-itu-t(2), presentation(0)
             oid.setOID( new byte[]
                 { 80 + 0 } );
-            Assert.assertEquals( "2.0", oid.toString() );
+            assertEquals( "2.0", oid.toString() );
 
             // joint-iso-itu-t(2), asn1(1)
             oid.setOID( new byte[]
                 { 80 + 1 } );
-            Assert.assertEquals( "2.1", oid.toString() );
+            assertEquals( "2.1", oid.toString() );
 
             // joint-iso-itu-t(2), association-control(2)
             oid.setOID( new byte[]
                 { 80 + 2 } );
-            Assert.assertEquals( "2.2", oid.toString() );
+            assertEquals( "2.2", oid.toString() );
 
             // joint-iso-itu-t(2), reliable-transfer(3)
             oid.setOID( new byte[]
                 { 80 + 3 } );
-            Assert.assertEquals( "2.3", oid.toString() );
+            assertEquals( "2.3", oid.toString() );
 
             // ...
             // joint-iso-itu-t(2), upu(40)
             oid.setOID( new byte[]
                 { 80 + 40 } );
-            Assert.assertEquals( "2.40", oid.toString() );
+            assertEquals( "2.40", oid.toString() );
 
             // ...
             // joint-iso-itu-t(2), xxx(100)
             oid.setOID( new byte[]
                 { ( byte ) ( 0x81 ), 0x34 } );
-            Assert.assertEquals( "2.100", oid.toString() );
+            assertEquals( "2.100", oid.toString() );
         }
         catch ( DecoderException de )
         {
-            Assert.fail();
+            fail();
         }
     }
 
@@ -227,6 +234,7 @@
     /**
      * Test valid String OIDs
      */
+    @Test
     public void testOidStringGood()
     {
 
@@ -235,23 +243,23 @@
         try
         {
             oid.setOID( "0.0" );
-            Assert.assertEquals( "0.0", oid.toString() );
+            assertEquals( "0.0", oid.toString() );
 
             oid.setOID( "0.0.0.0.0" );
-            Assert.assertEquals( "0.0.0.0.0", oid.toString() );
+            assertEquals( "0.0.0.0.0", oid.toString() );
 
             oid.setOID( "0.1.2.3.4" );
-            Assert.assertEquals( "0.1.2.3.4", oid.toString() );
+            assertEquals( "0.1.2.3.4", oid.toString() );
 
             oid.setOID( "2.123456" );
-            Assert.assertEquals( "2.123456", oid.toString() );
+            assertEquals( "2.123456", oid.toString() );
 
             oid.setOID( "1.2.840.113554.1.2.2" );
-            Assert.assertEquals( "1.2.840.113554.1.2.2", oid.toString() );
+            assertEquals( "1.2.840.113554.1.2.2", oid.toString() );
         }
         catch ( DecoderException de )
         {
-            Assert.fail();
+            fail();
         }
     }
 
@@ -259,6 +267,7 @@
     /**
      * Test invalid String OIDs
      */
+    @Test
     public void testOidStringBad()
     {
         assertFalse( OID.isOID( "0" ) );
@@ -277,6 +286,7 @@
     /**
      * Test Spnego OID
      */
+    @Test
     public void testOidSpnego()
     {
 
@@ -287,11 +297,11 @@
             oid.setOID( new byte[]
                 { 0x2b, 0x06, 0x01, 0x05, 0x05, 0x02 } );
 
-            Assert.assertEquals( "1.3.6.1.5.5.2", oid.toString() );
+            assertEquals( "1.3.6.1.5.5.2", oid.toString() );
         }
         catch ( DecoderException de )
         {
-            Assert.fail();
+            fail();
         }
     }
 
@@ -299,6 +309,7 @@
     /**
      * Test Kerberos V5 OID
      */
+    @Test
     public void testOidKerberosV5()
     {
 
@@ -309,11 +320,11 @@
             oid.setOID( new byte[]
                 { 0x2a, ( byte ) 0x86, 0x48, ( byte ) 0x86, ( byte ) 0xf7, 0x12, 0x01, 0x02, 0x02 } );
 
-            Assert.assertEquals( "1.2.840.113554.1.2.2", oid.toString() );
+            assertEquals( "1.2.840.113554.1.2.2", oid.toString() );
         }
         catch ( DecoderException de )
         {
-            Assert.fail();
+            fail();
         }
     }
 
@@ -321,6 +332,7 @@
     /**
      * Test OIDs bytes
      */
+    @Test
     public void testOidBytes()
     {
         OID oid = new OID();
@@ -330,33 +342,34 @@
         {
             oid.setOID( "0.0" );
             oid2.setOID( oid.getOID() );
-            Assert.assertEquals( oid.toString(), oid2.toString() );
+            assertEquals( oid.toString(), oid2.toString() );
 
             oid.setOID( "0.0.0.0.0" );
             oid2.setOID( oid.getOID() );
-            Assert.assertEquals( oid.toString(), oid2.toString() );
+            assertEquals( oid.toString(), oid2.toString() );
 
             oid.setOID( "0.1.2.3.4" );
             oid2.setOID( oid.getOID() );
-            Assert.assertEquals( oid.toString(), oid2.toString() );
+            assertEquals( oid.toString(), oid2.toString() );
 
             oid.setOID( "2.123456" );
             oid2.setOID( oid.getOID() );
-            Assert.assertEquals( oid.toString(), oid2.toString() );
+            assertEquals( oid.toString(), oid2.toString() );
 
             oid.setOID( "1.2.840.113554.1.2.2" );
             oid2.setOID( oid.getOID() );
-            Assert.assertEquals( oid.toString(), oid2.toString() );
+            assertEquals( oid.toString(), oid2.toString() );
         }
         catch ( DecoderException de )
         {
-            Assert.fail();
+            fail();
         }
     }
 
     /**
      * Test OID Equals
      */
+    @Test
     public void testOidEquals() throws DecoderException
     {
         OID oid1 = new OID();
@@ -371,6 +384,7 @@
     /**
      * Test OID Equals
      */
+    @Test
     public void testOidEqualsPerf() throws DecoderException
     {
         String s1 = "1.2.840.113554.1.2.2.1.2.840.113554.1.2.2.1.2.840.113554.1.2.2";

Modified: directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/PrimitivesTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/PrimitivesTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/PrimitivesTest.java (original)
+++ directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/PrimitivesTest.java Sat Apr 11 01:03:00 2009
@@ -20,12 +20,11 @@
 package org.apache.directory.shared.asn1.primitives;
 
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.util.IntegerDecoder;
 import org.apache.directory.shared.asn1.util.IntegerDecoderException;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 
 /**
@@ -33,11 +32,12 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class PrimitivesTest extends TestCase
+public class PrimitivesTest
 {
     /**
      * Test the Integer Primitive
      */
+    @Test
     public void testIntegerPrimitive() throws IntegerDecoderException
     {
         Value value = new Value();
@@ -45,55 +45,55 @@
         value.init( 1 );
         value.setData( new byte[]
             { 0x00 } ); // res = 0
-        Assert.assertEquals( 0, IntegerDecoder.parse( value ) );
+        assertEquals( 0, IntegerDecoder.parse( value ) );
         value.reset();
 
         value.init( 1 );
         value.setData( new byte[]
             { 0x01 } ); // res = 1
-        Assert.assertEquals( 1, IntegerDecoder.parse( value ) );
+        assertEquals( 1, IntegerDecoder.parse( value ) );
         value.reset();
 
         value.init( 1 );
         value.setData( new byte[]
             { ( byte ) 0xFF } ); // res = 255
-        Assert.assertEquals( -1, IntegerDecoder.parse( value ) );
+        assertEquals( -1, IntegerDecoder.parse( value ) );
         value.reset();
 
         value.init( 2 );
         value.setData( new byte[]
             { 0x00, 0x01 } ); // res = 1
-        Assert.assertEquals( 1, IntegerDecoder.parse( value ) );
+        assertEquals( 1, IntegerDecoder.parse( value ) );
         value.reset();
 
         value.init( 2 );
         value.setData( new byte[]
             { 0x01, 0x00 } ); // res = 256
-        Assert.assertEquals( 256, IntegerDecoder.parse( value ) );
+        assertEquals( 256, IntegerDecoder.parse( value ) );
         value.reset();
 
         value.init( 2 );
         value.setData( new byte[]
             { 0x01, 0x01 } ); // res = 257
-        Assert.assertEquals( 257, IntegerDecoder.parse( value ) );
+        assertEquals( 257, IntegerDecoder.parse( value ) );
         value.reset();
 
         value.init( 2 );
         value.setData( new byte[]
             { 0x01, ( byte ) 0xFF } ); // res = 511
-        Assert.assertEquals( 511, IntegerDecoder.parse( value ) );
+        assertEquals( 511, IntegerDecoder.parse( value ) );
         value.reset();
 
         value.init( 2 );
         value.setData( new byte[]
             { 0x02, 0x00 } ); // res = 512
-        Assert.assertEquals( 512, IntegerDecoder.parse( value ) );
+        assertEquals( 512, IntegerDecoder.parse( value ) );
         value.reset();
 
         value.init( 3 );
         value.setData( new byte[]
             { 0x00, ( byte ) 0xFF, ( byte ) 0xFF } ); // res = 65535
-        Assert.assertEquals( 65535, IntegerDecoder.parse( value ) );
+        assertEquals( 65535, IntegerDecoder.parse( value ) );
         value.reset();
 
         value.init( 4 );
@@ -104,7 +104,7 @@
                                                                                 // - 1
                                                                                 // =
                                                                                 // MaxInt
-        Assert.assertEquals( Integer.MAX_VALUE, IntegerDecoder.parse( value ) );
+        assertEquals( Integer.MAX_VALUE, IntegerDecoder.parse( value ) );
         value.reset();
 
         value.init( 4 );
@@ -114,7 +114,7 @@
                                                                                 // 2^31
                                                                                 // =
                                                                                 // MinInt
-        Assert.assertEquals( Integer.MIN_VALUE, IntegerDecoder.parse( value ) );
+        assertEquals( Integer.MIN_VALUE, IntegerDecoder.parse( value ) );
         value.reset();
     }
 } // end class TLVTagDecoderTest

Propchange: directory/shared/trunk/client-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 11 01:03:00 2009
@@ -0,0 +1,4 @@
+target
+.classpath
+.project
+.settings

Copied: directory/shared/trunk/client-api/pom.xml (from r764113, directory/shared/branches/shared-replication/client-api/pom.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/client-api/pom.xml?p2=directory/shared/trunk/client-api/pom.xml&p1=directory/shared/branches/shared-replication/client-api/pom.xml&r1=764113&r2=764131&rev=764131&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/client-api/pom.xml (original)
+++ directory/shared/trunk/client-api/pom.xml Sat Apr 11 01:03:00 2009
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.shared</groupId>
     <artifactId>shared-parent</artifactId>
-    <version>0.9.14-SNAPSHOT</version>
+    <version>0.9.15-SNAPSHOT</version>
   </parent>
   <artifactId>shared-client-api</artifactId>
   <name>Apache Directory Protocol Ldap client API</name>

Modified: directory/shared/trunk/convert/src/test/java/org/apache/directory/shared/converter/schema/TestSchemaToLdif.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/convert/src/test/java/org/apache/directory/shared/converter/schema/TestSchemaToLdif.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/convert/src/test/java/org/apache/directory/shared/converter/schema/TestSchemaToLdif.java (original)
+++ directory/shared/trunk/convert/src/test/java/org/apache/directory/shared/converter/schema/TestSchemaToLdif.java Sat Apr 11 01:03:00 2009
@@ -25,10 +25,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 
-public class TestSchemaToLdif extends TestCase
+public class TestSchemaToLdif
 {
     private static final String HEADER = 
         "#\n" +
@@ -74,6 +75,7 @@
     //-------------------------------------------------------------------------
     // Tests for ObjectClass
     //-------------------------------------------------------------------------
+    @Test
     public void testConvertOC() throws ParserException, IOException
     {
         String expected =
@@ -96,6 +98,7 @@
         assertEquals( expected, transform( "testOC") );
     }
     
+    @Test
     public void testConvertOCMinimal() throws ParserException, IOException
     {
         String expected =
@@ -110,6 +113,7 @@
         assertEquals( expected, transform( "testOCMinimal" ) );
     }
     
+    @Test
     public void testConvertOCNoName() throws ParserException, IOException
     {
         String expected =
@@ -132,6 +136,7 @@
         assertEquals( expected, transform( "testOCNoName" ) );
     }
 
+    @Test
     public void testConvertOCAbstract() throws ParserException, IOException
     {
         String expected =
@@ -147,6 +152,7 @@
         assertEquals( expected, transform( "testOCAbstract" ) );
     }
 
+    @Test
     public void testConvertOCAuxiliary() throws ParserException, IOException
     {
         String expected =
@@ -162,6 +168,7 @@
         assertEquals( expected, transform( "testOCAuxiliary" ) );
     }
 
+    @Test
     public void testConvertOCDesc() throws ParserException, IOException
     {
         String expected =
@@ -177,6 +184,7 @@
         assertEquals( expected, transform( "testOCDesc" ) );
     }
 
+    @Test
     public void testConvertOCMayOne() throws ParserException, IOException
     {
         String expected =
@@ -192,6 +200,7 @@
         assertEquals( expected, transform( "testOCMayOne" ) );
     }
 
+    @Test
     public void testConvertOCMay2() throws ParserException, IOException
     {
         String expected =
@@ -208,6 +217,7 @@
         assertEquals( expected, transform( "testOCMay2" ) );
     }
 
+    @Test
     public void testConvertOCMayMany() throws ParserException, IOException
     {
         String expected =
@@ -225,6 +235,7 @@
         assertEquals( expected, transform( "testOCMayMany" ) );
     }
 
+    @Test
     public void testConvertOCMustOne() throws ParserException, IOException
     {
         String expected =
@@ -240,6 +251,7 @@
         assertEquals( expected, transform( "testOCMustOne" ) );
     }
 
+    @Test
     public void testConvertOCMust2() throws ParserException, IOException
     {
         String expected =
@@ -256,6 +268,7 @@
         assertEquals( expected, transform( "testOCMust2" ) );
     }
 
+    @Test
     public void testConvertOCMustMany() throws ParserException, IOException
     {
         String expected =
@@ -273,6 +286,7 @@
         assertEquals( expected, transform( "testOCMustMany" ) );
     }
 
+    @Test
     public void testConvertOCNameOne() throws ParserException, IOException
     {
         String expected =
@@ -288,6 +302,7 @@
         assertEquals( expected, transform( "testOCNameOne" ) );
     }
 
+    @Test
     public void testConvertOCName2() throws ParserException, IOException
     {
         String expected =
@@ -304,6 +319,7 @@
         assertEquals( expected, transform( "testOCName2" ) );
     }
 
+    @Test
     public void testConvertOCNameMany() throws ParserException, IOException
     {
         String expected =
@@ -321,6 +337,7 @@
         assertEquals( expected, transform( "testOCNameMany" ) );
     }
 
+    @Test
     public void testConvertOCObsolete() throws ParserException, IOException
     {
         String expected =
@@ -336,6 +353,7 @@
         assertEquals( expected, transform( "testOCObsolete" ) );
     }
 
+    @Test
     public void testConvertOCSupOne() throws ParserException, IOException
     {
         String expected =
@@ -351,6 +369,7 @@
         assertEquals( expected, transform( "testOCSupOne" ) );
     }
 
+    @Test
     public void testConvertOCSup2() throws ParserException, IOException
     {
         String expected =
@@ -367,6 +386,7 @@
         assertEquals( expected, transform( "testOCSup2" ) );
     }
 
+    @Test
     public void testConvertOCSupMany() throws ParserException, IOException
     {
         String expected =
@@ -387,6 +407,7 @@
     //-------------------------------------------------------------------------
     // Tests for Attributetype
     //-------------------------------------------------------------------------
+    @Test
     public void testConvertATMinimal() throws ParserException, IOException
     {
         String expected =
@@ -401,6 +422,7 @@
         assertEquals( expected, transform( "testATMinimal" ) );
     }
     
+    @Test
     public void testConvertATNoName() throws ParserException, IOException
     {
         String expected =
@@ -415,6 +437,7 @@
         assertEquals( expected, transform( "testATNoName" ) );
     }
 
+    @Test
     public void testConvertATNameOne() throws ParserException, IOException
     {
         String expected =
@@ -430,6 +453,7 @@
         assertEquals( expected, transform( "testATNameOne" ) );
     }
 
+    @Test
     public void testConvertATName2() throws ParserException, IOException
     {
         String expected =
@@ -446,6 +470,7 @@
         assertEquals( expected, transform( "testATName2" ) );
     }
 
+    @Test
     public void testConvertATNameMany() throws ParserException, IOException
     {
         String expected =
@@ -463,6 +488,7 @@
         assertEquals( expected, transform( "testATNameMany" ) );
     }
 
+    @Test
     public void testConvertATDesc() throws ParserException, IOException
     {
         String expected =
@@ -478,6 +504,7 @@
         assertEquals( expected, transform( "testATDesc" ) );
     }
 
+    @Test
     public void testConvertATObsolete() throws ParserException, IOException
     {
         String expected =
@@ -493,6 +520,7 @@
         assertEquals( expected, transform( "testATObsolete" ) );
     }
 
+    @Test
     public void testConvertATSup() throws ParserException, IOException
     {
         String expected =
@@ -508,6 +536,7 @@
         assertEquals( expected, transform( "testATSup" ) );
     }
 
+    @Test
     public void testConvertATSupOID() throws ParserException, IOException
     {
         String expected =
@@ -523,6 +552,7 @@
         assertEquals( expected, transform( "testATSupOID" ) );
     }
 
+    @Test
     public void testConvertATEquality() throws ParserException, IOException
     {
         String expected =
@@ -538,6 +568,7 @@
         assertEquals( expected, transform( "testATEquality" ) );
     }
 
+    @Test
     public void testConvertATEqualityOID() throws ParserException, IOException
     {
         String expected =
@@ -553,6 +584,7 @@
         assertEquals( expected, transform( "testATEqualityOID" ) );
     }
 
+    @Test
     public void testConvertATOrdering() throws ParserException, IOException
     {
         String expected =
@@ -568,6 +600,7 @@
         assertEquals( expected, transform( "testATOrdering" ) );
     }
 
+    @Test
     public void testConvertATOrderingOID() throws ParserException, IOException
     {
         String expected =
@@ -583,6 +616,7 @@
         assertEquals( expected, transform( "testATOrderingOID" ) );
     }
 
+    @Test
     public void testConvertATSubstr() throws ParserException, IOException
     {
         String expected =
@@ -598,6 +632,7 @@
         assertEquals( expected, transform( "testATSubstr" ) );
     }
 
+    @Test
     public void testConvertATSubstrOID() throws ParserException, IOException
     {
         String expected =
@@ -613,6 +648,7 @@
         assertEquals( expected, transform( "testATSubstrOID" ) );
     }
 
+    @Test
     public void testConvertATSyntax() throws ParserException, IOException
     {
         String expected =
@@ -628,6 +664,7 @@
         assertEquals( expected, transform( "testATSyntax" ) );
     }
 
+    @Test
     public void testConvertATSyntaxOidLen() throws ParserException, IOException
     {
         String expected =
@@ -644,6 +681,7 @@
         assertEquals( expected, transform( "testATSyntaxOidLen" ) );
     }
 
+    @Test
     public void testConvertATSingleValue() throws ParserException, IOException
     {
         String expected =
@@ -659,6 +697,7 @@
         assertEquals( expected, transform( "testATSingleValue" ) );
     }
 
+    @Test
     public void testConvertATCollective() throws ParserException, IOException
     {
         String expected =
@@ -674,6 +713,7 @@
         assertEquals( expected, transform( "testATCollective" ) );
     }
 
+    @Test
     public void testConvertATNoUserModification() throws ParserException, IOException
     {
         String expected =
@@ -689,6 +729,7 @@
         assertEquals( expected, transform( "testATNoUserModification" ) );
     }
 
+    @Test
     public void testConvertATUsageUserApp() throws ParserException, IOException
     {
         String expected =
@@ -703,6 +744,7 @@
         assertEquals( expected, transform( "testATUsageUserApp" ) );
     }
 
+    @Test
     public void testConvertATUsageDirOp() throws ParserException, IOException
     {
         String expected =
@@ -718,6 +760,7 @@
         assertEquals( expected, transform( "testATUsageDirOp" ) );
     }
 
+    @Test
     public void testConvertATUsageDistrOp() throws ParserException, IOException
     {
         String expected =
@@ -733,6 +776,7 @@
         assertEquals( expected, transform( "testATUsageDistrOp" ) );
     }
 
+    @Test
     public void testConvertATUsageDSAOp() throws ParserException, IOException
     {
         String expected =
@@ -748,6 +792,7 @@
         assertEquals( expected, transform( "testATUsageDsaOp" ) );
     }
 
+    @Test
     public void testConvertMozillaATWithOidLen() throws ParserException, IOException
     {
         String expected =

Propchange: directory/shared/trunk/cursor/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 11 01:03:00 2009
@@ -0,0 +1,4 @@
+target
+.classpath
+.project
+.settings

Copied: directory/shared/trunk/cursor/pom.xml (from r764113, directory/shared/branches/shared-replication/cursor/pom.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/cursor/pom.xml?p2=directory/shared/trunk/cursor/pom.xml&p1=directory/shared/branches/shared-replication/cursor/pom.xml&r1=764113&r2=764131&rev=764131&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/cursor/pom.xml (original)
+++ directory/shared/trunk/cursor/pom.xml Sat Apr 11 01:03:00 2009
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.shared</groupId>
     <artifactId>shared-parent</artifactId>
-    <version>0.9.14-SNAPSHOT</version>
+    <version>0.9.15-SNAPSHOT</version>
   </parent>
   <artifactId>shared-cursor</artifactId>
   <name>Cursor implementation</name>

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java Sat Apr 11 01:03:00 2009
@@ -38,7 +38,7 @@
     // ----------------------------------------------------------------------------
 
     /** The ldap message */
-    private LdapMessage ldapMessage;
+    private LdapMessageCodec ldapMessage;
 
     /** checks if attribute is binary */
     private final BinaryAttributeDetector binaryAttributeDetector;
@@ -47,7 +47,7 @@
     private int messageId;
     
     /** The current control */
-    private Control currentControl;
+    private ControlCodec currentControl;
 
     // ~ Constructors
     // -------------------------------------------------------------------------------
@@ -89,7 +89,7 @@
     /**
      * @return Returns the ldapMessage.
      */
-    public LdapMessage getLdapMessage()
+    public LdapMessageCodec getLdapMessage()
     {
         return ldapMessage;
     }
@@ -101,7 +101,7 @@
      * 
      * @param ldapMessage The message to set.
      */
-    public void setLdapMessage( LdapMessage ldapMessage )
+    public void setLdapMessage( LdapMessageCodec ldapMessage )
     {
         this.ldapMessage = ldapMessage;
     }
@@ -147,7 +147,7 @@
     /**
      * @return the current control being created
      */
-    public Control getCurrentControl()
+    public ControlCodec getCurrentControl()
     {
         return currentControl;
     }
@@ -156,7 +156,7 @@
      * Store a newly created control
      * @param currentControl The control to store
      */
-    public void setCurrentControl( Control currentControl )
+    public void setCurrentControl( ControlCodec currentControl )
     {
         this.currentControl = currentControl;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Sat Apr 11 01:03:00 2009
@@ -38,7 +38,7 @@
 import org.apache.directory.shared.asn1.util.BooleanDecoderException;
 import org.apache.directory.shared.asn1.util.IntegerDecoder;
 import org.apache.directory.shared.asn1.util.IntegerDecoderException;
-import org.apache.directory.shared.ldap.codec.abandon.AbandonRequest;
+import org.apache.directory.shared.ldap.codec.abandon.AbandonRequestCodec;
 import org.apache.directory.shared.ldap.codec.actions.AttributeDescAction;
 import org.apache.directory.shared.ldap.codec.actions.ControlValueAction;
 import org.apache.directory.shared.ldap.codec.actions.ControlsInitAction;
@@ -71,30 +71,30 @@
 import org.apache.directory.shared.ldap.codec.actions.StoreReferenceAction;
 import org.apache.directory.shared.ldap.codec.actions.StoreTypeMatchingRuleAction;
 import org.apache.directory.shared.ldap.codec.actions.ValueAction;
-import org.apache.directory.shared.ldap.codec.add.AddRequest;
-import org.apache.directory.shared.ldap.codec.add.AddResponse;
-import org.apache.directory.shared.ldap.codec.bind.BindRequest;
-import org.apache.directory.shared.ldap.codec.bind.BindResponse;
+import org.apache.directory.shared.ldap.codec.add.AddRequestCodec;
+import org.apache.directory.shared.ldap.codec.add.AddResponseCodec;
+import org.apache.directory.shared.ldap.codec.bind.BindRequestCodec;
+import org.apache.directory.shared.ldap.codec.bind.BindResponseCodec;
 import org.apache.directory.shared.ldap.codec.bind.SaslCredentials;
 import org.apache.directory.shared.ldap.codec.bind.SimpleAuthentication;
-import org.apache.directory.shared.ldap.codec.compare.CompareRequest;
-import org.apache.directory.shared.ldap.codec.compare.CompareResponse;
-import org.apache.directory.shared.ldap.codec.del.DelRequest;
-import org.apache.directory.shared.ldap.codec.del.DelResponse;
-import org.apache.directory.shared.ldap.codec.extended.ExtendedRequest;
-import org.apache.directory.shared.ldap.codec.extended.ExtendedResponse;
-import org.apache.directory.shared.ldap.codec.intermediate.IntermediateResponse;
-import org.apache.directory.shared.ldap.codec.modify.ModifyRequest;
-import org.apache.directory.shared.ldap.codec.modify.ModifyResponse;
-import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNRequest;
-import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNResponse;
+import org.apache.directory.shared.ldap.codec.compare.CompareRequestCodec;
+import org.apache.directory.shared.ldap.codec.compare.CompareResponseCodec;
+import org.apache.directory.shared.ldap.codec.del.DelRequestCodec;
+import org.apache.directory.shared.ldap.codec.del.DelResponseCodec;
+import org.apache.directory.shared.ldap.codec.extended.ExtendedRequestCodec;
+import org.apache.directory.shared.ldap.codec.extended.ExtendedResponseCodec;
+import org.apache.directory.shared.ldap.codec.intermediate.IntermediateResponseCodec;
+import org.apache.directory.shared.ldap.codec.modify.ModifyRequestCodec;
+import org.apache.directory.shared.ldap.codec.modify.ModifyResponseCodec;
+import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNRequestCodec;
+import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNResponseCodec;
 import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
-import org.apache.directory.shared.ldap.codec.search.SearchResultDone;
-import org.apache.directory.shared.ldap.codec.search.SearchResultEntry;
-import org.apache.directory.shared.ldap.codec.search.SearchResultReference;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
+import org.apache.directory.shared.ldap.codec.search.SearchResultDoneCodec;
+import org.apache.directory.shared.ldap.codec.search.SearchResultEntryCodec;
+import org.apache.directory.shared.ldap.codec.search.SearchResultReferenceCodec;
 import org.apache.directory.shared.ldap.codec.search.SubstringFilter;
-import org.apache.directory.shared.ldap.codec.unbind.UnBindRequest;
+import org.apache.directory.shared.ldap.codec.unbind.UnBindRequestCodec;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AddResponseImpl;
 import org.apache.directory.shared.ldap.message.BindResponseImpl;
@@ -181,7 +181,7 @@
                     }
 
                     // First, create a empty LdapMessage Object
-                    LdapMessage ldapMessage = new LdapMessage();
+                    LdapMessageCodec ldapMessage = new LdapMessageCodec();
 
                     // Then stores it into the container
                     ldapMessageContainer.setLdapMessage( ldapMessage );
@@ -211,7 +211,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // The current TLV should be a integer
                     // We get it and store it in MessageId
@@ -293,7 +293,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
                     int expectedLength = tlv.getLength();
@@ -308,7 +308,7 @@
                         throw new DecoderException( "The length of a UnBindRequest must be null" );
                     }
 
-                    UnBindRequest unBindRequest = new UnBindRequest();
+                    UnBindRequestCodec unBindRequest = new UnBindRequestCodec();
 
                     unBindRequest.setParent( ldapMessage );
 
@@ -348,10 +348,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the DelRequest Object
-                    DelRequest delRequest = new DelRequest();
+                    DelRequestCodec delRequest = new DelRequestCodec();
 
                     // And store the DN into it
                     // Get the Value and store it in the DelRequest
@@ -427,7 +427,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // The current TLV should be a integer
                     // We get it and store it in MessageId
@@ -450,7 +450,7 @@
 
                         // Ok, the Message ID is correct. We have to store it
                         // in the AbandonRequest Object
-                        AbandonRequest abandonRequest = new AbandonRequest();
+                        AbandonRequestCodec abandonRequest = new AbandonRequestCodec();
                         abandonRequest.setAbandonedMessageId( abandonnedMessageId );
                         ldapMessage.setProtocolOP( abandonRequest );
 
@@ -501,7 +501,7 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We will check that the request is not null
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -516,7 +516,7 @@
                     }
 
                     // Now, we can allocate the BindRequest Object
-                    ldapMessage.setProtocolOP( new BindRequest() );
+                    ldapMessage.setProtocolOP( new BindRequestCodec() );
                 }
             } );
 
@@ -536,7 +536,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    BindRequest bindRequestMessage = ldapMessageContainer.getLdapMessage().getBindRequest();
+                    BindRequestCodec bindRequestMessage = ldapMessageContainer.getLdapMessage().getBindRequest();
 
                     // The current TLV should be a integer between 1 and 127
                     // We get it and store it in Version
@@ -584,8 +584,8 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    BindRequest bindRequestMessage = ldapMessage.getBindRequest();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    BindRequestCodec bindRequestMessage = ldapMessage.getBindRequest();
 
                     // Get the Value and store it in the BindRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -646,7 +646,7 @@
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    BindRequest bindRequestMessage = ldapMessageContainer.getLdapMessage().getBindRequest();
+                    BindRequestCodec bindRequestMessage = ldapMessageContainer.getLdapMessage().getBindRequest();
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // Allocate the Authentication Object
@@ -709,8 +709,8 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    BindRequest bindRequestMessage = ldapMessage.getBindRequest();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    BindRequestCodec bindRequestMessage = ldapMessage.getBindRequest();
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // We will check that the sasl is not null
@@ -756,8 +756,8 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    BindRequest bindRequestMessage = ldapMessage.getBindRequest();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    BindRequestCodec bindRequestMessage = ldapMessage.getBindRequest();
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // Get the SaslCredentials Object
@@ -802,7 +802,7 @@
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    BindRequest bindRequestMessage = ldapMessageContainer.getLdapMessage().getBindRequest();
+                    BindRequestCodec bindRequestMessage = ldapMessageContainer.getLdapMessage().getBindRequest();
 
                     // Get the Value and store it in the BindRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -867,10 +867,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the BindRequest Object
-                    BindResponse bindResponse = new BindResponse();
+                    BindResponseCodec bindResponse = new BindResponseCodec();
 
                     // As this is a new Constructed object, we have to init its
                     // length
@@ -1058,9 +1058,9 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    LdapResponse response = ldapMessage.getLdapResponse();
-                    LdapResult ldapResult = response.getLdapResult();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapResponseCodec response = ldapMessage.getLdapResponse();
+                    LdapResultCodec ldapResult = response.getLdapResult();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -1140,11 +1140,11 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the SearchResultEntry Object
                     // And we associate it to the ldapMessage Object
-                    ldapMessage.setProtocolOP( new SearchResultEntry() );
+                    ldapMessage.setProtocolOP( new SearchResultEntryCodec() );
                 }
             } );
 
@@ -1164,8 +1164,8 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    SearchResultEntry searchResultEntry = ldapMessage.getSearchResultEntry();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    SearchResultEntryCodec searchResultEntry = ldapMessage.getSearchResultEntry();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -1270,8 +1270,8 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    SearchResultEntry searchResultEntry = ldapMessage.getSearchResultEntry();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    SearchResultEntryCodec searchResultEntry = ldapMessage.getSearchResultEntry();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -1409,10 +1409,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the SearchResultDone Object
-                    ldapMessage.setProtocolOP( new SearchResultDone() );
+                    ldapMessage.setProtocolOP( new SearchResultDoneCodec() );
 
                     log.debug( "Search Result Done found" );
                 }
@@ -1448,11 +1448,11 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the ModifyRequest Object
                     // And we associate it to the ldapMessage Object
-                    ldapMessage.setProtocolOP( new ModifyRequest() );
+                    ldapMessage.setProtocolOP( new ModifyRequestCodec() );
                 }
             } );
 
@@ -1472,8 +1472,8 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    ModifyRequest modifyRequest = ldapMessage.getModifyRequest();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    ModifyRequestCodec modifyRequest = ldapMessage.getModifyRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -1530,8 +1530,8 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    ModifyRequest modifyRequest = ldapMessage.getModifyRequest();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    ModifyRequestCodec modifyRequest = ldapMessage.getModifyRequest();
 
                     modifyRequest.initModifications();
                 }
@@ -1567,8 +1567,8 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    ModifyRequest modifyRequest = ldapMessage.getModifyRequest();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    ModifyRequestCodec modifyRequest = ldapMessage.getModifyRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -1651,8 +1651,8 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    ModifyRequest modifyRequest = ldapMessage.getModifyRequest();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    ModifyRequestCodec modifyRequest = ldapMessage.getModifyRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -1836,10 +1836,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We associate it to the ldapMessage Object
-                    ldapMessage.setProtocolOP( new ModifyResponse() );
+                    ldapMessage.setProtocolOP( new ModifyResponseCodec() );
 
                     log.debug( "Modify response" );
                 }
@@ -1875,7 +1875,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We will check that the request is not null
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -1891,7 +1891,7 @@
 
                     // Now, we can allocate the ModifyRequest Object
                     // And we associate it to the ldapMessage Object
-                    ldapMessage.setProtocolOP( new AddRequest() );
+                    ldapMessage.setProtocolOP( new AddRequestCodec() );
                 }
             } );
 
@@ -1911,8 +1911,8 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    AddRequest addRequest = ldapMessage.getAddRequest();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    AddRequestCodec addRequest = ldapMessage.getAddRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -1996,10 +1996,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
-                    AddRequest addRequest = ldapMessage.getAddRequest();
+                    AddRequestCodec addRequest = ldapMessage.getAddRequest();
 
                     // Store the type. It can't be null.
 
@@ -2107,7 +2107,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We will check that the request is not null
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2122,7 +2122,7 @@
                     }
 
                     // Now, we can allocate the AddRequest Object
-                    AddResponse addResponse = new AddResponse();
+                    AddResponseCodec addResponse = new AddResponseCodec();
 
                     // As this is a new Constructed object, we have to init its
                     // length
@@ -2166,12 +2166,12 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the DelResponse Object
 
                     // And we associate it to the ldapMessage Object
-                    ldapMessage.setProtocolOP( new DelResponse() );
+                    ldapMessage.setProtocolOP( new DelResponseCodec() );
 
                     log.debug( "Del response " );
                 }
@@ -2207,11 +2207,11 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the ModifyDNRequest Object
                     // And we associate it to the ldapMessage Object
-                    ldapMessage.setProtocolOP( new ModifyDNRequest() );
+                    ldapMessage.setProtocolOP( new ModifyDNRequestCodec() );
 
                 }
             } );
@@ -2232,9 +2232,9 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
-                    ModifyDNRequest modifyDNRequest = ldapMessage.getModifyDNRequest();
+                    ModifyDNRequestCodec modifyDNRequest = ldapMessage.getModifyDNRequest();
 
                     // Get the Value and store it in the modifyDNRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2298,9 +2298,9 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
-                    ModifyDNRequest modifyDNRequest = ldapMessage.getModifyDNRequest();
+                    ModifyDNRequestCodec modifyDNRequest = ldapMessage.getModifyDNRequest();
 
                     // Get the Value and store it in the modifyDNRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2365,12 +2365,12 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // Store the value.
-                    ModifyDNRequest modifyDNRequest = ldapMessage.getModifyDNRequest();
+                    ModifyDNRequestCodec modifyDNRequest = ldapMessage.getModifyDNRequest();
 
                     // We get the value. If it's a 0, it's a FALSE. If it's
                     // a FF, it's a TRUE. Any other value should be an error,
@@ -2427,9 +2427,9 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
-                    ModifyDNRequest modifyDNRequest = ldapMessage.getModifyDNRequest();
+                    ModifyDNRequestCodec modifyDNRequest = ldapMessage.getModifyDNRequest();
 
                     // Get the Value and store it in the modifyDNRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2527,10 +2527,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // And we associate it to the ldapMessage Object
-                    ldapMessage.setProtocolOP( new ModifyDNResponse() );
+                    ldapMessage.setProtocolOP( new ModifyDNResponseCodec() );
 
                     log.debug( "Modify DN response " );
                 }
@@ -2570,10 +2570,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the CompareRequest Object
-                    ldapMessage.setProtocolOP( new CompareRequest() );
+                    ldapMessage.setProtocolOP( new CompareRequestCodec() );
                 }
             } );
 
@@ -2593,10 +2593,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the CompareRequest Object
-                    CompareRequest compareRequest = ldapMessage.getCompareRequest();
+                    CompareRequestCodec compareRequest = ldapMessage.getCompareRequest();
 
                     // Get the Value and store it in the CompareRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2669,10 +2669,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Get the CompareRequest Object
-                    CompareRequest compareRequest = ldapMessage.getCompareRequest();
+                    CompareRequestCodec compareRequest = ldapMessage.getCompareRequest();
 
                     // Get the Value and store it in the CompareRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2717,10 +2717,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Get the CompareRequest Object
-                    CompareRequest compareRequest = ldapMessage.getCompareRequest();
+                    CompareRequestCodec compareRequest = ldapMessage.getCompareRequest();
 
                     // Get the Value and store it in the CompareRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2786,7 +2786,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We will check that the request is not null
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2800,7 +2800,7 @@
 
                     // Now, we can allocate the CompareResponse Object
                     // And we associate it to the ldapMessage Object
-                    ldapMessage.setProtocolOP( new CompareResponse() );
+                    ldapMessage.setProtocolOP( new CompareResponseCodec() );
 
                     log.debug( "Compare response " );
                 }
@@ -2836,10 +2836,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the BindRequest Object
-                    SearchResultReference searchResultReference = new SearchResultReference();
+                    SearchResultReferenceCodec searchResultReference = new SearchResultReferenceCodec();
 
                     // As this is a new Constructed object, we have to init its
                     // length
@@ -2899,10 +2899,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the ExtendedRequest Object
-                    ldapMessage.setProtocolOP( new ExtendedRequest() );
+                    ldapMessage.setProtocolOP( new ExtendedRequestCodec() );
                 }
             } );
 
@@ -2922,10 +2922,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the ExtendedRequest Object
-                    ExtendedRequest extendedRequest = ldapMessage.getExtendedRequest();
+                    ExtendedRequestCodec extendedRequest = ldapMessage.getExtendedRequest();
 
                     // Get the Value and store it in the ExtendedRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2985,10 +2985,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the ExtendedRequest Object
-                    ExtendedRequest extendedRequest = ldapMessage.getExtendedRequest();
+                    ExtendedRequestCodec extendedRequest = ldapMessage.getExtendedRequest();
 
                     // Get the Value and store it in the ExtendedRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -3053,10 +3053,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the ExtendedResponse Object
-                    ldapMessage.setProtocolOP( new ExtendedResponse() );
+                    ldapMessage.setProtocolOP( new ExtendedResponseCodec() );
                 }
             } );
 
@@ -3267,10 +3267,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the IntermediateResponse Object
-                    ldapMessage.setProtocolOP( new IntermediateResponse() );
+                    ldapMessage.setProtocolOP( new IntermediateResponseCodec() );
                 }
             } );
 
@@ -3290,10 +3290,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can get the IntermediateResponse Object
-                    IntermediateResponse intermediateResponse = ldapMessage.getIntermediateResponse();
+                    IntermediateResponseCodec intermediateResponse = ldapMessage.getIntermediateResponse();
 
                     // Get the Value and store it in the IntermediateResponse
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -3354,10 +3354,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can get the IntermediateResponse Object
-                    IntermediateResponse intermediateResponse = ldapMessage.getIntermediateResponse();
+                    IntermediateResponseCodec intermediateResponse = ldapMessage.getIntermediateResponse();
 
                     // Get the Value and store it in the IntermediateResponse
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -3399,10 +3399,10 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the ExtendedRequest Object
-                    IntermediateResponse intermediateResponse = ldapMessage.getIntermediateResponse();
+                    IntermediateResponseCodec intermediateResponse = ldapMessage.getIntermediateResponse();
 
                     // Get the Value and store it in the IntermediateResponse
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -3461,7 +3461,7 @@
             public void action( IAsn1Container container ) throws DecoderException
             {
                 LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                LdapMessage message = ldapMessageContainer.getLdapMessage();
+                LdapMessageCodec message = ldapMessageContainer.getLdapMessage();
 
                 TLV tlv = ldapMessageContainer.getCurrentTLV();
                 int expectedLength = tlv.getLength();
@@ -3476,7 +3476,7 @@
                 }
 
                 // Create a new control
-                Control control = new Control();
+                ControlCodec control = new ControlCodec();
 
                 // Store the control into the container
                 message.addControl( control );
@@ -3508,12 +3508,12 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage message = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec message = ldapMessageContainer.getLdapMessage();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // Get the current control
-                    Control control = message.getCurrentControl();
+                    ControlCodec control = message.getCurrentControl();
 
                     // Store the type
                     // We have to handle the special case of a 0 length OID
@@ -3572,12 +3572,12 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage message = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec message = ldapMessageContainer.getLdapMessage();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // Get the current control
-                    Control control = message.getCurrentControl();
+                    ControlCodec control = message.getCurrentControl();
 
                     // Store the criticality
                     // We get the value. If it's a 0, it's a FALSE. If it's
@@ -3683,11 +3683,11 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the SearchRequest
                     // And we associate it to the ldapMessage Object
-                    ldapMessage.setProtocolOP( new SearchRequest() );
+                    ldapMessage.setProtocolOP( new SearchRequestCodec() );
                 }
             } );
 
@@ -3707,8 +3707,8 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    SearchRequest searchRequest = ldapMessage.getSearchRequest();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -3768,7 +3768,7 @@
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    SearchRequest searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
+                    SearchRequestCodec searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -3833,7 +3833,7 @@
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    SearchRequest searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
+                    SearchRequestCodec searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -3897,7 +3897,7 @@
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    SearchRequest searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
+                    SearchRequestCodec searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -3945,7 +3945,7 @@
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    SearchRequest searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
+                    SearchRequestCodec searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -3994,7 +3994,7 @@
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    SearchRequest searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
+                    SearchRequestCodec searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -5141,8 +5141,8 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    SearchRequest searchRequest = ldapMessage.getSearchRequest();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -5215,8 +5215,8 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    SearchRequest searchRequest = ldapMessage.getSearchRequest();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -6136,8 +6136,8 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    SearchRequest searchRequest = ldapMessage.getSearchRequest();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -6263,8 +6263,8 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    SearchRequest searchRequest = ldapMessage.getSearchRequest();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java Sat Apr 11 01:03:00 2009
@@ -21,9 +21,9 @@
 package org.apache.directory.shared.ldap.codec;
 
 import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.message.Message;
+import org.apache.directory.shared.ldap.message.InternalMessage;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.ResultResponse;
+import org.apache.directory.shared.ldap.message.InternalResultResponse;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 
@@ -45,7 +45,7 @@
     private static final long serialVersionUID = 1L;
 
     /** The response with the error cause */
-    private transient Message response;
+    private transient InternalMessage response;
     
     /**
      * Creates a DecoderException
@@ -64,7 +64,7 @@
      * @param message A message with meaning to a human
      * @param cause The Exception which caused the error
      */
-    public ResponseCarryingException(String message, ResultResponse response, ResultCodeEnum code, 
+    public ResponseCarryingException(String message, InternalResultResponse response, ResultCodeEnum code, 
         LdapDN matchedDn, Throwable cause)
     {
         super( message, cause );
@@ -80,7 +80,7 @@
      * Set a response if we get an exception while parsing the message
      * @param response the constructed response
      */
-    public void setResponse( Message response ) 
+    public void setResponse( InternalMessage response ) 
     {
         this.response = response;
     }
@@ -89,7 +89,7 @@
      * Get the constructed response
      * @return The constructed response
      */
-    public Message getResponse()
+    public InternalMessage getResponse()
     {
         return response;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixEncoder.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixEncoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixEncoder.java Sat Apr 11 01:03:00 2009
@@ -93,7 +93,7 @@
             }
 
             ( ( OutputCallback ) encodeCallback ).attach( out );
-            encodeCallback.encodeOccurred( null, ( ( LdapMessage ) obj ).encode( null ) );
+            encodeCallback.encodeOccurred( null, ( ( LdapMessageCodec ) obj ).encode( null ) );
         }
         catch ( EncoderException e )
         {
@@ -122,7 +122,7 @@
                 log.debug( "Encoding this LdapMessage : " + obj );
             }
 
-            ByteBuffer pdu = ( ( LdapMessage ) obj ).encode( null );
+            ByteBuffer pdu = ( ( LdapMessageCodec ) obj ).encode( null );
 
             if ( IS_DEBUG )
             {
@@ -159,7 +159,7 @@
                 log.debug( "Encoding this LdapMessage : " + obj );
             }
 
-            byte[] pdu = ( ( LdapMessage ) obj ).encode( null ).array();
+            byte[] pdu = ( ( LdapMessageCodec ) obj ).encode( null ).array();
 
             if ( IS_DEBUG )
             {



Mime
View raw message