You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/05/19 12:29:08 UTC

svn commit: r1124671 [4/5] - in /directory/shared/trunk: ./ all/ dsml/parser/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ dsml/parser/src/main/java/org/apache/direc...

Propchange: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchResponse/searchResultDone:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchResponse/searchResultEntry:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchResponse/searchResultReference:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:965208-965686

Propchange: directory/shared/trunk/i18n/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,5 +2,6 @@
 /directory/shared/branches/shared-codec-merge/i18n:982370-987558
 /directory/shared/branches/shared-config/i18n:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/i18n:980352-980933
+/directory/shared/branches/shared-osgi/i18n:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/i18n:980350-980351
 /directory/shared/trunk/i18n:1066124-1067995,1068025-1072732,1072797-1075328

Modified: directory/shared/trunk/integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/pom.xml?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/integ/pom.xml (original)
+++ directory/shared/trunk/integ/pom.xml Thu May 19 10:28:59 2011
@@ -111,31 +111,6 @@
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <groupId>org.apache.maven.plugins</groupId>
-        <configuration>
-          <systemPropertyVariables>
-            <workingDirectory>${basedir}/target</workingDirectory>
-            <felix.cache.rootdir>
-              ${project.build.directory}
-            </felix.cache.rootdir>
-            <felix.cache.locking>
-              true
-            </felix.cache.locking>
-            <org.osgi.framework.storage.clean>
-              onFirstInit
-            </org.osgi.framework.storage.clean>
-            <org.osgi.framework.storage>
-              osgi-cache
-            </org.osgi.framework.storage>
-            <codec.plugin.directory>
-              ${codec.plugin.directory}
-            </codec.plugin.directory>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-      
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
@@ -158,7 +133,6 @@
           </execution>
         </executions>
       </plugin>
-      
     </plugins>
   </build>
 </project>

Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java Thu May 19 10:28:59 2011
@@ -23,12 +23,13 @@ package org.apache.directory.shared.ldap
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService;
+import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapApiService;
 import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy;
 import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequest;
 import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequestImpl;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.util.Strings;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 
