directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r905338 [2/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/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java Mon Feb  1 17:07:13 2010
@@ -49,8 +49,7 @@
 import org.apache.directory.shared.ldap.codec.bind.BindRequestCodec;
 import org.apache.directory.shared.ldap.codec.bind.SimpleAuthentication;
 import org.apache.directory.shared.ldap.codec.compare.CompareRequestCodec;
-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.codec.del.DelRequestCodec;
 import org.apache.directory.shared.ldap.codec.extended.ExtendedRequestCodec;
 import org.apache.directory.shared.ldap.codec.modify.ModifyRequestCodec;
@@ -68,6 +67,7 @@
 import org.apache.directory.shared.ldap.entry.client.ClientBinaryValue;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.filter.SearchScope;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.util.Base64;
@@ -2645,7 +2645,7 @@
     {
         public void action( Dsmlv2Container container ) throws XmlPullParserException
         {
-            CodecControl control = null;
+            Control control = null;
 
             XmlPullParser xpp = container.getParser();
 
@@ -2662,7 +2662,7 @@
                         null );
                 }
                 
-                control = new CodecControlImpl( attributeValue );
+                control = new ControlImpl( attributeValue );
                 container.getBatchRequest().getCurrentRequest().addControl( control );
             }
             else
@@ -2698,7 +2698,7 @@
     {
         public void action( Dsmlv2Container container ) throws XmlPullParserException
         {
-            CodecControl control = container.getBatchRequest().getCurrentRequest().getCurrentControl();
+            Control control = container.getBatchRequest().getCurrentRequest().getCurrentControl();
 
             XmlPullParser xpp = container.getParser();
             try

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java Mon Feb  1 17:07:13 2010
@@ -29,7 +29,7 @@
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
 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;
 
@@ -138,7 +138,7 @@
         }
 
         AbandonRequestCodec abandonRequest = ( AbandonRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = abandonRequest.getCurrentControl();
+        Control control = abandonRequest.getCurrentControl();
 
         assertEquals( 1, abandonRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -170,7 +170,7 @@
         }
 
         AbandonRequestCodec abandonRequest = ( AbandonRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = abandonRequest.getCurrentControl();
+        Control control = abandonRequest.getCurrentControl();
 
         assertEquals( 1, abandonRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -202,7 +202,7 @@
         }
 
         AbandonRequestCodec abandonRequest = ( AbandonRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = abandonRequest.getCurrentControl();
+        Control control = abandonRequest.getCurrentControl();
 
         assertEquals( 1, abandonRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -234,7 +234,7 @@
         }
 
         AbandonRequestCodec abandonRequest = ( AbandonRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = abandonRequest.getCurrentControl();
+        Control control = abandonRequest.getCurrentControl();
 
         assertEquals( 2, abandonRequest.getControls().size() );
         assertFalse( control.isCritical() );
@@ -266,7 +266,7 @@
         }
 
         AbandonRequestCodec abandonRequest = ( AbandonRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = abandonRequest.getCurrentControl();
+        Control control = abandonRequest.getCurrentControl();
 
         assertEquals( 3, abandonRequest.getControls().size() );
         assertTrue( control.isCritical() );

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java Mon Feb  1 17:07:13 2010
@@ -31,10 +31,10 @@
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
 import org.apache.directory.shared.ldap.codec.add.AddRequestCodec;
-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.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -143,7 +143,7 @@
 
         assertEquals( 1, addRequest.getControls().size() );
 
-        CodecControl control = addRequest.getCurrentControl();
+        Control control = addRequest.getCurrentControl();
 
         assertTrue( control.isCritical() );
 
@@ -175,7 +175,7 @@
         }
 
         AddRequestCodec addRequest = ( AddRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = addRequest.getCurrentControl();
+        Control control = addRequest.getCurrentControl();
 
         assertEquals( 1, addRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -206,7 +206,7 @@
         }
 
         AddRequestCodec addRequest = ( AddRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = addRequest.getCurrentControl();
+        Control control = addRequest.getCurrentControl();
 
         assertEquals( 1, addRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -236,7 +236,7 @@
         }
 
         AddRequestCodec addRequest = ( AddRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = addRequest.getCurrentControl();
+        Control control = addRequest.getCurrentControl();
 
         assertEquals( 2, addRequest.getControls().size() );
         assertFalse( control.isCritical() );
@@ -267,7 +267,7 @@
         }
 
         AddRequestCodec addRequest = ( AddRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = addRequest.getCurrentControl();
+        Control control = addRequest.getCurrentControl();
 
         assertEquals( 3, addRequest.getControls().size() );
         assertTrue( control.isCritical() );

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java Mon Feb  1 17:07:13 2010
@@ -33,9 +33,9 @@
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
 import org.apache.directory.shared.ldap.codec.add.AddResponseCodec;
-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.ResultCodeEnum;
+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;
@@ -111,7 +111,7 @@
 
         assertEquals( 1, addResponse.getControls().size() );
 
-        CodecControl control = addResponse.getCurrentControl();
+        Control control = addResponse.getCurrentControl();
 
         assertTrue( control.isCritical() );
 
@@ -143,7 +143,7 @@
         }
 
         AddResponseCodec addResponse = ( AddResponseCodec ) parser.getBatchResponse().getCurrentResponse();
-        CodecControl control = addResponse.getCurrentControl();
+        Control control = addResponse.getCurrentControl();
 
         assertEquals( 1, addResponse.getControls().size() );
         assertTrue( control.isCritical() );
@@ -176,7 +176,7 @@
 
         assertEquals( 2, addResponse.getControls().size() );
 
-        CodecControl control = addResponse.getCurrentControl();
+        Control control = addResponse.getCurrentControl();
 
         assertFalse( control.isCritical() );
 
@@ -211,7 +211,7 @@
 
         assertEquals( 3, addResponse.getControls().size() );
 
-        CodecControl control = addResponse.getCurrentControl();
+        Control control = addResponse.getCurrentControl();
 
         assertTrue( control.isCritical() );
 

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java Mon Feb  1 17:07:13 2010
@@ -29,7 +29,7 @@
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
 import org.apache.directory.shared.ldap.codec.bind.BindRequestCodec;
-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;
 
@@ -136,7 +136,7 @@
         }
 
         BindRequestCodec abandonRequest = ( BindRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = abandonRequest.getCurrentControl();
+        Control control = abandonRequest.getCurrentControl();
 
         assertEquals( 1, abandonRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -167,7 +167,7 @@
         }
 
         BindRequestCodec abandonRequest = ( BindRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = abandonRequest.getCurrentControl();
+        Control control = abandonRequest.getCurrentControl();
 
         assertEquals( 1, abandonRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -198,7 +198,7 @@
         }
 
         BindRequestCodec abandonRequest = ( BindRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = abandonRequest.getCurrentControl();
+        Control control = abandonRequest.getCurrentControl();
 
         assertEquals( 1, abandonRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -228,7 +228,7 @@
         }
 
         BindRequestCodec abandonRequest = ( BindRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = abandonRequest.getCurrentControl();
+        Control control = abandonRequest.getCurrentControl();
 
         assertEquals( 2, abandonRequest.getControls().size() );
         assertFalse( control.isCritical() );
@@ -259,7 +259,7 @@
         }
 
         BindRequestCodec abandonRequest = ( BindRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = abandonRequest.getCurrentControl();
+        Control control = abandonRequest.getCurrentControl();
 
         assertEquals( 3, abandonRequest.getControls().size() );
         assertTrue( control.isCritical() );

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java Mon Feb  1 17:07:13 2010
@@ -33,9 +33,9 @@
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
 import org.apache.directory.shared.ldap.codec.bind.BindResponseCodec;
-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.ResultCodeEnum;
+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;
@@ -111,7 +111,7 @@
 
         assertEquals( 1, bindResponse.getControls().size() );
 
-        CodecControl control = bindResponse.getCurrentControl();
+        Control control = bindResponse.getCurrentControl();
 
         assertTrue( control.isCritical() );
 
@@ -143,7 +143,7 @@
         }
 
         BindResponseCodec bindResponse = ( BindResponseCodec ) parser.getBatchResponse().getCurrentResponse();
-        CodecControl control = bindResponse.getCurrentControl();
+        Control control = bindResponse.getCurrentControl();
 
         assertEquals( 1, bindResponse.getControls().size() );
         assertTrue( control.isCritical() );
@@ -177,7 +177,7 @@
 
         assertEquals( 2, bindResponse.getControls().size() );
 
-        CodecControl control = bindResponse.getCurrentControl();
+        Control control = bindResponse.getCurrentControl();
 
         assertFalse( control.isCritical() );
 
@@ -212,7 +212,7 @@
 
         assertEquals( 3, bindResponse.getControls().size() );
 
-        CodecControl control = bindResponse.getCurrentControl();
+        Control control = bindResponse.getCurrentControl();
 
         assertTrue( control.isCritical() );
 

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java Mon Feb  1 17:07:13 2010
@@ -30,7 +30,7 @@
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
 import org.apache.directory.shared.ldap.codec.compare.CompareRequestCodec;
-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;
 
@@ -141,7 +141,7 @@
 
         assertEquals( 1, compareRequest.getControls().size() );
 
-        CodecControl control = compareRequest.getCurrentControl();
+        Control control = compareRequest.getCurrentControl();
 
         assertTrue( control.isCritical() );
 
@@ -176,7 +176,7 @@
 
         assertEquals( 1, compareRequest.getControls().size() );
 
-        CodecControl control = compareRequest.getCurrentControl();
+        Control control = compareRequest.getCurrentControl();
 
         assertTrue( control.isCritical() );
 
@@ -211,7 +211,7 @@
 
         assertEquals( 1, compareRequest.getControls().size() );
 
-        CodecControl control = compareRequest.getCurrentControl();
+        Control control = compareRequest.getCurrentControl();
 
         assertTrue( control.isCritical() );
 
@@ -246,7 +246,7 @@
 
         assertEquals( 2, compareRequest.getControls().size() );
 
-        CodecControl control = compareRequest.getCurrentControl();
+        Control control = compareRequest.getCurrentControl();
 
         assertFalse( control.isCritical() );
 
@@ -281,7 +281,7 @@
 
         assertEquals( 3, compareRequest.getControls().size() );
 
-        CodecControl control = compareRequest.getCurrentControl();
+        Control control = compareRequest.getCurrentControl();
 
         assertTrue( control.isCritical() );
 

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java Mon Feb  1 17:07:13 2010
@@ -33,9 +33,9 @@
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
 import org.apache.directory.shared.ldap.codec.compare.CompareResponseCodec;
-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.ResultCodeEnum;
+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;
@@ -112,7 +112,7 @@
 
         assertEquals( 1, compareResponse.getControls().size() );
 
-        CodecControl control = compareResponse.getCurrentControl();
+        Control control = compareResponse.getCurrentControl();
 
         assertTrue( control.isCritical() );
 
@@ -144,7 +144,7 @@
         }
 
         CompareResponseCodec compareResponse = ( CompareResponseCodec ) parser.getBatchResponse().getCurrentResponse();
-        CodecControl control = compareResponse.getCurrentControl();
+        Control control = compareResponse.getCurrentControl();
 
         assertEquals( 1, compareResponse.getControls().size() );
         assertTrue( control.isCritical() );
@@ -178,7 +178,7 @@
 
         assertEquals( 2, compareResponse.getControls().size() );
 
-        CodecControl control = compareResponse.getCurrentControl();
+        Control control = compareResponse.getCurrentControl();
 
         assertFalse( control.isCritical() );
 
@@ -213,7 +213,7 @@
 
         assertEquals( 3, compareResponse.getControls().size() );
 
-        CodecControl control = compareResponse.getCurrentControl();
+        Control control = compareResponse.getCurrentControl();
 
         assertTrue( control.isCritical() );
 

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java Mon Feb  1 17:07:13 2010
@@ -28,8 +28,8 @@
 
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.del.DelRequestCodec;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -136,7 +136,7 @@
         }
 
         DelRequestCodec delRequest = ( DelRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = delRequest.getCurrentControl();
+        Control control = delRequest.getCurrentControl();
 
         assertEquals( 1, delRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -167,7 +167,7 @@
         }
 
         DelRequestCodec delRequest = ( DelRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = delRequest.getCurrentControl();
+        Control control = delRequest.getCurrentControl();
 
         assertEquals( 1, delRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -198,7 +198,7 @@
         }
 
         DelRequestCodec delRequest = ( DelRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = delRequest.getCurrentControl();
+        Control control = delRequest.getCurrentControl();
 
         assertEquals( 1, delRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -228,7 +228,7 @@
         }
 
         DelRequestCodec delRequest = ( DelRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = delRequest.getCurrentControl();
+        Control control = delRequest.getCurrentControl();
 
         assertEquals( 2, delRequest.getControls().size() );
         assertFalse( control.isCritical() );
@@ -259,7 +259,7 @@
         }
 
         DelRequestCodec delRequest = ( DelRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = delRequest.getCurrentControl();
+        Control control = delRequest.getCurrentControl();
 
         assertEquals( 3, delRequest.getControls().size() );
         assertTrue( control.isCritical() );

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java Mon Feb  1 17:07:13 2010
@@ -32,10 +32,10 @@
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.del.DelResponseCodec;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+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;
@@ -112,7 +112,7 @@
 
         assertEquals( 1, delResponse.getControls().size() );
 
-        CodecControl control = delResponse.getCurrentControl();
+        Control control = delResponse.getCurrentControl();
 
         assertTrue( control.isCritical() );
 
@@ -144,7 +144,7 @@
         }
 
         DelResponseCodec delResponse = ( DelResponseCodec ) parser.getBatchResponse().getCurrentResponse();
-        CodecControl control = delResponse.getCurrentControl();
+        Control control = delResponse.getCurrentControl();
 
         assertEquals( 1, delResponse.getControls().size() );
         assertTrue( control.isCritical() );
@@ -177,7 +177,7 @@
 
         assertEquals( 2, delResponse.getControls().size() );
 
-        CodecControl control = delResponse.getCurrentControl();
+        Control control = delResponse.getCurrentControl();
 
         assertFalse( control.isCritical() );
 
@@ -212,7 +212,7 @@
 
         assertEquals( 3, delResponse.getControls().size() );
 
-        CodecControl control = delResponse.getCurrentControl();
+        Control control = delResponse.getCurrentControl();
 
         assertTrue( control.isCritical() );
 

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java Mon Feb  1 17:07:13 2010
@@ -29,8 +29,8 @@
 
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.extended.ExtendedRequestCodec;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -101,7 +101,7 @@
         }
 
         ExtendedRequestCodec extendedRequest = ( ExtendedRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = extendedRequest.getCurrentControl();
+        Control control = extendedRequest.getCurrentControl();
 
         assertEquals( 1, extendedRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -132,7 +132,7 @@
         }
 
         ExtendedRequestCodec extendedRequest = ( ExtendedRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = extendedRequest.getCurrentControl();
+        Control control = extendedRequest.getCurrentControl();
 
         assertEquals( 1, extendedRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -163,7 +163,7 @@
         }
 
         ExtendedRequestCodec extendedRequest = ( ExtendedRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = extendedRequest.getCurrentControl();
+        Control control = extendedRequest.getCurrentControl();
 
         assertEquals( 1, extendedRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -194,7 +194,7 @@
         }
 
         ExtendedRequestCodec extendedRequest = ( ExtendedRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = extendedRequest.getCurrentControl();
+        Control control = extendedRequest.getCurrentControl();
 
         assertEquals( 2, extendedRequest.getControls().size() );
         assertFalse( control.isCritical() );
@@ -225,7 +225,7 @@
         }
 
         ExtendedRequestCodec extendedRequest = ( ExtendedRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = extendedRequest.getCurrentControl();
+        Control control = extendedRequest.getCurrentControl();
 
         assertEquals( 3, extendedRequest.getControls().size() );
         assertTrue( control.isCritical() );

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java Mon Feb  1 17:07:13 2010
@@ -34,10 +34,10 @@
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.extended.ExtendedResponseCodec;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+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;
@@ -114,7 +114,7 @@
 
         assertEquals( 1, extendedResponse.getControls().size() );
 
-        CodecControl control = extendedResponse.getCurrentControl();
+        Control control = extendedResponse.getCurrentControl();
 
         assertTrue( control.isCritical() );
 
@@ -146,7 +146,7 @@
         }
 
         ExtendedResponseCodec extendedResponse = ( ExtendedResponseCodec ) parser.getBatchResponse().getCurrentResponse();
-        CodecControl control = extendedResponse.getCurrentControl();
+        Control control = extendedResponse.getCurrentControl();
 
         assertEquals( 1, extendedResponse.getControls().size() );
         assertTrue( control.isCritical() );
@@ -180,7 +180,7 @@
 
         assertEquals( 2, extendedResponse.getControls().size() );
 
-        CodecControl control = extendedResponse.getCurrentControl();
+        Control control = extendedResponse.getCurrentControl();
 
         assertFalse( control.isCritical() );
 
@@ -215,7 +215,7 @@
 
         assertEquals( 3, extendedResponse.getControls().size() );
 
-        CodecControl control = extendedResponse.getCurrentControl();
+        Control control = extendedResponse.getCurrentControl();
 
         assertTrue( control.isCritical() );
 

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java Mon Feb  1 17:07:13 2010
@@ -28,8 +28,8 @@
 
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNRequestCodec;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -100,7 +100,7 @@
         }
 
         ModifyDNRequestCodec modifyDNRequest = ( ModifyDNRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = modifyDNRequest.getCurrentControl();
+        Control control = modifyDNRequest.getCurrentControl();
 
         assertEquals( 1, modifyDNRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -131,7 +131,7 @@
         }
 
         ModifyDNRequestCodec modifyDNRequest = ( ModifyDNRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = modifyDNRequest.getCurrentControl();
+        Control control = modifyDNRequest.getCurrentControl();
 
         assertEquals( 1, modifyDNRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -162,7 +162,7 @@
         }
 
         ModifyDNRequestCodec modifyDNRequest = ( ModifyDNRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = modifyDNRequest.getCurrentControl();
+        Control control = modifyDNRequest.getCurrentControl();
 
         assertEquals( 1, modifyDNRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -193,7 +193,7 @@
         }
 
         ModifyDNRequestCodec modifyDNRequest = ( ModifyDNRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = modifyDNRequest.getCurrentControl();
+        Control control = modifyDNRequest.getCurrentControl();
 
         assertEquals( 2, modifyDNRequest.getControls().size() );
         assertFalse( control.isCritical() );
@@ -224,7 +224,7 @@
         }
 
         ModifyDNRequestCodec modifyDNRequest = ( ModifyDNRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = modifyDNRequest.getCurrentControl();
+        Control control = modifyDNRequest.getCurrentControl();
 
         assertEquals( 3, modifyDNRequest.getControls().size() );
         assertTrue( control.isCritical() );

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java Mon Feb  1 17:07:13 2010
@@ -32,10 +32,10 @@
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNResponseCodec;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+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;
@@ -112,7 +112,7 @@
 
         assertEquals( 1, modifyDNResponse.getControls().size() );
 
-        CodecControl control = modifyDNResponse.getCurrentControl();
+        Control control = modifyDNResponse.getCurrentControl();
 
         assertTrue( control.isCritical() );
 
@@ -144,7 +144,7 @@
         }
 
         ModifyDNResponseCodec modifyDNResponse = ( ModifyDNResponseCodec ) parser.getBatchResponse().getCurrentResponse();
-        CodecControl control = modifyDNResponse.getCurrentControl();
+        Control control = modifyDNResponse.getCurrentControl();
 
         assertEquals( 1, modifyDNResponse.getControls().size() );
         assertTrue( control.isCritical() );
@@ -178,7 +178,7 @@
 
         assertEquals( 2, modifyDNResponse.getControls().size() );
 
-        CodecControl control = modifyDNResponse.getCurrentControl();
+        Control control = modifyDNResponse.getCurrentControl();
 
         assertFalse( control.isCritical() );
 
@@ -213,7 +213,7 @@
 
         assertEquals( 3, modifyDNResponse.getControls().size() );
 
-        CodecControl control = modifyDNResponse.getCurrentControl();
+        Control control = modifyDNResponse.getCurrentControl();
 
         assertTrue( control.isCritical() );
 

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java Mon Feb  1 17:07:13 2010
@@ -34,10 +34,10 @@
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
 import org.apache.directory.shared.ldap.codec.LdapConstants;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.modify.ModifyRequestCodec;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -107,7 +107,7 @@
         }
 
         ModifyRequestCodec modifyRequest = ( ModifyRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = modifyRequest.getCurrentControl();
+        Control control = modifyRequest.getCurrentControl();
 
         assertEquals( 1, modifyRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -138,7 +138,7 @@
         }
 
         ModifyRequestCodec modifyRequest = ( ModifyRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = modifyRequest.getCurrentControl();
+        Control control = modifyRequest.getCurrentControl();
 
         assertEquals( 1, modifyRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -169,7 +169,7 @@
         }
 
         ModifyRequestCodec modifyRequest = ( ModifyRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = modifyRequest.getCurrentControl();
+        Control control = modifyRequest.getCurrentControl();
 
         assertEquals( 1, modifyRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -200,7 +200,7 @@
         }
 
         ModifyRequestCodec modifyRequest = ( ModifyRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = modifyRequest.getCurrentControl();
+        Control control = modifyRequest.getCurrentControl();
 
         assertEquals( 2, modifyRequest.getControls().size() );
         assertFalse( control.isCritical() );
@@ -231,7 +231,7 @@
         }
 
         ModifyRequestCodec modifyRequest = ( ModifyRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = modifyRequest.getCurrentControl();
+        Control control = modifyRequest.getCurrentControl();
 
         assertEquals( 3, modifyRequest.getControls().size() );
         assertTrue( control.isCritical() );

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java Mon Feb  1 17:07:13 2010
@@ -32,10 +32,10 @@
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.modify.ModifyResponseCodec;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+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;
@@ -112,7 +112,7 @@
 
         assertEquals( 1, modifyResponse.getControls().size() );
 
-        CodecControl control = modifyResponse.getCurrentControl();
+        Control control = modifyResponse.getCurrentControl();
 
         assertTrue( control.isCritical() );
 
@@ -144,7 +144,7 @@
         }
 
         ModifyResponseCodec modifyResponse = ( ModifyResponseCodec ) parser.getBatchResponse().getCurrentResponse();
-        CodecControl control = modifyResponse.getCurrentControl();
+        Control control = modifyResponse.getCurrentControl();
 
         assertEquals( 1, modifyResponse.getControls().size() );
         assertTrue( control.isCritical() );
@@ -178,7 +178,7 @@
 
         assertEquals( 2, modifyResponse.getControls().size() );
 
-        CodecControl control = modifyResponse.getCurrentControl();
+        Control control = modifyResponse.getCurrentControl();
 
         assertFalse( control.isCritical() );
 
@@ -213,7 +213,7 @@
 
         assertEquals( 3, modifyResponse.getControls().size() );
 
-        CodecControl control = modifyResponse.getCurrentControl();
+        Control control = modifyResponse.getCurrentControl();
 
         assertTrue( control.isCritical() );
 

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java Mon Feb  1 17:07:13 2010
@@ -35,7 +35,6 @@
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
 import org.apache.directory.shared.ldap.codec.AttributeValueAssertion;
 import org.apache.directory.shared.ldap.codec.LdapConstants;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.search.AndFilter;
 import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter;
 import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter;
@@ -47,6 +46,7 @@
 import org.apache.directory.shared.ldap.codec.search.SubstringFilter;
 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.util.StringTools;
 import org.junit.Test;
 
@@ -153,7 +153,7 @@
         }
 
         SearchRequestCodec searchRequest = ( SearchRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = searchRequest.getCurrentControl();
+        Control control = searchRequest.getCurrentControl();
 
         assertEquals( 1, searchRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -184,7 +184,7 @@
         }
 
         SearchRequestCodec searchRequest = ( SearchRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = searchRequest.getCurrentControl();
+        Control control = searchRequest.getCurrentControl();
 
         assertEquals( 1, searchRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -215,7 +215,7 @@
         }
 
         SearchRequestCodec searchRequest = ( SearchRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = searchRequest.getCurrentControl();
+        Control control = searchRequest.getCurrentControl();
 
         assertEquals( 1, searchRequest.getControls().size() );
         assertTrue( control.isCritical() );
@@ -246,7 +246,7 @@
         }
 
         SearchRequestCodec searchRequest = ( SearchRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = searchRequest.getCurrentControl();
+        Control control = searchRequest.getCurrentControl();
 
         assertEquals( 2, searchRequest.getControls().size() );
         assertFalse( control.isCritical() );
@@ -277,7 +277,7 @@
         }
 
         SearchRequestCodec searchRequest = ( SearchRequestCodec ) parser.getBatchRequest().getCurrentRequest();
-        CodecControl control = searchRequest.getCurrentControl();
+        Control control = searchRequest.getCurrentControl();
 
         assertEquals( 3, searchRequest.getControls().size() );
         assertTrue( control.isCritical() );

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java Mon Feb  1 17:07:13 2010
@@ -33,10 +33,10 @@
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.dsmlv2.reponse.SearchResponse;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.search.SearchResultDoneCodec;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+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;
@@ -76,7 +76,7 @@
 
         assertEquals( 1, searchResultDone.getControls().size() );
 
-        CodecControl control = searchResultDone.getCurrentControl();
+        Control control = searchResultDone.getCurrentControl();
 
         assertTrue( control.isCritical() );
 
@@ -109,7 +109,7 @@
 
         SearchResultDoneCodec searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getSearchResultDone();
-        CodecControl control = searchResultDone.getCurrentControl();
+        Control control = searchResultDone.getCurrentControl();
 
         assertEquals( 1, searchResultDone.getControls().size() );
         assertTrue( control.isCritical() );
@@ -144,7 +144,7 @@
 
         assertEquals( 2, searchResultDone.getControls().size() );
 
-        CodecControl control = searchResultDone.getCurrentControl();
+        Control control = searchResultDone.getCurrentControl();
 
         assertFalse( control.isCritical() );
 
@@ -180,7 +180,7 @@
 
         assertEquals( 3, searchResultDone.getControls().size() );
 
-        CodecControl control = searchResultDone.getCurrentControl();
+        Control control = searchResultDone.getCurrentControl();
 
         assertTrue( control.isCritical() );
 

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java Mon Feb  1 17:07:13 2010
@@ -32,11 +32,11 @@
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.dsmlv2.reponse.SearchResponse;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.search.SearchResultEntryCodec;
 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.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
@@ -74,7 +74,7 @@
 
         assertEquals( 1, searchResultEntry.getControls().size() );
 
-        CodecControl control = searchResultEntry.getCurrentControl();
+        Control control = searchResultEntry.getCurrentControl();
 
         assertTrue( control.isCritical() );
 
@@ -107,7 +107,7 @@
 
         SearchResultEntryCodec searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getCurrentSearchResultEntry();
-        CodecControl control = searchResultEntry.getCurrentControl();
+        Control control = searchResultEntry.getCurrentControl();
 
         assertEquals( 1, searchResultEntry.getControls().size() );
         assertTrue( control.isCritical() );
@@ -142,7 +142,7 @@
 
         assertEquals( 2, searchResultEntry.getControls().size() );
 
-        CodecControl control = searchResultEntry.getCurrentControl();
+        Control control = searchResultEntry.getCurrentControl();
 
         assertFalse( control.isCritical() );
 
@@ -178,7 +178,7 @@
 
         assertEquals( 3, searchResultEntry.getControls().size() );
 
-        CodecControl control = searchResultEntry.getCurrentControl();
+        Control control = searchResultEntry.getCurrentControl();
 
         assertTrue( control.isCritical() );
 

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java Mon Feb  1 17:07:13 2010
@@ -31,9 +31,9 @@
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.dsmlv2.reponse.SearchResponse;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.search.SearchResultReferenceCodec;
 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;
@@ -72,7 +72,7 @@
 
         assertEquals( 1, searchResultReference.getControls().size() );
 
-        CodecControl control = searchResultReference.getCurrentControl();
+        Control control = searchResultReference.getCurrentControl();
 
         assertTrue( control.isCritical() );
 
@@ -108,7 +108,7 @@
 
         assertEquals( 1, searchResultReference.getControls().size() );
 
-        CodecControl control = searchResultReference.getCurrentControl();
+        Control control = searchResultReference.getCurrentControl();
 
         assertTrue( control.isCritical() );
 
@@ -144,7 +144,7 @@
 
         assertEquals( 2, searchResultReference.getControls().size() );
 
-        CodecControl control = searchResultReference.getCurrentControl();
+        Control control = searchResultReference.getCurrentControl();
 
         assertFalse( control.isCritical() );
 
@@ -180,7 +180,7 @@
 
         assertEquals( 3, searchResultReference.getControls().size() );
 
-        CodecControl control = searchResultReference.getCurrentControl();
+        Control control = searchResultReference.getCurrentControl();
 
         assertTrue( control.isCritical() );
 

Modified: directory/shared/trunk/ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/JndiUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/JndiUtils.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/JndiUtils.java (original)
+++ directory/shared/trunk/ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/JndiUtils.java Mon Feb  1 17:07:13 2010
@@ -22,8 +22,7 @@
 import javax.naming.NamingException;
 import javax.naming.ldap.BasicControl;
 
-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;
 
 /**
@@ -36,7 +35,7 @@
 {
     public static javax.naming.ldap.Control toJndiControl( Control control )
     {
-        byte[] value = ((CodecControl)control).getValue();
+        byte[] value = control.getValue();
         javax.naming.ldap.Control jndiControl = new BasicControl( control.getOid(), control.isCritical(), value );
         
         return jndiControl;
@@ -66,7 +65,7 @@
     
     public static Control fromJndiControl( javax.naming.ldap.Control jndiControl )
     {
-        Control control = new CodecControlImpl( jndiControl.getID() );
+        Control control = new ControlImpl( jndiControl.getID() );
         
         control.setValue( jndiControl.getEncodedValue() );
 

Modified: directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifControl.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifControl.java (original)
+++ directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifControl.java Mon Feb  1 17:07:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.directory.shared.ldap.ldif;
 
-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;
 
 /**
@@ -30,7 +30,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class LdifControl extends AbstractControlCodec
+public class LdifControl extends AbstractControl
 {
     private static final long serialVersionUID = 1L;
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageCodec.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageCodec.java Mon Feb  1 17:07:13 2010
@@ -41,11 +41,11 @@
 import org.apache.directory.shared.ldap.codec.compare.CompareRequestCodec;
 import org.apache.directory.shared.ldap.codec.compare.CompareResponseCodec;
 import org.apache.directory.shared.ldap.codec.controls.CodecControl;
-import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControlCodec;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControlCodec;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlCodec;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueControlCodec;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControl;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControl;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueControl;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControl;
 import org.apache.directory.shared.ldap.codec.del.DelRequestCodec;
 import org.apache.directory.shared.ldap.codec.del.DelResponseCodec;
 import org.apache.directory.shared.ldap.codec.extended.ExtendedRequestCodec;
@@ -59,10 +59,11 @@
 import org.apache.directory.shared.ldap.codec.search.SearchResultDoneCodec;
 import org.apache.directory.shared.ldap.codec.search.SearchResultEntryCodec;
 import org.apache.directory.shared.ldap.codec.search.SearchResultReferenceCodec;
-import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControlCodec;
-import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControlCodec;
-import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControlCodec;
+import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControl;
+import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControl;
+import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControl;
 import org.apache.directory.shared.ldap.codec.unbind.UnBindRequestCodec;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.message.control.replication.SynchronizationInfoEnum;
 
 
@@ -85,10 +86,10 @@
     private Asn1Object protocolOp;
 
     /** The controls */
-    private List<CodecControl> controls;
+    private List<Control> controls;
 
     /** The current control */
-    private CodecControl currentControl;
+    private Control currentControl;
 
     /** The LdapMessage length */
     private int ldapMessageLength;
@@ -99,7 +100,7 @@
     /** The controls sequence length */
     private int controlsSequenceLength;
 
-    private Map<String, CodecControl> codecControls = new HashMap<String,CodecControl>();
+    private Map<String, Control> codecControls = new HashMap<String, Control>();
 
 
     // ~ Constructors
@@ -114,37 +115,37 @@
         // We should not create this kind of object directly
         
         // Initialize the different known Controls
-        CodecControl control = new PersistentSearchControlCodec();
+        Control control = new PersistentSearchControl();
         codecControls.put( control.getOid(), control );
 
-        control = new ManageDsaITControlCodec();
+        control = new ManageDsaITControl();
         codecControls.put( control.getOid(), control );
 
-        control = new SubentriesControlCodec();
+        control = new SubentriesControl();
         codecControls.put( control.getOid(), control );
 
-        control = new PagedResultsControlCodec();
+        control = new PagedResultsControl();
         codecControls.put( control.getOid(), control );
         
-        control = new SyncDoneValueControlCodec();
+        control = new SyncDoneValueControl();
         codecControls.put( control.getOid(), control );
         
-        control = new SyncInfoValueControlCodec( SynchronizationInfoEnum.NEW_COOKIE );
+        control = new SyncInfoValueControl( SynchronizationInfoEnum.NEW_COOKIE );
         codecControls.put( control.getOid(), control );
         
-        control = new SyncInfoValueControlCodec( SynchronizationInfoEnum.REFRESH_DELETE );
+        control = new SyncInfoValueControl( SynchronizationInfoEnum.REFRESH_DELETE );
         codecControls.put( control.getOid(), control );
         
-        control = new SyncInfoValueControlCodec( SynchronizationInfoEnum.REFRESH_PRESENT );
+        control = new SyncInfoValueControl( SynchronizationInfoEnum.REFRESH_PRESENT );
         codecControls.put( control.getOid(), control );
         
-        control = new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET );
+        control = new SyncInfoValueControl( SynchronizationInfoEnum.SYNC_ID_SET );
         codecControls.put( control.getOid(), control );
         
-        control = new SyncRequestValueControlCodec();
+        control = new SyncRequestValueControl();
         codecControls.put( control.getOid(), control );
         
-        control = new SyncStateValueControlCodec();
+        control = new SyncStateValueControl();
         codecControls.put( control.getOid(), control );
     }
 
@@ -158,7 +159,7 @@
      * @param i The index of the Control Object to get
      * @return The selected Control Object
      */
-    public CodecControl getControls( int i )
+    public Control getControls( int i )
     {
         if ( controls != null )
         {
@@ -176,7 +177,7 @@
      * 
      * @return The Control Objects
      */
-    public List<CodecControl> getControls()
+    public List<Control> getControls()
     {
         return controls;
     }
@@ -187,13 +188,13 @@
      * 
      * @return The current Control Object
      */
-    public CodecControl getCurrentControl()
+    public Control getCurrentControl()
     {
         return currentControl;
     }
     
     
-    public CodecControl getCodecControl( String oid )
+    public Control getCodecControl( String oid )
     {
         return codecControls.get( oid );
     }
@@ -204,13 +205,13 @@
      * 
      * @param control The Control to add
      */
-    public void addControl( CodecControl control )
+    public void addControl( Control control )
     {
         currentControl = control;
         
         if ( controls == null )
         {
-            controls = new ArrayList<CodecControl>();
+            controls = new ArrayList<Control>();
         }
         
         controls.add( control );
@@ -223,7 +224,7 @@
      * 
      * @param controls The list of Controls to set or add
      */
-    public void addControls( List<CodecControl> controls )
+    public void addControls( List<Control> controls )
     {
         if( this.controls == null )
         {
@@ -241,7 +242,7 @@
      */
     public void initControls()
     {
-        controls = new ArrayList<CodecControl>();
+        controls = new ArrayList<Control>();
     }
 
 
@@ -681,9 +682,9 @@
             controlsSequenceLength = 0;
 
             // We may have more than one control. ControlsLength is L4.
-            for ( CodecControl control:controls )
+            for ( Control control:controls )
             {
-                controlsSequenceLength += control.computeLength();
+                controlsSequenceLength += ((CodecControl)control).computeLength();
             }
 
             // Computes the controls length
@@ -758,9 +759,9 @@
             bb.put( TLV.getBytes( controlsLength ) );
 
             // Encode each control
-            for ( CodecControl control:controls )
+            for ( Control control:controls )
             {
-                control.encode( bb );
+                ((CodecControl)control).encode( bb );
             }
         }
 
@@ -783,7 +784,7 @@
 
         if ( controls != null )
         {
-            for ( CodecControl control:controls )
+            for ( Control control:controls )
             {
                 sb.append( control );
             }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java Mon Feb  1 17:07:13 2010
@@ -21,7 +21,7 @@
 
 
 import org.apache.directory.shared.asn1.ber.AbstractContainer;
-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.spi.BinaryAttributeDetector;
 
 
@@ -48,7 +48,7 @@
     private int messageId;
     
     /** The current control */
-    private AbstractControlCodec currentControl;
+    private AbstractControl currentControl;
 
     // ~ Constructors
     // -------------------------------------------------------------------------------
@@ -148,7 +148,7 @@
     /**
      * @return the current control being created
      */
-    public AbstractControlCodec getCurrentControl()
+    public AbstractControl getCurrentControl()
     {
         return currentControl;
     }
@@ -157,7 +157,7 @@
      * Store a newly created control
      * @param currentControl The control to store
      */
-    public void setCurrentControl( AbstractControlCodec currentControl )
+    public void setCurrentControl( AbstractControl currentControl )
     {
         this.currentControl = currentControl;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Mon Feb  1 17:07:13 2010
@@ -79,8 +79,7 @@
 import org.apache.directory.shared.ldap.codec.bind.SimpleAuthentication;
 import org.apache.directory.shared.ldap.codec.compare.CompareRequestCodec;
 import org.apache.directory.shared.ldap.codec.compare.CompareResponseCodec;
-import org.apache.directory.shared.ldap.codec.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.codec.del.DelRequestCodec;
 import org.apache.directory.shared.ldap.codec.del.DelResponseCodec;
 import org.apache.directory.shared.ldap.codec.extended.ExtendedRequestCodec;
@@ -106,6 +105,7 @@
 import org.apache.directory.shared.ldap.message.ModifyResponseImpl;
 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.name.LdapDN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -3517,7 +3517,7 @@
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // Get the current control
-                    CodecControl control = null;
+                    Control control = null;
 
                     // Store the type
                     // We have to handle the special case of a 0 length OID
@@ -3547,7 +3547,7 @@
                     if ( control == null )
                     {
                         // This control is unknown, we will create a neutral control
-                        control = new CodecControlImpl( oidValue );
+                        control = new ControlImpl( oidValue );
                     }
                     
                     // The control may be null, if not known
@@ -3584,7 +3584,7 @@
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // Get the current control
-                    CodecControl control = message.getCurrentControl();
+                    Control control = message.getCurrentControl();
 
                     // Store the criticality
                     // We get the value. If it's a 0, it's a FALSE. If it's

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java Mon Feb  1 17:07:13 2010
@@ -38,7 +38,6 @@
 import org.apache.directory.shared.ldap.codec.bind.SimpleAuthentication;
 import org.apache.directory.shared.ldap.codec.compare.CompareRequestCodec;
 import org.apache.directory.shared.ldap.codec.compare.CompareResponseCodec;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
 import org.apache.directory.shared.ldap.codec.del.DelRequestCodec;
 import org.apache.directory.shared.ldap.codec.del.DelResponseCodec;
 import org.apache.directory.shared.ldap.codec.extended.ExtendedRequestCodec;
@@ -1323,7 +1322,7 @@
             return;
         }
         
-        for ( final CodecControl codecControl:codecMessage.getControls() )
+        for ( final Control codecControl:codecMessage.getControls() )
         {
             internalMessage.add( codecControl );
         }
@@ -1344,7 +1343,7 @@
         
         for ( Control control:internalMessage.getControls().values() )
         {
-            codecMessage.addControl( (CodecControl)control );
+            codecMessage.addControl( control );
         }
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java Mon Feb  1 17:07:13 2010
@@ -29,6 +29,7 @@
 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.ControlDecoder;
+import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,10 +59,10 @@
         LdapMessageCodec message = ldapMessageContainer.getLdapMessage();
 
         // Get the current control
-        CodecControl control = message.getCurrentControl();
+        Control control = message.getCurrentControl();
         Value value = tlv.getValue();
 
-        ControlDecoder decoder = control.getDecoder();
+        ControlDecoder decoder = ((CodecControl)control).getDecoder();
 
         // Store the value - have to handle the special case of a 0 length value
         if ( tlv.getLength() == 0 )

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControl.java (from r905297, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControlCodec.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControl.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControl.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControlCodec.java&r1=905297&r2=905338&rev=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControlCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControl.java Mon Feb  1 17:07:13 2010
@@ -28,6 +28,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.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -37,7 +38,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$, 
  */
-public abstract class AbstractControlCodec extends AbstractAsn1Object implements CodecControl
+public abstract class AbstractControl extends AbstractAsn1Object implements Control, CodecControl
 {
     // ~ Instance fields
     // ----------------------------------------------------------------------------
@@ -64,7 +65,7 @@
     /**
      * Default constructor.
      */
-    public AbstractControlCodec( String oid )
+    public AbstractControl( String oid )
     {
         this.oid = oid;
     }

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControl.java (from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlCodec.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControl.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControl.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlCodec.java&r1=905323&r2=905338&rev=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControl.java Mon Feb  1 17:07:13 2010
@@ -27,7 +27,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class CascadeControlCodec  extends AbstractControlCodec
+public class CascadeControl  extends AbstractControl
 {
     /** The cascade control OID */
     public static final String CONTROL_OID = "1.3.6.1.4.1.18060.0.0.1";
@@ -36,7 +36,7 @@
      * Default constructor
      *
      */
-    public CascadeControlCodec()
+    public CascadeControl()
     {
         super( CONTROL_OID );
         

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlDecoder.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlDecoder.java Mon Feb  1 17:07:13 2010
@@ -22,6 +22,7 @@
 
 import org.apache.directory.shared.asn1.Asn1Object;
 import org.apache.directory.shared.asn1.codec.DecoderException;
+import org.apache.directory.shared.ldap.message.control.Control;
 
 
 /**
@@ -32,8 +33,8 @@
  */
 public class CascadeControlDecoder implements ControlDecoder
 {
-    public Asn1Object decode( byte[] controlBytes, CodecControl control ) throws DecoderException
+    public Asn1Object decode( byte[] controlBytes, Control control ) throws DecoderException
     {
-        return new CascadeControlCodec();
+        return new CascadeControl();
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CodecControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CodecControl.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CodecControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CodecControl.java Mon Feb  1 17:07:13 2010
@@ -22,7 +22,6 @@
 import java.nio.ByteBuffer;
 
 import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.message.control.Control;
 
 /**
  * Define the transform method to be implemented by all the codec Controls
@@ -30,7 +29,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public interface CodecControl extends Control
+public interface CodecControl
 {
     /**
      * Generate the PDU which contains the Control.

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecoder.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecoder.java Mon Feb  1 17:07:13 2010
@@ -22,6 +22,7 @@
 
 import org.apache.directory.shared.asn1.Asn1Object;
 import org.apache.directory.shared.asn1.codec.DecoderException;
+import org.apache.directory.shared.ldap.message.control.Control;
 
 
 /**
@@ -40,5 +41,5 @@
      * @return the decoded Asn1Object for the control
      * @throws DecoderException if anything goes wrong
      */
-    Asn1Object decode( byte[] controlBytes, CodecControl control ) throws DecoderException;
+    Asn1Object decode( byte[] controlBytes, Control control ) throws DecoderException;
 }

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlImpl.java (from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CodecControlImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlImpl.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlImpl.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CodecControlImpl.java&r1=905323&r2=905338&rev=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CodecControlImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlImpl.java Mon Feb  1 17:07:13 2010
@@ -33,12 +33,12 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 764131 $, $Date: 2009-04-11 03:03:00 +0200 (Sat, 11 Apr 2009) $, 
  */
-public class CodecControlImpl extends AbstractControlCodec 
+public class ControlImpl extends AbstractControl 
 {
     /**
      * Default constructor.
      */
-    public CodecControlImpl( String oid )
+    public ControlImpl( String oid )
     {
         super( oid );
         

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControl.java (from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlCodec.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControl.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControl.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlCodec.java&r1=905323&r2=905338&rev=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControl.java Mon Feb  1 17:07:13 2010
@@ -60,7 +60,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ManageDsaITControlCodec  extends AbstractControlCodec
+public class ManageDsaITControl  extends AbstractControl
 {
     /** This control OID */
     public static final String CONTROL_OID = "2.16.840.1.113730.3.4.2";
@@ -69,7 +69,7 @@
      * Default constructor
      *
      */
-    public ManageDsaITControlCodec()
+    public ManageDsaITControl()
     {
         super( CONTROL_OID );
         

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlDecoder.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlDecoder.java Mon Feb  1 17:07:13 2010
@@ -22,6 +22,7 @@
 
 import org.apache.directory.shared.asn1.Asn1Object;
 import org.apache.directory.shared.asn1.codec.DecoderException;
+import org.apache.directory.shared.ldap.message.control.Control;
 
 
 /**
@@ -32,8 +33,8 @@
  */
 public class ManageDsaITControlDecoder implements ControlDecoder
 {
-    public Asn1Object decode( byte[] controlBytes, CodecControl control ) throws DecoderException
+    public Asn1Object decode( byte[] controlBytes, Control control ) throws DecoderException
     {
-        return new ManageDsaITControlCodec();
+        return new ManageDsaITControl();
     }
 }

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControl.java (from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlCodec.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControl.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControl.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlCodec.java&r1=905323&r2=905338&rev=905338&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControl.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.util.StringTools;
 
 
@@ -37,7 +37,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class SyncDoneValueControlCodec extends AbstractControlCodec
+public class SyncDoneValueControl extends AbstractControl
 {
     /** This control OID */
     public static final String CONTROL_OID = "1.3.6.1.4.1.4203.1.9.1.3";
@@ -54,7 +54,7 @@
     /**
      * Creates a new instance of SyncDoneValueControlCodec.
      */
-    public SyncDoneValueControlCodec()
+    public SyncDoneValueControl()
     {
         super( CONTROL_OID );
 



Mime
View raw message