directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r905338 [4/4] - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/ apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ apacheds/trunk/core-api/src/main/java/o...
Date Mon, 01 Feb 2010 17:07:25 GMT
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncInfoValueControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncInfoValueControlTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncInfoValueControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncInfoValueControlTest.java Mon Feb  1 17:07:13 2010
@@ -29,7 +29,7 @@
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControl;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlContainer;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlDecoder;
 import org.apache.directory.shared.ldap.message.control.replication.SynchronizationInfoEnum;
@@ -62,7 +62,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.NEW_COOKIE ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.NEW_COOKIE ) );
 
         try
         {
@@ -74,7 +74,7 @@
             fail( de.getMessage() );
         }
 
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.NEW_COOKIE, syncInfoValue.getType() );
         assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         
@@ -121,7 +121,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.NEW_COOKIE ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.NEW_COOKIE ) );
         
         try
         {
@@ -133,7 +133,7 @@
             fail( de.getMessage() );
         }
 
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.NEW_COOKIE, syncInfoValue.getType() );
         assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         
@@ -185,7 +185,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.REFRESH_DELETE ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.REFRESH_DELETE ) );
         
         try
         {
@@ -197,7 +197,7 @@
             fail( de.getMessage() );
         }
 
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_DELETE, syncInfoValue.getType() );
         assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertTrue( syncInfoValue.isRefreshDone() );
@@ -249,7 +249,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.REFRESH_DELETE ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.REFRESH_DELETE ) );
 
         try
         {
@@ -261,7 +261,7 @@
             fail( de.getMessage() );
         }
 
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_DELETE, syncInfoValue.getType() );
         assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertFalse( syncInfoValue.isRefreshDone() );
@@ -313,7 +313,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.REFRESH_DELETE ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.REFRESH_DELETE ) );
 
         try
         {
@@ -325,7 +325,7 @@
             fail( de.getMessage() );
         }
 
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_DELETE, syncInfoValue.getType() );
         assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertTrue( syncInfoValue.isRefreshDone() );
@@ -376,7 +376,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.REFRESH_DELETE ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.REFRESH_DELETE ) );
 
         try
         {
@@ -388,7 +388,7 @@
             fail( de.getMessage() );
         }
 
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_DELETE, syncInfoValue.getType() );
         assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertFalse( syncInfoValue.isRefreshDone() );
@@ -437,7 +437,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.REFRESH_DELETE ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.REFRESH_DELETE ) );
 
         try
         {
@@ -449,7 +449,7 @@
             fail( de.getMessage() );
         }
 
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_DELETE, syncInfoValue.getType() );
         assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertTrue( syncInfoValue.isRefreshDone() );
@@ -502,7 +502,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.REFRESH_PRESENT ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.REFRESH_PRESENT ) );
 
         try
         {
@@ -514,7 +514,7 @@
             fail( de.getMessage() );
         }
 
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_PRESENT, syncInfoValue.getType() );
         assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertTrue( syncInfoValue.isRefreshDone() );
@@ -566,7 +566,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.REFRESH_PRESENT ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.REFRESH_PRESENT ) );
 
         try
         {
@@ -578,7 +578,7 @@
             fail( de.getMessage() );
         }
 
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_PRESENT, syncInfoValue.getType() );
         assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertFalse( syncInfoValue.isRefreshDone() );
@@ -630,7 +630,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.REFRESH_PRESENT ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.REFRESH_PRESENT ) );
 
         try
         {
@@ -642,7 +642,7 @@
             fail( de.getMessage() );
         }
 
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_PRESENT, syncInfoValue.getType() );
         assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertTrue( syncInfoValue.isRefreshDone() );
@@ -693,7 +693,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.REFRESH_PRESENT ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.REFRESH_PRESENT ) );
 
         try
         {
@@ -705,7 +705,7 @@
             fail( de.getMessage() );
         }
 
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_PRESENT, syncInfoValue.getType() );
         assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertFalse( syncInfoValue.isRefreshDone() );
@@ -754,7 +754,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.REFRESH_PRESENT ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.REFRESH_PRESENT ) );
 
         try
         {
@@ -766,7 +766,7 @@
             fail( de.getMessage() );
         }
 
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_PRESENT, syncInfoValue.getType() );
         assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertTrue( syncInfoValue.isRefreshDone() );
@@ -816,7 +816,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.SYNC_ID_SET ) );
 
         try
         {
@@ -848,7 +848,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.SYNC_ID_SET ) );
 
         try
         {
@@ -880,7 +880,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.SYNC_ID_SET ) );
 
         try
         {
@@ -913,7 +913,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.SYNC_ID_SET ) );
 
         try
         {
@@ -945,7 +945,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.SYNC_ID_SET ) );
 
         try
         {
@@ -957,7 +957,7 @@
             fail( de.getMessage() );
         }
         
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.SYNC_ID_SET, syncInfoValue.getType() );
         assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertFalse( syncInfoValue.isRefreshDeletes() );