@@ -38,14 +39,46 @@ import org.junit.Test;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 public class StandaloneLdapCodecServiceTest
-{   
+{
+    @BeforeClass
+    public static void setupLdapApiService() throws Exception
+    {
+        // Load the extension points
+        System.setProperty( StandaloneLdapApiService.DEFAULT_CONTROLS_LIST, 
+            "org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory," +
+            "org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITFactory," +
+            "org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeFactory," +
+            "org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsFactory," +
+            "org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory," +
+            "org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory" );
+
+        System.setProperty( StandaloneLdapApiService.EXTRA_CONTROLS_LIST, 
+            "org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyFactory," +
+            "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory," +
+            "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory," +
+            "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncModifyDnFactory," +
+            "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory," +
+            "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" );
+        
+        System.setProperty( StandaloneLdapApiService.DEFAULT_EXTENDED_OPERATION_REQUESTS_LIST, 
+            "org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelFactory," +
+            "org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory," +
+            "org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory," +
+            "org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory" );
+
+        System.setProperty( StandaloneLdapApiService.DEFAULT_EXTENDED_OPERATION_RESPONSES_LIST, 
+            "org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory" );
+        
+        System.setProperty( StandaloneLdapApiService.EXTRA_EXTENDED_OPERATION_LIST, "" ); 
+    }
+
     /**
      * Test method for {@link org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService#StandaloneLdapCodecService()}.
      */
     @Test
-    public void testLoadingExtras()
+    public void testLoadingExtras() throws Exception
     {
-        StandaloneLdapCodecService codec = new StandaloneLdapCodecService();
+        LdapApiService codec = LdapApiServiceFactory.getSingleton();
         
         assertTrue( codec.isControlRegistered( PasswordPolicy.OID ) );
 
@@ -59,9 +92,9 @@ public class StandaloneLdapCodecServiceT
      * Test an extended operation.
      */
     @Test
-    public void testLoadingExtendedOperation()
+    public void testLoadingExtendedOperation() throws Exception
     {
-        StandaloneLdapCodecService codec = new StandaloneLdapCodecService();
+        LdapApiService codec = LdapApiServiceFactory.getSingleton();
         StoredProcedureRequest req = new StoredProcedureRequestImpl();
         req.setLanguage( "Java" );
         req.setProcedure( Strings.getBytesUtf8( "bogusProc" ) );

Propchange: directory/shared/trunk/ldap/client/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -3,6 +3,7 @@
 /directory/shared/branches/shared-codec-merge/all:982370-987558
 /directory/shared/branches/shared-config/all:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/all:980352-980933
+/directory/shared/branches/shared-osgi/ldap/client/all:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/all:980350-980351
 /directory/shared/trunk/all:1066124-1067995,1068025-1072732,1072797-1074636
 /directory/shared/trunk/ldap-client-all:1074637-1075328

Propchange: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,4 +2,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/jaas/Krb5LoginConfiguration.java:980138-980936
 /directory/shared/branches/milestones/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-config/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1023444-1029061
+/directory/shared/branches/shared-osgi/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1103720-1124653
 /directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1066124-1067995,1068025-1072732,1072797-1075328

Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java Thu May 19 10:28:59 2011
@@ -24,7 +24,7 @@ import java.io.IOException;
 import java.util.List;
 
 import org.apache.directory.shared.asn1.util.Oid;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.cursor.EntryCursor;
 import org.apache.directory.shared.ldap.model.cursor.SearchCursor;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -773,7 +773,7 @@ public interface LdapConnection
      * 
      * @return The LDAP CODEC service.
      */
-    LdapCodecService getCodecService();
+    LdapApiService getCodecService();
     
     
     /**

Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Thu May 19 10:28:59 2011
@@ -62,8 +62,8 @@ import org.apache.directory.ldap.client.
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.ldap.codec.api.BinaryAttributeDetector;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
 import org.apache.directory.shared.ldap.codec.api.MessageEncoderException;
@@ -221,7 +221,7 @@ public class LdapNetworkConnection exten
     private SchemaManager schemaManager;
 
     /** the ldap codec service */
-    LdapCodecService codec = LdapCodecServiceFactory.getSingleton();
+    LdapApiService codec = LdapApiServiceFactory.getSingleton();
 
     /** The Ldap codec protocol filter */
     private IoFilter ldapProtocolFilter = new ProtocolCodecFilter( codec.getProtocolCodecFactory() );
@@ -3089,7 +3089,7 @@ public class LdapNetworkConnection exten
     public ExtendedResponse extended( Oid oid, byte[] value ) throws LdapException
     {
         ExtendedRequest<?> extendedRequest =
-            LdapCodecServiceFactory.getSingleton().newExtendedRequest( oid.toString(), value );
+            LdapApiServiceFactory.getSingleton().newExtendedRequest( oid.toString(), value );
         return extended( extendedRequest );
     }
 
@@ -3485,7 +3485,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public LdapCodecService getCodecService()
+    public LdapApiService getCodecService()
     {
         return codec;
     }

Propchange: directory/shared/trunk/ldap/codec/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/ldap:982370-987558
 /directory/shared/branches/shared-config/ldap:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
+/directory/shared/branches/shared-osgi/ldap/codec/core:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
 /directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1072732,1072797-1075328

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/BasicControlDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/BasicControlDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/BasicControlDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/BasicControlDecorator.java Thu May 19 10:28:59 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
 import org.apache.directory.shared.ldap.codec.api.ControlFactory;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.controls.AbstractControl;
 
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
  * A decorator for handling opaque Control objects where we know nothing about 
  * their encoded value. These Controls are generated by default when an 
  * {@link ControlFactory} for them has not been registered with the 
- * {@link LdapCodecService}.
+ * {@link LdapApiService}.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -51,7 +51,7 @@ public class BasicControlDecorator<E> ex
      * @param codec The LDAP codec service.
      * @param control The {@link AbstractControl} to decorate.
      */
-    public BasicControlDecorator( LdapCodecService codec, Control control )
+    public BasicControlDecorator( LdapApiService codec, Control control )
     {
         super( codec, control );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java Thu May 19 10:28:59 2011
@@ -26,7 +26,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.ExtendedRequestDecorator;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
 import org.apache.directory.shared.util.Strings;
@@ -99,9 +99,9 @@ public class StoreExtendedRequestName ex
                     throw new DecoderException( msg );
                 }
 
-                req = LdapCodecServiceFactory.getSingleton().newExtendedRequest( requestName, null );
+                req = LdapApiServiceFactory.getSingleton().newExtendedRequest( requestName, null );
                 req.setMessageId( container.getMessageId() );
-                container.setMessage( LdapCodecServiceFactory.getSingleton().decorate( req ) );
+                container.setMessage( LdapApiServiceFactory.getSingleton().decorate( req ) );
             }
             catch ( DecoderException de )
             {

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ControlDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ControlDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ControlDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ControlDecorator.java Thu May 19 10:28:59 2011
@@ -44,7 +44,7 @@ public abstract class ControlDecorator<E
     protected byte[] value;
     
     /** The codec service responsible for encoding decoding this object */
-    private LdapCodecService codec;
+    private LdapApiService codec;
 
     
     /**
@@ -52,7 +52,7 @@ public abstract class ControlDecorator<E
      *
      * @param decoratedControl The Control to decorate.
      */
-    public ControlDecorator( LdapCodecService codec, E decoratedControl )
+    public ControlDecorator( LdapApiService codec, E decoratedControl )
     {
         this.decorated = decoratedControl;
         this.codec = codec;
@@ -80,7 +80,7 @@ public abstract class ControlDecorator<E
     /**
      * {@inheritDoc}
      */
-    public LdapCodecService getCodecService()
+    public LdapApiService getCodecService()
     {
         return codec;
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/Decorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/Decorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/Decorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/Decorator.java Thu May 19 10:28:59 2011
@@ -65,5 +65,5 @@ public interface Decorator<E>
      * 
      * @return the codec service
      */
-    LdapCodecService getCodecService();
+    LdapApiService getCodecService();
 }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedRequestDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedRequestDecorator.java Thu May 19 10:28:59 2011
@@ -54,7 +54,7 @@ public class ExtendedRequestDecorator<Q 
      *
      * @param decoratedMessage the decorated ExtendedRequest
      */
-    public ExtendedRequestDecorator( LdapCodecService codec, Q decoratedMessage )
+    public ExtendedRequestDecorator( LdapApiService codec, Q decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedResponseDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedResponseDecorator.java Thu May 19 10:28:59 2011
@@ -56,7 +56,7 @@ public class ExtendedResponseDecorator<R
      *
      * @param decoratedMessage the decorated ExtendedResponse
      */
-    public ExtendedResponseDecorator( LdapCodecService codec, R decoratedMessage )
+    public ExtendedResponseDecorator( LdapApiService codec, R decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapEncoder.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapEncoder.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapEncoder.java Thu May 19 10:28:59 2011
@@ -44,7 +44,7 @@ import org.apache.directory.shared.util.
 public class LdapEncoder
 {
     /** The LdapCodecService */
-    private LdapCodecService codec;
+    private LdapApiService codec;
     
     
     /**
@@ -53,7 +53,7 @@ public class LdapEncoder
      * @param codec The Codec service to use to handle Controls and extended operations,
      * plus to get access to the underlying services.
      */
-    public LdapEncoder( LdapCodecService codec )
+    public LdapEncoder( LdapApiService codec )
     {
         if ( codec == null )
         {

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapMessageContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapMessageContainer.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapMessageContainer.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapMessageContainer.java Thu May 19 10:28:59 2011
@@ -50,14 +50,14 @@ public class LdapMessageContainer<E exte
     private ControlDecorator<? extends Control> currentControl;
 
     /** The codec service */
-    private final LdapCodecService codec;
+    private final LdapApiService codec;
 
 
     /**
      * Creates a new LdapMessageContainer object. We will store ten grammars,
      * it's enough ...
      */
-    public LdapMessageContainer( LdapCodecService codec )
+    public LdapMessageContainer( LdapApiService codec )
     {
         this( codec, new BinaryAttributeDetector()
         {
@@ -75,7 +75,7 @@ public class LdapMessageContainer<E exte
      *
      * @param binaryAttributeDetector checks if an attribute is binary
      */
-    public LdapMessageContainer( LdapCodecService codec, BinaryAttributeDetector binaryAttributeDetector )
+    public LdapMessageContainer( LdapApiService codec, BinaryAttributeDetector binaryAttributeDetector )
     {
         super();
         this.codec = codec;
@@ -87,11 +87,11 @@ public class LdapMessageContainer<E exte
 
 
     /**
-     * Gets the {@link LdapCodecService} associated with this {@link Asn1Container}.
+     * Gets the {@link LdapApiService} associated with this {@link Asn1Container}.
      *
      * @return
      */
-    public LdapCodecService getLdapCodecService()
+    public LdapApiService getLdapCodecService()
     {
         return codec;
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/MessageDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/MessageDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/MessageDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/MessageDecorator.java Thu May 19 10:28:59 2011
@@ -93,10 +93,10 @@ public abstract class MessageDecorator<E
     private int controlsLength;
     
     /** The LdapCodecService */
-    private final LdapCodecService codec;
+    private final LdapApiService codec;
 
     
-    public static MessageDecorator<? extends Message> getDecorator( LdapCodecService codec, Message decoratedMessage )
+    public static MessageDecorator<? extends Message> getDecorator( LdapApiService codec, Message decoratedMessage )
     {
         if ( decoratedMessage instanceof MessageDecorator )
         {
@@ -212,7 +212,7 @@ public abstract class MessageDecorator<E
     /**
      * Makes a Message an Decorator object.
      */
-    protected MessageDecorator( LdapCodecService codec, E decoratedMessage )
+    protected MessageDecorator( LdapApiService codec, E decoratedMessage )
     {
         this.codec = codec;
         this.decoratedMessage = decoratedMessage;
@@ -413,7 +413,7 @@ public abstract class MessageDecorator<E
     /**
      * {@inheritDoc}
      */
-    public LdapCodecService getCodecService()
+    public LdapApiService getCodecService()
     {
         return codec;
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeDecorator.java Thu May 19 10:28:59 2011
@@ -26,7 +26,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.ldap.codec.api.CodecControl;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
 import org.apache.directory.shared.ldap.model.message.controls.Cascade;
 
@@ -41,7 +41,7 @@ public class CascadeDecorator extends Co
     /**
      * Default constructor
      */
-    public CascadeDecorator( LdapCodecService codec, Cascade control )
+    public CascadeDecorator( LdapApiService codec, Cascade control )
     {
         super( codec, control );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeFactory.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeFactory.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.codec.api.ControlFactory;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.controls.Cascade;
 import org.apache.directory.shared.ldap.model.message.controls.CascadeImpl;
 
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
 public class CascadeFactory implements ControlFactory<Cascade, CascadeDecorator>
 {
     /** The LDAP codec responsible for encoding and decoding Cascade Controls */
-    private LdapCodecService codec;
+    private LdapApiService codec;
     
     
     /**
@@ -43,7 +43,7 @@ public class CascadeFactory implements C
      *
      * @param codec The LDAP codec
      */
-    public CascadeFactory( LdapCodecService codec )
+    public CascadeFactory( LdapApiService codec )
     {
         this.codec = codec;
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITDecorator.java Thu May 19 10:28:59 2011
@@ -26,7 +26,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT;
 
 
@@ -42,7 +42,7 @@ public class ManageDsaITDecorator extend
     /**
      * Default constructor
      */
-    public ManageDsaITDecorator( LdapCodecService codec, ManageDsaIT control )
+    public ManageDsaITDecorator( LdapApiService codec, ManageDsaIT control )
     {
         super( codec, control );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITFactory.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITFactory.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.codec.api.ControlFactory;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT;
 import org.apache.directory.shared.ldap.model.message.controls.ManageDsaITImpl;
 
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
 public class ManageDsaITFactory implements ControlFactory<ManageDsaIT, ManageDsaITDecorator>
 {
     /** The LDAP codec responsible for encoding and decoding Cascade Controls */
-    private LdapCodecService codec;
+    private LdapApiService codec;
     
     
     /**
@@ -43,7 +43,7 @@ public class ManageDsaITFactory implemen
      *
      * @param codec The LDAP codec
      */
-    public ManageDsaITFactory( LdapCodecService codec )
+    public ManageDsaITFactory( LdapApiService codec )
     {
         this.codec = codec;
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeContainer.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeContainer.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeContainer.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.asn1.ber.AbstractContainer;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.controls.EntryChange;
 
 
@@ -34,14 +34,14 @@ public class EntryChangeContainer extend
     private EntryChangeDecorator control;
     
     /** The codec that encodes and decodes */
-    private LdapCodecService codec;
+    private LdapApiService codec;
 
 
     /**
      * Creates a new EntryChangeContainer object. We will store one
      * grammar, it's enough ...
      */
-    public EntryChangeContainer( LdapCodecService codec )
+    public EntryChangeContainer( LdapApiService codec )
     {
         super();
         this.codec = codec;
@@ -58,7 +58,7 @@ public class EntryChangeContainer extend
      * @param control The EntryChange ControlDecorator, or a Control to be
      * wrapped by a new decorator.
      */
-    public EntryChangeContainer( LdapCodecService codec, EntryChange control )
+    public EntryChangeContainer( LdapApiService codec, EntryChange control )
     {
         this( codec );
         decorate( control );

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java Thu May 19 10:28:59 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.controls.ChangeType;
 import org.apache.directory.shared.ldap.model.message.controls.EntryChange;
 import org.apache.directory.shared.ldap.model.message.controls.EntryChangeImpl;
@@ -65,7 +65,7 @@ public class EntryChangeDecorator extend
      * Creates a new instance of EntryChangeDecoder wrapping a newly created
      * EntryChange Control object.
      */
-    public EntryChangeDecorator( LdapCodecService codec )
+    public EntryChangeDecorator( LdapApiService codec )
     {
         super( codec, new EntryChangeImpl() );
     }
@@ -77,7 +77,7 @@ public class EntryChangeDecorator extend
      *
      * @param control The EntryChange Control to be decorated.
      */
-    public EntryChangeDecorator( LdapCodecService codec, EntryChange control )
+    public EntryChangeDecorator( LdapApiService codec, EntryChange control )
     {
         super( codec, control );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeFactory.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeFactory.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.codec.api.ControlFactory;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.controls.EntryChange;
 
 
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
 public class EntryChangeFactory implements ControlFactory<EntryChange, EntryChangeDecorator>
 {
     /** The LDAP codec service */
-    private LdapCodecService codec;
+    private LdapApiService codec;
 
     
     /**
@@ -42,7 +42,7 @@ public class EntryChangeFactory implemen
      *
      * @param codec The LDAP codec.
      */
-    public EntryChangeFactory( LdapCodecService codec )
+    public EntryChangeFactory( LdapApiService codec )
     {
         this.codec = codec;
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsContainer.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsContainer.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsContainer.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.asn1.ber.AbstractContainer;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.controls.PagedResults;
 
 
@@ -35,7 +35,7 @@ public class PagedResultsContainer exten
     /** PagedSearchControl */
     private PagedResultsDecorator control;
     
-    private LdapCodecService codec;
+    private LdapApiService codec;
 
 
     /**
@@ -43,7 +43,7 @@ public class PagedResultsContainer exten
      * it's enough ...
      * @param codec The encoder decoder for this container
      */
-    public PagedResultsContainer( LdapCodecService codec )
+    public PagedResultsContainer( LdapApiService codec )
     {
         super();
         this.codec = codec;
@@ -61,7 +61,7 @@ public class PagedResultsContainer exten
      * @param codec The encoder decoder for this container
      * @param control A PagedResults Control to optionally be wrapped.
      */
-    public PagedResultsContainer( LdapCodecService codec, PagedResults control )
+    public PagedResultsContainer( LdapApiService codec, PagedResults control )
     {
         this( codec );
         decorate( control );

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java Thu May 19 10:28:59 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.controls.PagedResults;
 import org.apache.directory.shared.ldap.model.message.controls.PagedResultsImpl;
 import org.apache.directory.shared.util.Strings;
@@ -56,7 +56,7 @@ public class PagedResultsDecorator exten
      * Creates a new instance of PagedResultsDecorator with a newly created decorated
      * PagedResults Control.
      */
-    public PagedResultsDecorator( LdapCodecService codec )
+    public PagedResultsDecorator( LdapApiService codec )
     {
         this( codec, new PagedResultsImpl() );
     }
@@ -68,7 +68,7 @@ public class PagedResultsDecorator exten
      *
      * @param  pagedResults The PagedResults Control to be decorated.
      */
-    public PagedResultsDecorator( LdapCodecService codec, PagedResults pagedResults )
+    public PagedResultsDecorator( LdapApiService codec, PagedResults pagedResults )
     {
         super( codec, pagedResults );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsFactory.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsFactory.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.codec.api.ControlFactory;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.controls.PagedResults;
 
 
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
 public class PagedResultsFactory implements ControlFactory<PagedResults, PagedResultsDecorator>
 {
     /** The LDAP codec service */
-    private LdapCodecService codec;
+    private LdapApiService codec;
 
     
     /**
@@ -42,7 +42,7 @@ public class PagedResultsFactory impleme
      *
      * @param codec The LDAP codec.
      */
-    public PagedResultsFactory( LdapCodecService codec )
+    public PagedResultsFactory( LdapApiService codec )
     {
         this.codec = codec;
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchContainer.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchContainer.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchContainer.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.asn1.ber.AbstractContainer;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch;
 
 
@@ -33,14 +33,14 @@ public class PersistentSearchContainer e
     /** PSearchControl */
     private PersistentSearchDecorator decorator;
     
-    private LdapCodecService codec;
+    private LdapApiService codec;
 
 
     /**
      * Creates a new PSearchControlContainer object. We will store one grammar,
      * it's enough ...
      */
-    public PersistentSearchContainer( LdapCodecService codec )
+    public PersistentSearchContainer( LdapApiService codec )
     {
         super();
         this.codec = codec;
@@ -57,7 +57,7 @@ public class PersistentSearchContainer e
      *
      * @param control The PersistentSearch Control or a decorating wrapper.
      */
-    public PersistentSearchContainer( LdapCodecService codec, PersistentSearch control )
+    public PersistentSearchContainer( LdapApiService codec, PersistentSearch control )
     {
         this( codec );
         decorate( control );

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java Thu May 19 10:28:59 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
 import org.apache.directory.shared.ldap.model.message.controls.ChangeType;
 import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch;
@@ -55,7 +55,7 @@ public class PersistentSearchDecorator e
      * Default constructor creates a PersistentSearch Control automatically
      * wrapped in a decorator object inside this container.
      */
-    public PersistentSearchDecorator( LdapCodecService codec )
+    public PersistentSearchDecorator( LdapApiService codec )
     {
         this( codec, new PersistentSearchImpl() );
     }
@@ -67,7 +67,7 @@ public class PersistentSearchDecorator e
      *
      * @param control The PersistentSearch Control to wrap.
      */
-    public PersistentSearchDecorator( LdapCodecService codec, PersistentSearch control )
+    public PersistentSearchDecorator( LdapApiService codec, PersistentSearch control )
     {
         super( codec, control );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.codec.api.ControlFactory;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch;
 
 
@@ -33,10 +33,10 @@ import org.apache.directory.shared.ldap.
  */
 public class PersistentSearchFactory implements ControlFactory<PersistentSearch, PersistentSearchDecorator>
 {
-    private LdapCodecService codec;
+    private LdapApiService codec;
     
     
-    public PersistentSearchFactory( LdapCodecService codec )
+    public PersistentSearchFactory( LdapApiService codec )
     {
         this.codec = codec;
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java Thu May 19 10:28:59 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.controls.Subentries;
 import org.apache.directory.shared.ldap.model.message.controls.SubentriesImpl;
 
@@ -49,7 +49,7 @@ public class SubentriesDecorator extends
     /**
      * Default constructor
      */
-    public SubentriesDecorator( LdapCodecService codec )
+    public SubentriesDecorator( LdapApiService codec )
     {
         this( codec, new SubentriesImpl() );
     }
@@ -61,7 +61,7 @@ public class SubentriesDecorator extends
      *
      * @param control The Subentries Control to wrap with this decorator.
      */
-    public SubentriesDecorator( LdapCodecService codec, Subentries control )
+    public SubentriesDecorator( LdapApiService codec, Subentries control )
     {
         super( codec, control );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.codec.api.ControlFactory;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.controls.Subentries;
 
 
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
 public class SubentriesFactory implements ControlFactory<Subentries, SubentriesDecorator>
 {
     /** The LDAP codec service */
-    private LdapCodecService codec;
+    private LdapApiService codec;
     
     
     /**
@@ -43,7 +43,7 @@ public class SubentriesFactory implement
      *
      * @param codec
      */
-    public SubentriesFactory( LdapCodecService codec )
+    public SubentriesFactory( LdapApiService codec )
     {
         this.codec = codec;
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java Thu May 19 10:28:59 2011
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.message.AbandonRequest;
 
@@ -44,7 +44,7 @@ public final class AbandonRequestDecorat
      *
      * @param decoratedMessage the decorated AddRequest
      */
-    public AbandonRequestDecorator( LdapCodecService codec, AbandonRequest decoratedMessage )
+    public AbandonRequestDecorator( LdapApiService codec, AbandonRequest decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableRequestDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableRequestDecorator.java Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.codec.decorators;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.AbandonListener;
 import org.apache.directory.shared.ldap.model.message.AbandonableRequest;
 import org.apache.directory.shared.ldap.model.message.ResultResponse;
@@ -40,7 +40,7 @@ public abstract class AbandonableRequest
      *
      * @param decoratedMessage the decorated message
      */
-    public AbandonableRequestDecorator( LdapCodecService codec, M decoratedMessage )
+    public AbandonableRequestDecorator( LdapApiService codec, M decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.codec.decorators;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.ResultResponse;
 import org.apache.directory.shared.ldap.model.message.ResultResponseRequest;
 
@@ -38,7 +38,7 @@ public abstract class AbandonableResultR
      *
      * @param decoratedMessage the decorated message
      */
-    public AbandonableResultResponseRequestDecorator( LdapCodecService codec, M decoratedMessage )
+    public AbandonableResultResponseRequestDecorator( LdapApiService codec, M decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java Thu May 19 10:28:59 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -69,7 +69,7 @@ public final class AddRequestDecorator e
      *
      * @param decoratedMessage the decorated AddRequest
      */
-    public AddRequestDecorator( LdapCodecService codec, AddRequest decoratedMessage )
+    public AddRequestDecorator( LdapApiService codec, AddRequest decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddResponseDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddResponseDecorator.java Thu May 19 10:28:59 2011
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.message.AddResponse;
 
@@ -47,7 +47,7 @@ public class AddResponseDecorator extend
      *
      * @param decoratedMessage the decorated AddResponse
      */
-    public AddResponseDecorator( LdapCodecService codec, AddResponse decoratedMessage )
+    public AddResponseDecorator( LdapApiService codec, AddResponse decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java Thu May 19 10:28:59 2011
@@ -27,7 +27,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.message.BindRequest;
 import org.apache.directory.shared.ldap.model.message.BindResponse;
@@ -58,7 +58,7 @@ public class BindRequestDecorator extend
      *
      * @param decoratedMessage the decorated BindRequests.
      */
-    public BindRequestDecorator( LdapCodecService codec, BindRequest decoratedMessage )
+    public BindRequestDecorator( LdapApiService codec, BindRequest decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindResponseDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindResponseDecorator.java Thu May 19 10:28:59 2011
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.message.BindResponse;
 
@@ -47,7 +47,7 @@ public class BindResponseDecorator exten
      *
      * @param decoratedMessage the decorated BindResponse
      */
-    public BindResponseDecorator( LdapCodecService codec, BindResponse decoratedMessage )
+    public BindResponseDecorator( LdapApiService codec, BindResponse decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java Thu May 19 10:28:59 2011
@@ -27,7 +27,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.entry.BinaryValue;
 import org.apache.directory.shared.ldap.model.entry.Value;
@@ -63,7 +63,7 @@ public class CompareRequestDecorator ext
      *
      * @param decoratedMessage the decorated CompareRequest
      */
-    public CompareRequestDecorator( LdapCodecService codec, CompareRequest decoratedMessage )
+    public CompareRequestDecorator( LdapApiService codec, CompareRequest decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareResponseDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareResponseDecorator.java Thu May 19 10:28:59 2011
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.message.CompareResponse;
 
@@ -48,7 +48,7 @@ public class CompareResponseDecorator ex
      *
      * @param decoratedMessage the decorated CompareResponse
      */
-    public CompareResponseDecorator( LdapCodecService codec, CompareResponse decoratedMessage )
+    public CompareResponseDecorator( LdapApiService codec, CompareResponse decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteRequestDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteRequestDecorator.java Thu May 19 10:28:59 2011
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.message.DeleteRequest;
 import org.apache.directory.shared.ldap.model.message.DeleteResponse;
@@ -46,7 +46,7 @@ public class DeleteRequestDecorator exte
      *
      * @param decoratedMessage the decorated DeleteRequest
      */
-    public DeleteRequestDecorator( LdapCodecService codec, DeleteRequest decoratedMessage )
+    public DeleteRequestDecorator( LdapApiService codec, DeleteRequest decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteResponseDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteResponseDecorator.java Thu May 19 10:28:59 2011
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.message.DeleteResponse;
 
@@ -48,7 +48,7 @@ public class DeleteResponseDecorator ext
      *
      * @param decoratedMessage the decorated DeleteResponse
      */
-    public DeleteResponseDecorator( LdapCodecService codec, DeleteResponse decoratedMessage )
+    public DeleteResponseDecorator( LdapApiService codec, DeleteResponse decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/IntermediateResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/IntermediateResponseDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/IntermediateResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/IntermediateResponseDecorator.java Thu May 19 10:28:59 2011
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
 import org.apache.directory.shared.ldap.model.message.IntermediateResponse;
@@ -53,7 +53,7 @@ public class IntermediateResponseDecorat
      *
      * @param decoratedMessage the decorated IntermediateResponse
      */
-    public IntermediateResponseDecorator( LdapCodecService codec, IntermediateResponse decoratedMessage )
+    public IntermediateResponseDecorator( LdapApiService codec, IntermediateResponse decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java Thu May 19 10:28:59 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.Decorator;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapEncoder;
 import org.apache.directory.shared.ldap.model.message.LdapResult;
 import org.apache.directory.shared.ldap.model.message.Referral;
@@ -55,7 +55,7 @@ public class LdapResultDecorator impleme
     private byte[] matchedDnBytes;
     
     /** The codec responsible for encoding and decoding this object. */
-    private LdapCodecService codec;
+    private LdapApiService codec;
 
 
     /**
@@ -321,7 +321,7 @@ public class LdapResultDecorator impleme
     /**
      * {@inheritDoc}
      */
-    public LdapCodecService getCodecService()
+    public LdapApiService getCodecService()
     {
         return codec;
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java Thu May 19 10:28:59 2011
@@ -27,7 +27,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.message.ModifyDnRequest;
 import org.apache.directory.shared.ldap.model.message.ModifyDnResponse;
@@ -53,7 +53,7 @@ public class ModifyDnRequestDecorator ex
      *
      * @param decoratedMessage the decorated ModifyDnRequest
      */
-    public ModifyDnRequestDecorator( LdapCodecService codec, ModifyDnRequest decoratedMessage )
+    public ModifyDnRequestDecorator( LdapApiService codec, ModifyDnRequest decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnResponseDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnResponseDecorator.java Thu May 19 10:28:59 2011
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.message.ModifyDnResponse;
 
@@ -48,7 +48,7 @@ public class ModifyDnResponseDecorator e
      *
      * @param decoratedMessage the decorated ModifyDnResponse
      */
-    public ModifyDnResponseDecorator( LdapCodecService codec, ModifyDnResponse decoratedMessage )
+    public ModifyDnResponseDecorator( LdapApiService codec, ModifyDnResponse decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java Thu May 19 10:28:59 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultModification;
@@ -80,7 +80,7 @@ public class ModifyRequestDecorator exte
      *
      * @param decoratedMessage the decorated ModifyRequest
      */
-    public ModifyRequestDecorator( LdapCodecService codec, ModifyRequest decoratedMessage )
+    public ModifyRequestDecorator( LdapApiService codec, ModifyRequest decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyResponseDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyResponseDecorator.java Thu May 19 10:28:59 2011
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.message.ModifyResponse;
 
@@ -48,7 +48,7 @@ public class ModifyResponseDecorator ext
      *
      * @param decoratedMessage the decorated ModifyResponse
      */
-    public ModifyResponseDecorator( LdapCodecService codec, ModifyResponse decoratedMessage )
+    public ModifyResponseDecorator( LdapApiService codec, ModifyResponse decoratedMessage )
     {
         super( codec, decoratedMessage );
     }