directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r905338 [3/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/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlContainer.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlContainer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlContainer.java Mon Feb  1 17:07:13 2010
@@ -33,7 +33,7 @@
 public class SyncDoneValueControlContainer extends AbstractContainer
 {
     /** syncDoneValue*/
-    private SyncDoneValueControlCodec control;
+    private SyncDoneValueControl control;
 
 
     /**
@@ -53,7 +53,7 @@
     /**
      * @return the SyncDoneValueControlCodec object
      */
-    public SyncDoneValueControlCodec getSyncDoneValueControl()
+    public SyncDoneValueControl getSyncDoneValueControl()
     {
         return control;
     }
@@ -65,7 +65,7 @@
      * 
      * @param control the SyncDoneValueControlCodec to set.
      */
-    public void setSyncDoneValueControl( SyncDoneValueControlCodec control )
+    public void setSyncDoneValueControl( SyncDoneValueControl control )
     {
         this.control = control;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlDecoder.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlDecoder.java Mon Feb  1 17:07:13 2010
@@ -27,8 +27,8 @@
 import org.apache.directory.shared.asn1.Asn1Object;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.controls.ControlDecoder;
+import org.apache.directory.shared.ldap.message.control.Control;
 
 
 /**
@@ -55,11 +55,11 @@
      * @throws DecoderException If the decoding found an error
      * @throws NamingException It will never be throw by this method
      */
-    public Asn1Object decode( byte[] controlBytes, CodecControl control ) throws DecoderException
+    public Asn1Object decode( byte[] controlBytes, Control control ) throws DecoderException
     {
         ByteBuffer bb = ByteBuffer.wrap( controlBytes );
         SyncDoneValueControlContainer container = new SyncDoneValueControlContainer();
-        container.setSyncDoneValueControl( (SyncDoneValueControlCodec)control );
+        container.setSyncDoneValueControl( (SyncDoneValueControl)control );
 
         decoder.decode( bb, container );
         return container.getSyncDoneValueControl();

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControl.java (from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlCodec.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControl.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControl.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlCodec.java&r1=905323&r2=905338&rev=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControl.java Mon Feb  1 17:07:13 2010
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.codec.controls.AbstractControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.AbstractControl;
 import org.apache.directory.shared.ldap.message.control.replication.SynchronizationInfoEnum;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -37,7 +37,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev:$, $Date: 
  */
-public class SyncInfoValueControlCodec extends AbstractControlCodec
+public class SyncInfoValueControl extends AbstractControl
 {
     /** This control OID */
     public static final String CONTROL_OID = "1.3.6.1.4.1.4203.1.9.1.4";
@@ -66,7 +66,7 @@
      * @param type The kind of syncInfo we will store. Can be newCookie, 
      * refreshPresent, refreshDelete or syncIdSet
      */
-    public SyncInfoValueControlCodec( SynchronizationInfoEnum type )
+    public SyncInfoValueControl( SynchronizationInfoEnum type )
     {
         super( CONTROL_OID );
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlContainer.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlContainer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlContainer.java Mon Feb  1 17:07:13 2010
@@ -32,7 +32,7 @@
 public class SyncInfoValueControlContainer extends AbstractContainer
 {
     /** SyncInfoValueControl */
-    private SyncInfoValueControlCodec control;
+    private SyncInfoValueControl control;
 
 
     /**
@@ -51,7 +51,7 @@
     /**
      * @return Returns the syncInfoValue control.
      */
-    public SyncInfoValueControlCodec getSyncInfoValueControl()
+    public SyncInfoValueControl getSyncInfoValueControl()
     {
         return control;
     }
@@ -63,7 +63,7 @@
      * 
      * @param control the SyncInfoValueControlCodec to set.
      */
-    public void setSyncInfoValueControl( SyncInfoValueControlCodec control )
+    public void setSyncInfoValueControl( SyncInfoValueControl control )
     {
         this.control = control;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlDecoder.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlDecoder.java Mon Feb  1 17:07:13 2010
@@ -27,8 +27,8 @@
 import org.apache.directory.shared.asn1.Asn1Object;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.controls.ControlDecoder;
+import org.apache.directory.shared.ldap.message.control.Control;
 
 
 /**
@@ -52,11 +52,11 @@
      * @throws DecoderException If the decoding found an error
      * @throws NamingException It will never be throw by this method
      */
-    public Asn1Object decode( byte[] controlBytes, CodecControl control ) throws DecoderException
+    public Asn1Object decode( byte[] controlBytes, Control control ) throws DecoderException
     {
         ByteBuffer bb = ByteBuffer.wrap( controlBytes );
         SyncInfoValueControlContainer container = new SyncInfoValueControlContainer();
-        container.setSyncInfoValueControl( (SyncInfoValueControlCodec)control );
+        container.setSyncInfoValueControl( (SyncInfoValueControl)control );
 
         decoder.decode( bb, container );
         return container.getSyncInfoValueControl();

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlGrammar.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlGrammar.java Mon Feb  1 17:07:13 2010
@@ -104,8 +104,8 @@
                 {
                     SyncInfoValueControlContainer syncInfoValueContainer = 
                         ( SyncInfoValueControlContainer ) container;
-                    SyncInfoValueControlCodec control = 
-                        new SyncInfoValueControlCodec( SynchronizationInfoEnum.NEW_COOKIE);
+                    SyncInfoValueControl control = 
+                        new SyncInfoValueControl( SynchronizationInfoEnum.NEW_COOKIE);
                     
                     Value value = syncInfoValueContainer.getCurrentTLV().getValue();
 
@@ -145,8 +145,8 @@
                 {
                     SyncInfoValueControlContainer syncInfoValueContainer = 
                         ( SyncInfoValueControlContainer ) container;
-                    SyncInfoValueControlCodec control = 
-                        new SyncInfoValueControlCodec( SynchronizationInfoEnum.REFRESH_DELETE);
+                    SyncInfoValueControl control = 
+                        new SyncInfoValueControl( SynchronizationInfoEnum.REFRESH_DELETE);
                     
                     syncInfoValueContainer.setSyncInfoValueControl( control );
 
@@ -174,7 +174,7 @@
                 {
                     SyncInfoValueControlContainer syncInfoValueContainer = 
                         ( SyncInfoValueControlContainer ) container;
-                    SyncInfoValueControlCodec control = syncInfoValueContainer.getSyncInfoValueControl();
+                    SyncInfoValueControl control = syncInfoValueContainer.getSyncInfoValueControl();
                     
                     Value value = syncInfoValueContainer.getCurrentTLV().getValue();
 
@@ -213,7 +213,7 @@
                 {
                     SyncInfoValueControlContainer syncInfoValueContainer = 
                         ( SyncInfoValueControlContainer ) container;
-                    SyncInfoValueControlCodec control = syncInfoValueContainer.getSyncInfoValueControl();
+                    SyncInfoValueControl control = syncInfoValueContainer.getSyncInfoValueControl();
                     
                     Value value = syncInfoValueContainer.getCurrentTLV().getValue();
 
@@ -266,7 +266,7 @@
                 {
                     SyncInfoValueControlContainer syncInfoValueContainer = 
                         ( SyncInfoValueControlContainer ) container;
-                    SyncInfoValueControlCodec control = syncInfoValueContainer.getSyncInfoValueControl();
+                    SyncInfoValueControl control = syncInfoValueContainer.getSyncInfoValueControl();
                     
                     Value value = syncInfoValueContainer.getCurrentTLV().getValue();
 
@@ -319,8 +319,8 @@
                 {
                     SyncInfoValueControlContainer syncInfoValueContainer = 
                         ( SyncInfoValueControlContainer ) container;
-                    SyncInfoValueControlCodec control = 
-                        new SyncInfoValueControlCodec( SynchronizationInfoEnum.REFRESH_PRESENT);
+                    SyncInfoValueControl control = 
+                        new SyncInfoValueControl( SynchronizationInfoEnum.REFRESH_PRESENT);
                     
                     syncInfoValueContainer.setSyncInfoValueControl( control );
 
@@ -348,7 +348,7 @@
                 {
                     SyncInfoValueControlContainer syncInfoValueContainer = 
                         ( SyncInfoValueControlContainer ) container;
-                    SyncInfoValueControlCodec control = syncInfoValueContainer.getSyncInfoValueControl();
+                    SyncInfoValueControl control = syncInfoValueContainer.getSyncInfoValueControl();
                     
                     Value value = syncInfoValueContainer.getCurrentTLV().getValue();
 
@@ -389,7 +389,7 @@
                 {
                     SyncInfoValueControlContainer syncInfoValueContainer = 
                         ( SyncInfoValueControlContainer ) container;
-                    SyncInfoValueControlCodec control = syncInfoValueContainer.getSyncInfoValueControl();
+                    SyncInfoValueControl control = syncInfoValueContainer.getSyncInfoValueControl();
                     
                     Value value = syncInfoValueContainer.getCurrentTLV().getValue();
 
@@ -442,7 +442,7 @@
                 {
                     SyncInfoValueControlContainer syncInfoValueContainer = 
                         ( SyncInfoValueControlContainer ) container;
-                    SyncInfoValueControlCodec control = syncInfoValueContainer.getSyncInfoValueControl();
+                    SyncInfoValueControl control = syncInfoValueContainer.getSyncInfoValueControl();
                     
                     Value value = syncInfoValueContainer.getCurrentTLV().getValue();
 
@@ -494,8 +494,8 @@
                 {
                     SyncInfoValueControlContainer syncInfoValueContainer = 
                         ( SyncInfoValueControlContainer ) container;
-                    SyncInfoValueControlCodec control = 
-                        new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET);
+                    SyncInfoValueControl control = 
+                        new SyncInfoValueControl( SynchronizationInfoEnum.SYNC_ID_SET);
                     
                     syncInfoValueContainer.setSyncInfoValueControl( control );
                 }
@@ -520,7 +520,7 @@
                 {
                     SyncInfoValueControlContainer syncInfoValueContainer = 
                         ( SyncInfoValueControlContainer ) container;
-                    SyncInfoValueControlCodec control = syncInfoValueContainer.getSyncInfoValueControl();
+                    SyncInfoValueControl control = syncInfoValueContainer.getSyncInfoValueControl();
                     
                     Value value = syncInfoValueContainer.getCurrentTLV().getValue();
 
@@ -556,7 +556,7 @@
                 {
                     SyncInfoValueControlContainer syncInfoValueContainer = 
                         ( SyncInfoValueControlContainer ) container;
-                    SyncInfoValueControlCodec control = syncInfoValueContainer.getSyncInfoValueControl();
+                    SyncInfoValueControl control = syncInfoValueContainer.getSyncInfoValueControl();
                     
                     Value value = syncInfoValueContainer.getCurrentTLV().getValue();
 
@@ -602,7 +602,7 @@
                 {
                     SyncInfoValueControlContainer syncInfoValueContainer = 
                         ( SyncInfoValueControlContainer ) container;
-                    SyncInfoValueControlCodec control = syncInfoValueContainer.getSyncInfoValueControl();
+                    SyncInfoValueControl control = syncInfoValueContainer.getSyncInfoValueControl();
                     
                     Value value = syncInfoValueContainer.getCurrentTLV().getValue();
 
@@ -726,7 +726,7 @@
                 {
                     SyncInfoValueControlContainer syncInfoValueContainer = 
                         ( SyncInfoValueControlContainer ) container;
-                    SyncInfoValueControlCodec control = syncInfoValueContainer.getSyncInfoValueControl();
+                    SyncInfoValueControl control = syncInfoValueContainer.getSyncInfoValueControl();
                     
                     Value value = syncInfoValueContainer.getCurrentTLV().getValue();
 
@@ -773,7 +773,7 @@
                 {
                     SyncInfoValueControlContainer syncInfoValueContainer = 
                         ( SyncInfoValueControlContainer ) container;
-                    SyncInfoValueControlCodec control = syncInfoValueContainer.getSyncInfoValueControl();
+                    SyncInfoValueControl control = syncInfoValueContainer.getSyncInfoValueControl();
                     
                     Value value = syncInfoValueContainer.getCurrentTLV().getValue();
 

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControl.java (from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlCodec.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControl.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControl.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlCodec.java&r1=905323&r2=905338&rev=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControl.java Mon Feb  1 17:07:13 2010
@@ -25,7 +25,7 @@
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.codec.controls.AbstractControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.AbstractControl;
 import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -35,7 +35,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev:$, $Date: 
  */
-public class SyncRequestValueControlCodec  extends AbstractControlCodec
+public class SyncRequestValueControl  extends AbstractControl
 {
     /** This control OID */
     public static final String CONTROL_OID = "1.3.6.1.4.1.4203.1.9.1.1";
@@ -52,7 +52,7 @@
     /** The global length for this control */
     private int syncRequestValueLength;
     
-    public SyncRequestValueControlCodec()
+    public SyncRequestValueControl()
     {
         super( CONTROL_OID );
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlContainer.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlContainer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlContainer.java Mon Feb  1 17:07:13 2010
@@ -32,7 +32,7 @@
 public class SyncRequestValueControlContainer extends AbstractContainer
 {
     /** SyncRequestValueControl */
-    private SyncRequestValueControlCodec control;
+    private SyncRequestValueControl control;
 
 
     /**
@@ -51,7 +51,7 @@
     /**
      * @return Returns the syncRequestValue control.
      */
-    public SyncRequestValueControlCodec getSyncRequestValueControl()
+    public SyncRequestValueControl getSyncRequestValueControl()
     {
         return control;
     }
@@ -63,7 +63,7 @@
      * 
      * @param control the SyncRequestValueControl to set.
      */
-    public void setSyncRequestValueControl( SyncRequestValueControlCodec control )
+    public void setSyncRequestValueControl( SyncRequestValueControl control )
     {
         this.control = control;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlDecoder.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlDecoder.java Mon Feb  1 17:07:13 2010
@@ -27,8 +27,8 @@
 import org.apache.directory.shared.asn1.Asn1Object;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.controls.ControlDecoder;
+import org.apache.directory.shared.ldap.message.control.Control;
 
 
 /**
@@ -52,11 +52,11 @@
      * @throws DecoderException If the decoding found an error
      * @throws NamingException It will never be throw by this method
      */
-    public Asn1Object decode( byte[] controlBytes, CodecControl control ) throws DecoderException
+    public Asn1Object decode( byte[] controlBytes, Control control ) throws DecoderException
     {
         ByteBuffer bb = ByteBuffer.wrap( controlBytes );
         SyncRequestValueControlContainer container = new SyncRequestValueControlContainer();
-        container.setSyncRequestValueControl( (SyncRequestValueControlCodec)control );
+        container.setSyncRequestValueControl( (SyncRequestValueControl)control );
 
         decoder.decode( bb, container );
         return container.getSyncRequestValueControl();

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControl.java (from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlCodec.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControl.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControl.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlCodec.java&r1=905323&r2=905338&rev=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControl.java Mon Feb  1 17:07:13 2010
@@ -26,7 +26,7 @@
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.codec.controls.AbstractControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.AbstractControl;
 import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -37,7 +37,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev:$, $Date: 
  */
-public class SyncStateValueControlCodec  extends AbstractControlCodec
+public class SyncStateValueControl  extends AbstractControl
 {
     /** This control OID */
     public static final String CONTROL_OID = "1.3.6.1.4.1.4203.1.9.1.2";
@@ -54,7 +54,7 @@
     /** global length for the control */
     private int syncStateSeqLength;
 
-    public SyncStateValueControlCodec()
+    public SyncStateValueControl()
     {
         super( CONTROL_OID );
         

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlContainer.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlContainer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlContainer.java Mon Feb  1 17:07:13 2010
@@ -32,7 +32,7 @@
 public class SyncStateValueControlContainer extends AbstractContainer
 {
     /** SyncStateValueControl */
-    private SyncStateValueControlCodec control;
+    private SyncStateValueControl control;
 
 
     /**
@@ -51,7 +51,7 @@
     /**
      * @return Returns the syncStateValue control.
      */
-    public SyncStateValueControlCodec getSyncStateValueControl()
+    public SyncStateValueControl getSyncStateValueControl()
     {
         return control;
     }
@@ -63,7 +63,7 @@
      * 
      * @param control the SyncStateValueControl to set.
      */
-    public void setSyncStateValueControl( SyncStateValueControlCodec control )
+    public void setSyncStateValueControl( SyncStateValueControl control )
     {
         this.control = control;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlDecoder.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlDecoder.java Mon Feb  1 17:07:13 2010
@@ -27,8 +27,8 @@
 import org.apache.directory.shared.asn1.Asn1Object;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.controls.ControlDecoder;
+import org.apache.directory.shared.ldap.message.control.Control;
 
 
 /**
@@ -52,11 +52,11 @@
      * @throws DecoderException If the decoding found an error
      * @throws NamingException It will never be throw by this method
      */
-    public Asn1Object decode( byte[] controlBytes, CodecControl control ) throws DecoderException
+    public Asn1Object decode( byte[] controlBytes, Control control ) throws DecoderException
     {
         ByteBuffer bb = ByteBuffer.wrap( controlBytes );
         SyncStateValueControlContainer container = new SyncStateValueControlContainer();
-        container.setSyncStateValueControl( (SyncStateValueControlCodec)control );
+        container.setSyncStateValueControl( (SyncStateValueControl)control );
 
         decoder.decode( bb, container );
         return container.getSyncStateValueControl();

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControl.java (from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlCodec.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControl.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControl.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlCodec.java&r1=905323&r2=905338&rev=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControl.java Mon Feb  1 17:07:13 2010
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.codec.controls.AbstractControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.AbstractControl;
 import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -81,7 +81,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$, 
  */
-public class EntryChangeControlCodec extends AbstractControlCodec
+public class EntryChangeControl extends AbstractControl
 {
     /** The EntryChange control */
     public static final String CONTROL_OID = "2.16.840.1.113730.3.4.7";
@@ -105,7 +105,7 @@
     /**
      * @see Asn1Object#Asn1Object
      */
-    public EntryChangeControlCodec()
+    public EntryChangeControl()
     {
         super( CONTROL_OID );
         

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlContainer.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlContainer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlContainer.java Mon Feb  1 17:07:13 2010
@@ -30,7 +30,7 @@
 public class EntryChangeControlContainer extends AbstractContainer
 {
     /** EntryChangeControl */
-    private EntryChangeControlCodec control;
+    private EntryChangeControl control;
 
 
     /**
@@ -49,7 +49,7 @@
     /**
      * @return Returns the EntryChangeControl.
      */
-    public EntryChangeControlCodec getEntryChangeControl()
+    public EntryChangeControl getEntryChangeControl()
     {
         return control;
     }
@@ -61,7 +61,7 @@
      * 
      * @param control the EntryChangeControl to set.
      */
-    public void setEntryChangeControl( EntryChangeControlCodec control )
+    public void setEntryChangeControl( EntryChangeControl control )
     {
         this.control = control;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlDecoder.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlDecoder.java Mon Feb  1 17:07:13 2010
@@ -27,8 +27,8 @@
 import org.apache.directory.shared.asn1.Asn1Object;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.controls.ControlDecoder;
+import org.apache.directory.shared.ldap.message.control.Control;
 
 
 /**
@@ -53,11 +53,11 @@
      * @throws NamingException It will never be throw by this method
      */
     
-    public Asn1Object decode( byte[] controlBytes, CodecControl control ) throws DecoderException
+    public Asn1Object decode( byte[] controlBytes, Control control ) throws DecoderException
     {
         ByteBuffer bb = ByteBuffer.wrap( controlBytes );
         EntryChangeControlContainer container = new EntryChangeControlContainer();
-        container.setEntryChangeControl( (EntryChangeControlCodec)control );
+        container.setEntryChangeControl( (EntryChangeControl)control );
         decoder.decode( bb, container );
         return container.getEntryChangeControl();
     }

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControl.java (from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlCodec.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControl.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControl.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlCodec.java&r1=905323&r2=905338&rev=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControl.java Mon Feb  1 17:07:13 2010
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.codec.controls.AbstractControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.AbstractControl;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -63,7 +63,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev:  $
  */
-public class PagedResultsControlCodec extends AbstractControlCodec
+public class PagedResultsControl extends AbstractControl
 {
     /** The Paged Search Control OID */
     public static final String CONTROL_OID = "1.2.840.113556.1.4.319";
@@ -80,7 +80,7 @@
     /**
      * @see Asn1Object#Asn1Object
      */
-    public PagedResultsControlCodec()
+    public PagedResultsControl()
     {
         super( CONTROL_OID );
         

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlContainer.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlContainer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlContainer.java Mon Feb  1 17:07:13 2010
@@ -32,7 +32,7 @@
 public class PagedResultsControlContainer extends AbstractContainer
 {
     /** PagedSearchControl */
-    private PagedResultsControlCodec control;
+    private PagedResultsControl control;
 
 
     /**
@@ -51,7 +51,7 @@
     /**
      * @return Returns the paged search control.
      */
-    public PagedResultsControlCodec getPagedSearchControl()
+    public PagedResultsControl getPagedSearchControl()
     {
 
         return control;
@@ -64,7 +64,7 @@
      * 
      * @param control the PagedSearchControl to set.
      */
-    public void setPagedSearchControl( PagedResultsControlCodec control )
+    public void setPagedSearchControl( PagedResultsControl control )
     {
         this.control = control;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlDecoder.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlDecoder.java Mon Feb  1 17:07:13 2010
@@ -27,8 +27,8 @@
 import org.apache.directory.shared.asn1.Asn1Object;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.controls.ControlDecoder;
+import org.apache.directory.shared.ldap.message.control.Control;
 
 
 /**
@@ -52,11 +52,11 @@
      * @throws DecoderException If the decoding found an error
      * @throws NamingException It will never be throw by this method
      */
-    public Asn1Object decode( byte[] controlBytes, CodecControl control ) throws DecoderException
+    public Asn1Object decode( byte[] controlBytes, Control control ) throws DecoderException
     {
         ByteBuffer bb = ByteBuffer.wrap( controlBytes );
         PagedResultsControlContainer container = new PagedResultsControlContainer();
-        container.setPagedSearchControl( (PagedResultsControlCodec)control );
+        container.setPagedSearchControl( (PagedResultsControl)control );
         decoder.decode( bb, container );
         return container.getPagedSearchControl();
     }

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControl.java (from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlCodec.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControl.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControl.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlCodec.java&r1=905323&r2=905338&rev=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControl.java Mon Feb  1 17:07:13 2010
@@ -26,7 +26,7 @@
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.codec.controls.AbstractControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.AbstractControl;
 import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
 
 
@@ -36,7 +36,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$, 
  */
-public class PersistentSearchControlCodec extends AbstractControlCodec
+public class PersistentSearchControl extends AbstractControl
 {
     /** This control OID */
     public static final String CONTROL_OID = "2.16.840.1.113730.3.4.3";
@@ -83,7 +83,7 @@
      * Default constructor
      *
      */
-    public PersistentSearchControlCodec()
+    public PersistentSearchControl()
     {
         super( CONTROL_OID );
         

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlContainer.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlContainer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlContainer.java Mon Feb  1 17:07:13 2010
@@ -30,7 +30,7 @@
 public class PersistentSearchControlContainer extends AbstractContainer
 {
     /** PSearchControl */
-    private PersistentSearchControlCodec control;
+    private PersistentSearchControl control;
 
 
     /**
@@ -49,7 +49,7 @@
     /**
      * @return Returns the persistent search control.
      */
-    public PersistentSearchControlCodec getPSearchControl()
+    public PersistentSearchControl getPSearchControl()
     {
 
         return control;
@@ -62,7 +62,7 @@
      * 
      * @param control the PSearchControl to set.
      */
-    public void setPSearchControl( PersistentSearchControlCodec control )
+    public void setPSearchControl( PersistentSearchControl control )
     {
         this.control = control;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlDecoder.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlDecoder.java Mon Feb  1 17:07:13 2010
@@ -27,8 +27,8 @@
 import org.apache.directory.shared.asn1.Asn1Object;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.controls.ControlDecoder;
+import org.apache.directory.shared.ldap.message.control.Control;
 
 
 /**
@@ -52,11 +52,11 @@
      * @throws DecoderException If the decoding found an error
      * @throws NamingException It will never be throw by this method
      */
-    public Asn1Object decode( byte[] controlBytes, CodecControl control ) throws DecoderException
+    public Asn1Object decode( byte[] controlBytes, Control control ) throws DecoderException
     {
         ByteBuffer bb = ByteBuffer.wrap( controlBytes );
         PersistentSearchControlContainer container = new PersistentSearchControlContainer();
-        container.setPSearchControl( (PersistentSearchControlCodec)control );
+        container.setPSearchControl( (PersistentSearchControl)control );
 
         decoder.decode( bb, container );
         return container.getPSearchControl();

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlGrammar.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlGrammar.java Mon Feb  1 17:07:13 2010
@@ -117,8 +117,8 @@
                     {
                         // Check that the value is into the allowed interval
                         int changeTypes = IntegerDecoder.parse( value, 
-                            PersistentSearchControlCodec.CHANGE_TYPES_MIN, 
-                            PersistentSearchControlCodec.CHANGE_TYPES_MAX );
+                            PersistentSearchControl.CHANGE_TYPES_MIN, 
+                            PersistentSearchControl.CHANGE_TYPES_MAX );
                         
                         if ( IS_DEBUG )
                         {

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControl.java (from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlCodec.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControl.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControl.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlCodec.java&r1=905323&r2=905338&rev=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControl.java Mon Feb  1 17:07:13 2010
@@ -26,7 +26,7 @@
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.codec.controls.AbstractControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.AbstractControl;
 
 
 /**
@@ -35,7 +35,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class SubentriesControlCodec extends AbstractControlCodec
+public class SubentriesControl extends AbstractControl
 {
     /** Ths control OID */
     public static final String CONTROL_OID = "1.3.6.1.4.1.4203.1.10.1";
@@ -46,7 +46,7 @@
      * Default constructor
      *
      */
-    public SubentriesControlCodec()
+    public SubentriesControl()
     {
         super( CONTROL_OID );
         

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlContainer.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlContainer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlContainer.java Mon Feb  1 17:07:13 2010
@@ -30,7 +30,7 @@
 public class SubentriesControlContainer extends AbstractContainer
 {
     /** PSearchControl */
-    private SubentriesControlCodec control;
+    private SubentriesControl control;
 
 
     /**
@@ -48,7 +48,7 @@
     /**
      * @return Returns the persistent search control.
      */
-    public SubentriesControlCodec getSubEntryControl()
+    public SubentriesControl getSubEntryControl()
     {
         return control;
     }
@@ -60,7 +60,7 @@
      * 
      * @param control the SubEntryControl to set.
      */
-    public void setSubEntryControl( SubentriesControlCodec control )
+    public void setSubEntryControl( SubentriesControl control )
     {
         this.control = control;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlDecoder.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlDecoder.java Mon Feb  1 17:07:13 2010
@@ -27,8 +27,8 @@
 import org.apache.directory.shared.asn1.Asn1Object;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.controls.ControlDecoder;
+import org.apache.directory.shared.ldap.message.control.Control;
 
 
 /**
@@ -52,11 +52,11 @@
      * @throws DecoderException If the decoding found an error
      * @throws NamingException It will never be throw by this method
      */
-    public Asn1Object decode( byte[] controlBytes, CodecControl control ) throws DecoderException
+    public Asn1Object decode( byte[] controlBytes, Control control ) throws DecoderException
     {
         ByteBuffer bb = ByteBuffer.wrap( controlBytes );
         SubentriesControlContainer container = new SubentriesControlContainer();
-        container.setSubEntryControl( (SubentriesControlCodec)control );
+        container.setSubEntryControl( (SubentriesControl)control );
 
         decoder.decode( bb, container );
         return container.getSubEntryControl();

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java Mon Feb  1 17:07:13 2010
@@ -71,7 +71,7 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     SubentriesControlContainer subEntryContainer = ( SubentriesControlContainer ) container;
-                    SubentriesControlCodec control = subEntryContainer.getSubEntryControl();
+                    SubentriesControl control = subEntryContainer.getSubEntryControl();
 
                     TLV tlv = subEntryContainer.getCurrentTLV();
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java Mon Feb  1 17:07:13 2010
@@ -32,7 +32,7 @@
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.codec.abandon.AbandonRequestCodec;
-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;
 
@@ -106,11 +106,11 @@
         assertEquals( 2, abandonRequest.getAbandonedMessageId() );
 
         // Check the Controls
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 4, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "1.3.6.1.5.5.1", control.getOid() );
         assertEquals( "0x61 0x62 0x63 0x64 0x65 0x66 ", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
         assertTrue( control.isCritical() );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java Mon Feb  1 17:07:13 2010
@@ -34,7 +34,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;
 
@@ -114,11 +114,11 @@
         assertEquals( 2, abandonRequest.getAbandonedMessageId() );
 
         // Check the Controls
-        List<CodecControl> controls = message.getControls();
+        List<Control> controls = message.getControls();
 
         assertEquals( 4, controls.size() );
 
-        CodecControl control = message.getControls( 0 );
+        Control control = message.getControls( 0 );
         assertEquals( "1.3.6.1.5.5.1", control.getOid() );
         assertEquals( "0x61 0x62 0x63 0x64 0x65 0x66 ", StringTools.dumpBytes( ( byte[] ) control.getValue() ) );
         assertTrue( control.isCritical() );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java Mon Feb  1 17:07:13 2010
@@ -40,13 +40,13 @@
 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.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.message.AddResponseImpl;
 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;
 
@@ -718,11 +718,11 @@
         assertEquals( 0x51, 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/add/AddResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.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;
 
@@ -207,11 +207,11 @@
         assertEquals( 0x2B, 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/bind/BindRequestPerfTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java Mon Feb  1 17:07:13 2010
@@ -32,8 +32,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.controls.CodecControlImpl;
+import org.apache.directory.shared.ldap.codec.controls.ControlImpl;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
@@ -117,11 +117,11 @@
             .getSimple() ) );
 
         // 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() ) );
 
@@ -164,7 +164,7 @@
             BindRequestCodec br = new BindRequestCodec();
             br.setName( name );
             
-            CodecControl control = new CodecControlImpl( "2.16.840.1.113730.3.4.2" );
+            Control control = new ControlImpl( "2.16.840.1.113730.3.4.2" );
 
             LdapAuthentication authentication = new SimpleAuthentication();
             ((SimpleAuthentication)authentication).setSimple( StringTools.getBytesUtf8( "password" ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.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.BindResponseImpl;
 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;
 
@@ -1232,11 +1232,11 @@
         assertEquals( 0x2F, 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() ) );
 
@@ -1312,11 +1312,11 @@
         assertEquals( 0x2D, 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/bind/BindResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java Mon Feb  1 17:07:13 2010
@@ -34,9 +34,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.codec.search.controls.pagedSearch.PagedResultsControlCodec;
+import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControl;
 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;
 
@@ -186,15 +186,15 @@
         assertEquals( 0x3C, 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( "1.2.840.113556.1.4.319", control.getOid() );
-        assertTrue( control instanceof PagedResultsControlCodec );
+        assertTrue( control instanceof PagedResultsControl );
         
-        PagedResultsControlCodec pagedSearchControl = (PagedResultsControlCodec)control;
+        PagedResultsControl pagedSearchControl = (PagedResultsControl)control;
         
         assertEquals( 5, pagedSearchControl.getSize() );
         assertTrue( Arrays.equals( "abcdef".getBytes(), pagedSearchControl.getCookie() ) );
@@ -348,11 +348,11 @@
         assertEquals( "", StringTools.utf8ToString( br.getServerSaslCreds() ) );
 
         // 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/compare/CompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.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.CompareResponseImpl;
 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;
 
@@ -469,11 +469,11 @@
         assertEquals( "value", compareRequest.getAssertionValue().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/compare/CompareResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.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( "", compareResponse.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/controls/replication/SyncDoneValueControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncDoneValueControlTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncDoneValueControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncDoneValueControlTest.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.EncoderException;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControl;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControlContainer;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControlDecoder;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -63,7 +63,7 @@
         bb.flip();
 
         SyncDoneValueControlContainer container = new SyncDoneValueControlContainer();
-        container.setSyncDoneValueControl( new SyncDoneValueControlCodec() );
+        container.setSyncDoneValueControl( new SyncDoneValueControl() );
 
         try
         {
@@ -74,7 +74,7 @@
             fail( e.getMessage() );
         }
 
-        SyncDoneValueControlCodec control = container.getSyncDoneValueControl();
+        SyncDoneValueControl control = container.getSyncDoneValueControl();
         assertEquals( "xkcd", StringTools.utf8ToString( control.getCookie() ) );
         assertTrue( control.isRefreshDeletes() );
         
@@ -125,7 +125,7 @@
         bb.flip();
 
         SyncDoneValueControlContainer container = new SyncDoneValueControlContainer();
-        container.setSyncDoneValueControl( new SyncDoneValueControlCodec() );
+        container.setSyncDoneValueControl( new SyncDoneValueControl() );
 
         try
         {
@@ -136,7 +136,7 @@
             fail( e.getMessage() );
         }
 
-        SyncDoneValueControlCodec control = container.getSyncDoneValueControl();
+        SyncDoneValueControl control = container.getSyncDoneValueControl();
         assertNull( control.getCookie() );
         assertTrue( control.isRefreshDeletes() );
 
@@ -184,7 +184,7 @@
         bb.flip();
 
         SyncDoneValueControlContainer container = new SyncDoneValueControlContainer();
-        container.setSyncDoneValueControl( new SyncDoneValueControlCodec() );
+        container.setSyncDoneValueControl( new SyncDoneValueControl() );
 
         try
         {
@@ -195,7 +195,7 @@
             fail( "shouldn't reach this" );
         }
 
-        SyncDoneValueControlCodec control = container.getSyncDoneValueControl();
+        SyncDoneValueControl control = container.getSyncDoneValueControl();
         assertNull( control.getCookie() );
         assertFalse( control.isRefreshDeletes() );
     }
@@ -217,7 +217,7 @@
         bb.flip();
 
         SyncDoneValueControlContainer container = new SyncDoneValueControlContainer();
-        container.setSyncDoneValueControl( new SyncDoneValueControlCodec() );
+        container.setSyncDoneValueControl( new SyncDoneValueControl() );
 
         try
         {
@@ -228,7 +228,7 @@
             fail( e.getMessage() );
         }
 
-        SyncDoneValueControlCodec control = container.getSyncDoneValueControl();
+        SyncDoneValueControl control = container.getSyncDoneValueControl();
         assertEquals( "", StringTools.utf8ToString( control.getCookie() ) );
         assertFalse( control.isRefreshDeletes() );
 



Mime
View raw message