@@ -1018,7 +1018,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.SYNC_ID_SET ) );
 
         try
         {
@@ -1029,7 +1029,7 @@
             de.printStackTrace();
             fail( de.getMessage() );
         }
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.SYNC_ID_SET, syncInfoValue.getType() );
         assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertFalse( syncInfoValue.isRefreshDeletes() );
@@ -1101,7 +1101,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.SYNC_ID_SET ) );
 
         try
         {
@@ -1112,7 +1112,7 @@
             de.printStackTrace();
             fail( de.getMessage() );
         }
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.SYNC_ID_SET, syncInfoValue.getType() );
         assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertFalse( syncInfoValue.isRefreshDeletes() );
@@ -1175,7 +1175,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.SYNC_ID_SET ) );
 
         try
         {
@@ -1187,7 +1187,7 @@
             fail( de.getMessage() );
         }
         
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.SYNC_ID_SET, syncInfoValue.getType() );
         assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertFalse( syncInfoValue.isRefreshDeletes() );
@@ -1260,7 +1260,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.SYNC_ID_SET ) );
 
         try
         {
@@ -1271,7 +1271,7 @@
             de.printStackTrace();
             fail( de.getMessage() );
         }
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.SYNC_ID_SET, syncInfoValue.getType() );
         assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertTrue( syncInfoValue.isRefreshDeletes() );
@@ -1334,7 +1334,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.SYNC_ID_SET ) );
 
         try
         {
@@ -1345,7 +1345,7 @@
             de.printStackTrace();
             fail( de.getMessage() );
         }
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.SYNC_ID_SET, syncInfoValue.getType() );
         assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertTrue( syncInfoValue.isRefreshDeletes() );
@@ -1419,7 +1419,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.SYNC_ID_SET ) );
 
         try
         {
@@ -1430,7 +1430,7 @@
             de.printStackTrace();
             fail( de.getMessage() );
         }
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.SYNC_ID_SET, syncInfoValue.getType() );
         assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertTrue( syncInfoValue.isRefreshDeletes() );
@@ -1495,7 +1495,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.SYNC_ID_SET ) );
 
         try
         {
@@ -1507,7 +1507,7 @@
             fail( de.getMessage() );
         }
         
-        SyncInfoValueControlCodec syncInfoValue = container.getSyncInfoValueControl();
+        SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.SYNC_ID_SET, syncInfoValue.getType() );
         assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
         assertTrue( syncInfoValue.isRefreshDeletes() );
@@ -1585,7 +1585,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.SYNC_ID_SET ) );
 
         try
         {
@@ -1623,7 +1623,7 @@
         bb.flip();
 
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET ) );
+        container.setSyncInfoValueControl( new SyncInfoValueControl( SynchronizationInfoEnum.SYNC_ID_SET ) );
 
         try
         {

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncRequestValueControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncRequestValueControlTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncRequestValueControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncRequestValueControlTest.java Mon Feb  1 17:07:13 2010
@@ -29,7 +29,7 @@
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueControl;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueControlContainer;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueControlDecoder;
 import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
@@ -63,7 +63,7 @@
         bb.flip();
 
         SyncRequestValueControlContainer container = new SyncRequestValueControlContainer();
-        container.setSyncRequestValueControl( new SyncRequestValueControlCodec() );
+        container.setSyncRequestValueControl( new SyncRequestValueControl() );
         
         try
         {
@@ -75,7 +75,7 @@
             fail( de.getMessage() );
         }
 
-        SyncRequestValueControlCodec syncRequestValue = container.getSyncRequestValueControl();
+        SyncRequestValueControl syncRequestValue = container.getSyncRequestValueControl();
         assertEquals( SynchronizationModeEnum.REFRESH_ONLY, syncRequestValue.getMode() );
         assertEquals( "abc", StringTools.utf8ToString( syncRequestValue.getCookie() ) );
         assertEquals( false, syncRequestValue.isReloadHint() );
@@ -132,7 +132,7 @@
         bb.flip();
 
         SyncRequestValueControlContainer container = new SyncRequestValueControlContainer();
-        container.setSyncRequestValueControl( new SyncRequestValueControlCodec() );
+        container.setSyncRequestValueControl( new SyncRequestValueControl() );
 
         try
         {
@@ -144,7 +144,7 @@
             fail( de.getMessage() );
         }
 
-        SyncRequestValueControlCodec syncRequestValue = container.getSyncRequestValueControl();
+        SyncRequestValueControl syncRequestValue = container.getSyncRequestValueControl();
         assertEquals( SynchronizationModeEnum.REFRESH_AND_PERSIST, syncRequestValue.getMode() );
         assertEquals( "abc", StringTools.utf8ToString( syncRequestValue.getCookie() ) );
         assertEquals( false, syncRequestValue.isReloadHint() );
@@ -200,7 +200,7 @@
         bb.flip();
 
         SyncRequestValueControlContainer container = new SyncRequestValueControlContainer();
-        container.setSyncRequestValueControl( new SyncRequestValueControlCodec() );
+        container.setSyncRequestValueControl( new SyncRequestValueControl() );
 
         try
         {
@@ -212,7 +212,7 @@
             fail( de.getMessage() );
         }
 
-        SyncRequestValueControlCodec syncRequestValue = container.getSyncRequestValueControl();
+        SyncRequestValueControl syncRequestValue = container.getSyncRequestValueControl();
         assertEquals( SynchronizationModeEnum.REFRESH_AND_PERSIST, syncRequestValue.getMode() );
         assertNull( syncRequestValue.getCookie() );
         assertEquals( false, syncRequestValue.isReloadHint() );
@@ -268,7 +268,7 @@
         bb.flip();
 
         SyncRequestValueControlContainer container = new SyncRequestValueControlContainer();
-        container.setSyncRequestValueControl( new SyncRequestValueControlCodec() );
+        container.setSyncRequestValueControl( new SyncRequestValueControl() );
 
         try
         {
@@ -280,7 +280,7 @@
             fail( de.getMessage() );
         }
 
-        SyncRequestValueControlCodec syncRequestValue = container.getSyncRequestValueControl();
+        SyncRequestValueControl syncRequestValue = container.getSyncRequestValueControl();
         assertEquals( SynchronizationModeEnum.REFRESH_AND_PERSIST, syncRequestValue.getMode() );
         assertNull( syncRequestValue.getCookie() );
         assertEquals( true, syncRequestValue.isReloadHint() );
@@ -336,7 +336,7 @@
         bb.flip();
 
         SyncRequestValueControlContainer container = new SyncRequestValueControlContainer();
-        container.setSyncRequestValueControl( new SyncRequestValueControlCodec() );
+        container.setSyncRequestValueControl( new SyncRequestValueControl() );
 
         try
         {
@@ -348,7 +348,7 @@
             fail( de.getMessage() );
         }
 
-        SyncRequestValueControlCodec syncRequestValue = container.getSyncRequestValueControl();
+        SyncRequestValueControl syncRequestValue = container.getSyncRequestValueControl();
         assertEquals( SynchronizationModeEnum.REFRESH_AND_PERSIST, syncRequestValue.getMode() );
         assertNull( syncRequestValue.getCookie() );
         assertEquals( false, syncRequestValue.isReloadHint() );
@@ -403,7 +403,7 @@
         bb.flip();
 
         SyncRequestValueControlContainer container = new SyncRequestValueControlContainer();
-        container.setSyncRequestValueControl( new SyncRequestValueControlCodec() );
+        container.setSyncRequestValueControl( new SyncRequestValueControl() );
 
         try
         {
@@ -415,7 +415,7 @@
             fail( de.getMessage() );
         }
 
-        SyncRequestValueControlCodec syncRequestValue = container.getSyncRequestValueControl();
+        SyncRequestValueControl syncRequestValue = container.getSyncRequestValueControl();
         assertEquals( SynchronizationModeEnum.REFRESH_AND_PERSIST, syncRequestValue.getMode() );
         assertEquals( "abc", StringTools.utf8ToString( syncRequestValue.getCookie() ) );
         assertEquals( false, syncRequestValue.isReloadHint() );
@@ -471,7 +471,7 @@
         bb.flip();
 
         SyncRequestValueControlContainer container = new SyncRequestValueControlContainer();
-        container.setSyncRequestValueControl( new SyncRequestValueControlCodec() );
+        container.setSyncRequestValueControl( new SyncRequestValueControl() );
 
         try
         {
@@ -483,7 +483,7 @@
             fail( de.getMessage() );
         }
 
-        SyncRequestValueControlCodec syncRequestValue = container.getSyncRequestValueControl();
+        SyncRequestValueControl syncRequestValue = container.getSyncRequestValueControl();
         assertEquals( SynchronizationModeEnum.REFRESH_AND_PERSIST, syncRequestValue.getMode() );
         assertEquals( "", StringTools.utf8ToString( syncRequestValue.getCookie() ) );
         assertEquals( false, syncRequestValue.isReloadHint() );
@@ -534,7 +534,7 @@
         bb.flip();
 
         SyncRequestValueControlContainer container = new SyncRequestValueControlContainer();
-        container.setSyncRequestValueControl( new SyncRequestValueControlCodec() );
+        container.setSyncRequestValueControl( new SyncRequestValueControl() );
 
         try
         {
@@ -564,7 +564,7 @@
         bb.flip();
 
         SyncRequestValueControlContainer container = new SyncRequestValueControlContainer();
-        container.setSyncRequestValueControl( new SyncRequestValueControlCodec() );
+        container.setSyncRequestValueControl( new SyncRequestValueControl() );
 
         try
         {

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java Mon Feb  1 17:07:13 2010
@@ -30,7 +30,7 @@
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControl;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControlContainer;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControlDecoder;
 import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
@@ -65,7 +65,7 @@
         bb.flip();
 
         SyncStateValueControlContainer container = new SyncStateValueControlContainer();
-        container.setSyncStateValueControl( new SyncStateValueControlCodec() );
+        container.setSyncStateValueControl( new SyncStateValueControl() );
 
         try
         {
@@ -77,7 +77,7 @@
             fail( de.getMessage() );
         }
 
-        SyncStateValueControlCodec syncStateValue = container.getSyncStateValueControl();
+        SyncStateValueControl syncStateValue = container.getSyncStateValueControl();
         assertEquals( SyncStateTypeEnum.PRESENT, syncStateValue.getSyncStateType() );
         assertEquals( "abc", StringTools.utf8ToString( syncStateValue.getEntryUUID() ) );
         assertEquals( "xkcd", StringTools.utf8ToString( syncStateValue.getCookie() ) );
@@ -131,7 +131,7 @@
         bb.flip();
 
         SyncStateValueControlContainer container = new SyncStateValueControlContainer();
-        container.setSyncStateValueControl( new SyncStateValueControlCodec() );
+        container.setSyncStateValueControl( new SyncStateValueControl() );
 
         try
         {
@@ -142,7 +142,7 @@
             fail( de.getMessage() );
         }
 
-        SyncStateValueControlCodec syncStateValue = container.getSyncStateValueControl();
+        SyncStateValueControl syncStateValue = container.getSyncStateValueControl();
         assertEquals( SyncStateTypeEnum.ADD, syncStateValue.getSyncStateType() );
         assertEquals( "abc", StringTools.utf8ToString( syncStateValue.getEntryUUID() ) );
         assertNull( syncStateValue.getCookie() );
@@ -196,7 +196,7 @@
         bb.flip();
 
         SyncStateValueControlContainer container = new SyncStateValueControlContainer();
-        container.setSyncStateValueControl( new SyncStateValueControlCodec() );
+        container.setSyncStateValueControl( new SyncStateValueControl() );
 
         try
         {
@@ -208,7 +208,7 @@
             fail( de.getMessage() );
         }
 
-        SyncStateValueControlCodec syncStateValue = container.getSyncStateValueControl();
+        SyncStateValueControl syncStateValue = container.getSyncStateValueControl();
         assertEquals( SyncStateTypeEnum.MODIFY, syncStateValue.getSyncStateType() );
         assertEquals( "abc", StringTools.utf8ToString( syncStateValue.getEntryUUID() ) );
         assertEquals( "", StringTools.utf8ToString( syncStateValue.getCookie() ) );
@@ -257,7 +257,7 @@
         bb.flip();
 
         SyncStateValueControlContainer container = new SyncStateValueControlContainer();
-        container.setSyncStateValueControl( new SyncStateValueControlCodec() );
+        container.setSyncStateValueControl( new SyncStateValueControl() );
 
         try
         {
@@ -286,7 +286,7 @@
         bb.flip();
 
         SyncStateValueControlContainer container = new SyncStateValueControlContainer();
-        container.setSyncStateValueControl( new SyncStateValueControlCodec() );
+        container.setSyncStateValueControl( new SyncStateValueControl() );
 
         try
         {
@@ -317,7 +317,7 @@
         bb.flip();
 
         SyncStateValueControlContainer container = new SyncStateValueControlContainer();
-        container.setSyncStateValueControl( new SyncStateValueControlCodec() );
+        container.setSyncStateValueControl( new SyncStateValueControl() );
 
         try
         {

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java Mon Feb  1 17:07:13 2010
@@ -34,10 +34,10 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.ResponseCarryingException;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.message.DeleteResponseImpl;
 import org.apache.directory.shared.ldap.message.InternalMessage;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -245,11 +245,11 @@
         assertEquals( 0x44, message.computeLength() );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java Mon Feb  1 17:07:13 2010
@@ -33,8 +33,8 @@
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -216,11 +216,11 @@
         assertEquals( 0x4A, message.computeLength() );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java Mon Feb  1 17:07:13 2010
@@ -33,7 +33,7 @@
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -165,11 +165,11 @@
         assertEquals( "value", StringTools.utf8ToString( extendedRequest.getRequestValue() ) );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 
@@ -247,11 +247,11 @@
         assertEquals( "", StringTools.utf8ToString( extendedRequest.getRequestValue() ) );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java Mon Feb  1 17:07:13 2010
@@ -33,8 +33,8 @@
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -189,11 +189,11 @@
         assertEquals( "value", StringTools.utf8ToString( ( byte[] ) extendedResponse.getResponse() ) );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 
@@ -344,11 +344,11 @@
         assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 
@@ -627,11 +627,11 @@
         assertEquals( "", StringTools.utf8ToString( ( byte[] ) extendedResponse.getResponse() ) );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 
@@ -789,11 +789,11 @@
         assertEquals( "", StringTools.utf8ToString( ( byte[] ) extendedResponse.getResponse() ) );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java Mon Feb  1 17:07:13 2010
@@ -33,7 +33,7 @@
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -165,11 +165,11 @@
         assertEquals( "value", StringTools.utf8ToString( intermediateResponse.getResponseValue() ) );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 
@@ -247,11 +247,11 @@
         assertEquals( "", StringTools.utf8ToString( intermediateResponse.getResponseValue() ) );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java Mon Feb  1 17:07:13 2010
@@ -36,12 +36,12 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.ResponseCarryingException;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.message.InternalMessage;
 import org.apache.directory.shared.ldap.message.ModifyResponseImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -1186,11 +1186,11 @@
         assertEquals( 0, attributeValue.size() );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java Mon Feb  1 17:07:13 2010
@@ -33,8 +33,8 @@
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -171,11 +171,11 @@
         assertEquals( "", modifyResponse.getLdapResult().getErrorMessage() );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java Mon Feb  1 17:07:13 2010
@@ -34,10 +34,10 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.ResponseCarryingException;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.message.InternalMessage;
 import org.apache.directory.shared.ldap.message.ModifyDnResponseImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -335,11 +335,11 @@
         assertEquals( "ou=system", modifyDNRequest.getNewSuperior().toString() );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 
@@ -491,11 +491,11 @@
         assertEquals( "cn=testDNModify", modifyDNRequest.getNewRDN().toString() );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java Mon Feb  1 17:07:13 2010
@@ -33,8 +33,8 @@
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -173,11 +173,11 @@
         assertEquals( "", modifyDNResponse.getLdapResult().getErrorMessage() );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java Mon Feb  1 17:07:13 2010
@@ -37,10 +37,10 @@
 import org.apache.directory.shared.ldap.codec.LdapConstants;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.filter.SearchScope;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -302,11 +302,11 @@
         }
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java Mon Feb  1 17:07:13 2010
@@ -42,14 +42,14 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.ResponseCarryingException;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
-import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControlCodec;
+import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControl;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.InternalMessage;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.SearchResponseDoneImpl;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -1094,13 +1094,13 @@
 
         // this is a constant in Java 5 API
         String pagedResultsControlOID = "1.2.840.113556.1.4.319";
-        CodecControl pagedResultsControl = message.getControls( 0 );
+        Control pagedResultsControl = message.getControls( 0 );
         assertEquals( pagedResultsControlOID, pagedResultsControl.getOid() );
         assertTrue( pagedResultsControl.isCritical() );
 
         // this is a constant in Java 5 API
         String manageReferralControlOID = "2.16.840.1.113730.3.4.2";
-        CodecControl manageReferralControl = message.getControls( 1 );
+        Control manageReferralControl = message.getControls( 1 );
         assertEquals( manageReferralControlOID, manageReferralControl.getOid() );
 
         SearchRequestCodec sr = message.getSearchRequest();
@@ -1353,11 +1353,11 @@
 
         // SubEntry Control
         String subEntryControlOID = "1.3.6.1.4.1.4203.1.10.1";
-        CodecControl subEntryControl = message.getControls( 0 );
+        Control subEntryControl = message.getControls( 0 );
         assertEquals( subEntryControlOID, subEntryControl.getOid() );
         assertTrue( subEntryControl.isCritical() );
-        assertTrue( subEntryControl instanceof SubentriesControlCodec );
-        assertTrue( ((SubentriesControlCodec)subEntryControl).isVisible() );
+        assertTrue( subEntryControl instanceof SubentriesControl );
+        assertTrue( ((SubentriesControl)subEntryControl).isVisible() );
 
         SearchRequestCodec sr = message.getSearchRequest();
         assertEquals( "dc=my-domain,dc=com", sr.getBaseObject().toString() );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java Mon Feb  1 17:07:13 2010
@@ -33,8 +33,8 @@
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -170,11 +170,11 @@
         assertEquals( "", searchResultDone.getLdapResult().getErrorMessage() );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java Mon Feb  1 17:07:13 2010
@@ -35,9 +35,9 @@
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -949,11 +949,11 @@
         }
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 
@@ -1129,11 +1129,11 @@
         }
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java Mon Feb  1 17:07:13 2010
@@ -35,8 +35,8 @@
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
@@ -283,11 +283,11 @@
         assertTrue( ldapUrlsSet.size() == 0 );
 
         // Check the Control
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java Mon Feb  1 17:07:13 2010
@@ -29,7 +29,7 @@
 
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlCodec;
+import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControl;
 import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlContainer;
 import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlDecoder;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -64,7 +64,7 @@
         bb.flip();
 
         EntryChangeControlContainer container = new EntryChangeControlContainer();
-        container.setEntryChangeControl( new EntryChangeControlCodec() );
+        container.setEntryChangeControl( new EntryChangeControl() );
         
         try
         {
@@ -76,7 +76,7 @@
             fail( de.getMessage() );
         }
 
-        EntryChangeControlCodec entryChange = container.getEntryChangeControl();
+        EntryChangeControl entryChange = container.getEntryChangeControl();
         assertEquals( ChangeType.MODDN, entryChange.getChangeType() );
         assertEquals( "a=b", entryChange.getPreviousDn().toString() );
         assertEquals( 16, entryChange.getChangeNumber() );
@@ -104,7 +104,7 @@
         bb.flip();
 
         EntryChangeControlContainer container = new EntryChangeControlContainer();
-        container.setEntryChangeControl( new EntryChangeControlCodec() );
+        container.setEntryChangeControl( new EntryChangeControl() );
         
         try
         {
@@ -116,7 +116,7 @@
             fail( de.getMessage() );
         }
 
-        EntryChangeControlCodec entryChange = container.getEntryChangeControl();
+        EntryChangeControl entryChange = container.getEntryChangeControl();
         assertEquals( ChangeType.MODDN, entryChange.getChangeType() );
         assertEquals( "a=b", entryChange.getPreviousDn().toString() );
         assertEquals( 5124095576030430L, entryChange.getChangeNumber() );
@@ -143,7 +143,7 @@
         bb.flip();
 
         EntryChangeControlContainer container = new EntryChangeControlContainer();
-        container.setEntryChangeControl( new EntryChangeControlCodec() );
+        container.setEntryChangeControl( new EntryChangeControl() );
         
         try
         {
@@ -155,7 +155,7 @@
             fail( de.getMessage() );
         }
 
-        EntryChangeControlCodec entryChange = container.getEntryChangeControl();
+        EntryChangeControl entryChange = container.getEntryChangeControl();
         assertEquals( ChangeType.ADD, entryChange.getChangeType() );
         assertNull( entryChange.getPreviousDn() );
         assertEquals( 16, entryChange.getChangeNumber() );
@@ -185,7 +185,7 @@
         bb.flip();
 
         EntryChangeControlContainer container = new EntryChangeControlContainer();
-        container.setEntryChangeControl( new EntryChangeControlCodec() );
+        container.setEntryChangeControl( new EntryChangeControl() );
         
         try
         {
@@ -221,7 +221,7 @@
         bb.flip();
 
         EntryChangeControlContainer container = new EntryChangeControlContainer();
-        container.setEntryChangeControl( new EntryChangeControlCodec() );
+        container.setEntryChangeControl( new EntryChangeControl() );
         
         try
         {
@@ -233,10 +233,10 @@
             fail( de.getMessage() );
         }
 
-        EntryChangeControlCodec entryChange = container.getEntryChangeControl();
+        EntryChangeControl entryChange = container.getEntryChangeControl();
         assertEquals( ChangeType.ADD, entryChange.getChangeType() );
         assertNull( entryChange.getPreviousDn() );
-        assertEquals( EntryChangeControlCodec.UNDEFINED_CHANGE_NUMBER, entryChange.getChangeNumber() );
+        assertEquals( EntryChangeControl.UNDEFINED_CHANGE_NUMBER, entryChange.getChangeNumber() );
     }
 
 
@@ -260,7 +260,7 @@
         bb.flip();
 
         EntryChangeControlContainer container = new EntryChangeControlContainer();
-        container.setEntryChangeControl( new EntryChangeControlCodec() );
+        container.setEntryChangeControl( new EntryChangeControl() );
         
         try
         {
@@ -299,7 +299,7 @@
         bb.flip();
 
         EntryChangeControlContainer container = new EntryChangeControlContainer();
-        container.setEntryChangeControl( new EntryChangeControlCodec() );
+        container.setEntryChangeControl( new EntryChangeControl() );
         
         try
         {
@@ -342,7 +342,7 @@
         String expected = StringTools.dumpBytes( bb.array() );
         bb.flip();
 
-        EntryChangeControlCodec entry = new EntryChangeControlCodec();
+        EntryChangeControl entry = new EntryChangeControl();
         entry.setChangeType( ChangeType.MODDN );
         entry.setChangeNumber( 16 );
         entry.setPreviousDn( new LdapDN( "a=b" ) );
@@ -379,7 +379,7 @@
         String expected = StringTools.dumpBytes( bb.array() );
         bb.flip();
 
-        EntryChangeControlCodec entry = new EntryChangeControlCodec();
+        EntryChangeControl entry = new EntryChangeControl();
         entry.setChangeType( ChangeType.MODDN );
         entry.setChangeNumber( 5124095576030430L );
         entry.setPreviousDn( new LdapDN( "a=b" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java Mon Feb  1 17:07:13 2010
@@ -28,7 +28,7 @@
 
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControlCodec;
+import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControl;
 import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControlContainer;
 import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControlDecoder;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -66,7 +66,7 @@
         String expected = StringTools.dumpBytes( bb.array() );
         bb.flip();
 
-        PersistentSearchControlCodec ctrl = new PersistentSearchControlCodec();
+        PersistentSearchControl ctrl = new PersistentSearchControl();
         ctrl.setChangesOnly( false );
         ctrl.setReturnECs( false );
         ctrl.setChangeTypes( 1 );
@@ -93,7 +93,7 @@
         bb.flip();
 
         PersistentSearchControlContainer container = new PersistentSearchControlContainer();
-        container.setPSearchControl( new PersistentSearchControlCodec() );
+        container.setPSearchControl( new PersistentSearchControl() );
 
         try
         {
@@ -104,10 +104,10 @@
             fail( de.getMessage() );
         }
 
-        PersistentSearchControlCodec control = container.getPSearchControl();
+        PersistentSearchControl control = container.getPSearchControl();
         int changeTypes = control.getChangeTypes();
-        assertEquals( PersistentSearchControlCodec.CHANGE_TYPE_ADD, changeTypes & PersistentSearchControlCodec.CHANGE_TYPE_ADD );
-        assertEquals( PersistentSearchControlCodec.CHANGE_TYPE_MODDN, changeTypes & PersistentSearchControlCodec.CHANGE_TYPE_MODDN );
+        assertEquals( PersistentSearchControl.CHANGE_TYPE_ADD, changeTypes & PersistentSearchControl.CHANGE_TYPE_ADD );
+        assertEquals( PersistentSearchControl.CHANGE_TYPE_MODDN, changeTypes & PersistentSearchControl.CHANGE_TYPE_MODDN );
         assertEquals( false, control.isChangesOnly() );
         assertEquals( false, control.isReturnECs() );
     }
@@ -131,7 +131,7 @@
         bb.flip();
 
         PersistentSearchControlContainer container = new PersistentSearchControlContainer();
-        container.setPSearchControl( new PersistentSearchControlCodec() );
+        container.setPSearchControl( new PersistentSearchControl() );
         
         try
         {
@@ -163,7 +163,7 @@
         bb.flip();
 
         PersistentSearchControlContainer container = new PersistentSearchControlContainer();
-        container.setPSearchControl( new PersistentSearchControlCodec() );
+        container.setPSearchControl( new PersistentSearchControl() );
 
         try
         {
@@ -191,7 +191,7 @@
         bb.flip();
 
         PersistentSearchControlContainer container = new PersistentSearchControlContainer();
-        container.setPSearchControl( new PersistentSearchControlCodec() );
+        container.setPSearchControl( new PersistentSearchControl() );
 
         try
         {
@@ -221,7 +221,7 @@
         bb.flip();
 
         PersistentSearchControlContainer container = new PersistentSearchControlContainer();
-        container.setPSearchControl( new PersistentSearchControlCodec() );
+        container.setPSearchControl( new PersistentSearchControl() );
 
         try
         {
@@ -251,7 +251,7 @@
         bb.flip();
 
         PersistentSearchControlContainer container = new PersistentSearchControlContainer();
-        container.setPSearchControl( new PersistentSearchControlCodec() );
+        container.setPSearchControl( new PersistentSearchControl() );
 
         try
         {
@@ -281,7 +281,7 @@
         bb.flip();
 
         PersistentSearchControlContainer container = new PersistentSearchControlContainer();
-        container.setPSearchControl( new PersistentSearchControlCodec() );
+        container.setPSearchControl( new PersistentSearchControl() );
 
         try
         {

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java Mon Feb  1 17:07:13 2010
@@ -30,7 +30,7 @@
 
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControlCodec;
+import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControl;
 import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControlContainer;
 import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControlDecoder;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -61,7 +61,7 @@
         bb.flip();
 
         PagedResultsControlContainer container = new PagedResultsControlContainer();
-        container.setPagedSearchControl( new PagedResultsControlCodec() );
+        container.setPagedSearchControl( new PagedResultsControl() );
         
         try
         {
@@ -73,7 +73,7 @@
             fail( de.getMessage() );
         }
 
-        PagedResultsControlCodec pagedSearch = container.getPagedSearchControl();
+        PagedResultsControl pagedSearch = container.getPagedSearchControl();
         assertEquals( 32, pagedSearch.getSize() );
         assertTrue( Arrays.equals( StringTools.getBytesUtf8( "test" ), 
             pagedSearch.getCookie() ) );
@@ -95,7 +95,7 @@
             } );
         buffer.flip();
 
-        PagedResultsControlCodec ctrl = new PagedResultsControlCodec();
+        PagedResultsControl ctrl = new PagedResultsControl();
         ctrl.setSize( 32 );
         ctrl.setCookie( StringTools.getBytesUtf8( "test" ) );
 
@@ -122,7 +122,7 @@
         bb.flip();
 
         PagedResultsControlContainer container = new PagedResultsControlContainer();
-        container.setPagedSearchControl( new PagedResultsControlCodec() );
+        container.setPagedSearchControl( new PagedResultsControl() );
         
         try
         {
@@ -152,7 +152,7 @@
         bb.flip();
 
         PagedResultsControlContainer container = new PagedResultsControlContainer();
-        container.setPagedSearchControl( new PagedResultsControlCodec() );
+        container.setPagedSearchControl( new PagedResultsControl() );
         
         try
         {
@@ -181,7 +181,7 @@
         bb.flip();
 
         PagedResultsControlContainer container = new PagedResultsControlContainer();
-        container.setPagedSearchControl( new PagedResultsControlCodec() );
+        container.setPagedSearchControl( new PagedResultsControl() );
         
         try
         {
@@ -212,7 +212,7 @@
         bb.flip();
 
         PagedResultsControlContainer container = new PagedResultsControlContainer();
-        container.setPagedSearchControl( new PagedResultsControlCodec() );
+        container.setPagedSearchControl( new PagedResultsControl() );
         
         try
         {
@@ -224,7 +224,7 @@
             fail( de.getMessage() );
         }
 
-        PagedResultsControlCodec pagedSearch = container.getPagedSearchControl();
+        PagedResultsControl pagedSearch = container.getPagedSearchControl();
         assertEquals( Integer.MAX_VALUE, pagedSearch.getSize() );
         assertTrue( Arrays.equals( StringTools.getBytesUtf8( "test" ), 
             pagedSearch.getCookie() ) );
@@ -247,7 +247,7 @@
             } );
         buffer.flip();
 
-        PagedResultsControlCodec ctrl = new PagedResultsControlCodec();
+        PagedResultsControl ctrl = new PagedResultsControl();
         ctrl.setSize( -1 );
         ctrl.setCookie( StringTools.getBytesUtf8( "test" ) );
 
@@ -275,7 +275,7 @@
         bb.flip();
 
         PagedResultsControlContainer container = new PagedResultsControlContainer();
-        container.setPagedSearchControl( new PagedResultsControlCodec() );
+        container.setPagedSearchControl( new PagedResultsControl() );
 
         try
         {
@@ -306,7 +306,7 @@
         bb.flip();
 
         PagedResultsControlContainer container = new PagedResultsControlContainer();
-        container.setPagedSearchControl( new PagedResultsControlCodec() );
+        container.setPagedSearchControl( new PagedResultsControl() );
 
         try
         {
@@ -318,7 +318,7 @@
             fail( de.getMessage() );
         }
 
-        PagedResultsControlCodec pagedSearch = container.getPagedSearchControl();
+        PagedResultsControl pagedSearch = container.getPagedSearchControl();
         assertEquals( 32, pagedSearch.getSize() );
         assertNotNull( pagedSearch.getCookie() );
         assertEquals( StringTools.EMPTY_BYTES, pagedSearch.getCookie() );
@@ -338,7 +338,7 @@
             } );
         buffer.flip();
 
-        PagedResultsControlCodec ctrl = new PagedResultsControlCodec();
+        PagedResultsControl ctrl = new PagedResultsControl();
         ctrl.setSize( 32 );
         ctrl.setCookie( null );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java Mon Feb  1 17:07:13 2010
@@ -30,7 +30,7 @@
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControlCodec;
+import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControl;
 import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControlContainer;
 import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControlDecoder;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -59,7 +59,7 @@
         bb.flip();
 
         SubentriesControlContainer container = new SubentriesControlContainer();
-        container.setSubEntryControl( new SubentriesControlCodec() );
+        container.setSubEntryControl( new SubentriesControl() );
         
         try
         {
@@ -71,7 +71,7 @@
             fail( de.getMessage() );
         }
 
-        SubentriesControlCodec control = container.getSubEntryControl();
+        SubentriesControl control = container.getSubEntryControl();
         assertTrue( control.isVisible() );
         // test encoding
         try
@@ -117,7 +117,7 @@
         bb.flip();
 
         SubentriesControlContainer container = new SubentriesControlContainer();
-        container.setSubEntryControl( new SubentriesControlCodec() );
+        container.setSubEntryControl( new SubentriesControl() );
 
         try
         {
@@ -129,7 +129,7 @@
             fail( de.getMessage() );
         }
 
-        SubentriesControlCodec control = container.getSubEntryControl();
+        SubentriesControl control = container.getSubEntryControl();
         assertFalse( control.isVisible() );
         
         // test encoding
@@ -179,7 +179,7 @@
 
         // Allocate a LdapMessage Container
         SubentriesControlContainer container = new SubentriesControlContainer();
-        container.setSubEntryControl( new SubentriesControlCodec() );
+        container.setSubEntryControl( new SubentriesControl() );
 
         // Decode a SubEntryControl PDU
         try
@@ -212,7 +212,7 @@
 
         // Allocate a LdapMessage Container
         SubentriesControlContainer container = new SubentriesControlContainer();
-        container.setSubEntryControl( new SubentriesControlCodec() );
+        container.setSubEntryControl( new SubentriesControl() );
 
         // Decode a SubEntryControl PDU
         try

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java Mon Feb  1 17:07:13 2010
@@ -33,7 +33,7 @@
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -142,11 +142,11 @@
         assertEquals( 1, ldapMessage.getMessageId() );
 
         // Check the Control
-        List<CodecControl> controls = ldapMessage.getControls();
+        List<Control> controls = ldapMessage.getControls();
 
         assertEquals( 1, controls.size() );
 
-        CodecControl control = ldapMessage.getControls( 0 );
+        Control control = ldapMessage.getControls( 0 );
         assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
         assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java Mon Feb  1 17:07:13 2010
@@ -23,7 +23,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import org.apache.directory.shared.ldap.codec.controls.CodecControlImpl;
+import org.apache.directory.shared.ldap.codec.controls.ControlImpl;
 import org.junit.Test;
 
 
@@ -127,7 +127,7 @@
             private static final long serialVersionUID = 1L;
         };
         
-        msg0.add( new CodecControlImpl( "0.0" )
+        msg0.add( new ControlImpl( "0.0" )
         {
             private static final long serialVersionUID = 1L;
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java Mon Feb  1 17:07:13 2010
@@ -25,7 +25,7 @@
 
 import javax.naming.InvalidNameException;
 
-import org.apache.directory.shared.ldap.codec.controls.CodecControlImpl;
+import org.apache.directory.shared.ldap.codec.controls.ControlImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.junit.Test;
 
@@ -187,7 +187,7 @@
             private static final long serialVersionUID = 1L;
         };
         
-        msg0.add( new CodecControlImpl( "0.0" )
+        msg0.add( new ControlImpl( "0.0" )
         {
             private static final long serialVersionUID = 1L;
 



Mime
View raw message