directory-commits mailing list archives

Modified: directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java Tue May 17 15:12:35 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.codec.api.MessageDecorator;
 import org.apache.directory.shared.ldap.model.message.LdapResult;
 import org.apache.directory.shared.ldap.model.message.ResultResponse;
@@ -42,7 +42,7 @@ public abstract class ResponseDecorator<
      *
      * @param decoratedMessage the decorated AddRequest
      */
-    public ResponseDecorator( LdapCodecService codec, M decoratedMessage )
+    public ResponseDecorator( LdapApiService codec, M decoratedMessage )
     {
         super( codec, decoratedMessage );
         

Modified: directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java Tue May 17 15:12:35 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 ResultResponseRequ
      *
      * @param decoratedMessage the decorated message
      */
-    public ResultResponseRequestDecorator( LdapCodecService codec, M decoratedMessage )
+    public ResultResponseRequestDecorator( LdapApiService codec, M decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java Tue May 17 15:12:35 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.AttributeValueAssertion;
-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.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
@@ -104,7 +104,7 @@ public class SearchRequestDecorator exte
      *
      * @param decoratedMessage the decorated SearchRequest
      */
-    public SearchRequestDecorator( LdapCodecService codec, SearchRequest decoratedMessage )
+    public SearchRequestDecorator( LdapApiService codec, SearchRequest decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultDoneDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultDoneDecorator.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultDoneDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultDoneDecorator.java Tue May 17 15:12:35 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.SearchResultDone;
 
@@ -47,7 +47,7 @@ public class SearchResultDoneDecorator e
      *
      * @param decoratedMessage the decorated SearchResultDone
      */
-    public SearchResultDoneDecorator( LdapCodecService codec, SearchResultDone decoratedMessage )
+    public SearchResultDoneDecorator( LdapApiService codec, SearchResultDone decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java Tue May 17 15:12:35 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.asn1.util.Asn1StringUtils;
 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.entry.DefaultAttribute;
@@ -74,7 +74,7 @@ public class SearchResultEntryDecorator 
      *
      * @param decoratedMessage the decorated SearchResultEntry
      */
-    public SearchResultEntryDecorator( LdapCodecService codec, SearchResultEntry decoratedMessage )
+    public SearchResultEntryDecorator( LdapApiService codec, SearchResultEntry decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java Tue May 17 15:12:35 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.codec.api.LdapEncoder;
 import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
@@ -55,7 +55,7 @@ public class SearchResultReferenceDecora
      *
      * @param decoratedMessage the decorated SearchResultReference
      */
-    public SearchResultReferenceDecorator( LdapCodecService codec, SearchResultReference decoratedMessage )
+    public SearchResultReferenceDecorator( LdapApiService codec, SearchResultReference decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java Tue May 17 15:12:35 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.MessageTypeEnum;
@@ -41,7 +41,7 @@ public abstract class SingleReplyRequest
      *
      * @param decoratedMessage the decorated message
      */
-    public SingleReplyRequestDecorator( LdapCodecService codec, M decoratedMessage )
+    public SingleReplyRequestDecorator( LdapApiService codec, M decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/UnbindRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/UnbindRequestDecorator.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/UnbindRequestDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/UnbindRequestDecorator.java Tue May 17 15:12:35 2011
@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;
 
 import org.apache.directory.shared.asn1.EncoderException;
 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.UnbindRequest;
 
@@ -42,7 +42,7 @@ public class UnbindRequestDecorator exte
      *
      * @param decoratedMessage the decorated message
      */
-    public UnbindRequestDecorator( LdapCodecService codec, UnbindRequest decoratedMessage )
+    public UnbindRequestDecorator( LdapApiService codec, UnbindRequest decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Modified: directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java Tue May 17 15:12:35 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.codec.osgi;
 
 
-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.LdapCodecServiceFactory;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -53,7 +53,7 @@ public class DefaultActivator implements
      */
     public void start( BundleContext bundleContext ) throws Exception
     {
-        registration = bundleContext.registerService( LdapCodecService.class.getName(), codec, null );
+        registration = bundleContext.registerService( LdapApiService.class.getName(), codec, null );
         LdapCodecServiceFactory.initialize( codec );
     }
 

Modified: directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java Tue May 17 15:12:35 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.api.CodecControl;
 import org.apache.directory.shared.ldap.codec.api.ControlFactory;
 import org.apache.directory.shared.ldap.codec.api.ExtendedRequestFactory;
-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.MessageDecorator;
 import org.apache.directory.shared.ldap.codec.api.UnsolicitedResponseFactory;
 import org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory;
@@ -62,12 +62,12 @@ import javax.naming.NamingException;
 
 
 /**
- * The default {@link LdapCodecService} implementation.
+ * The default {@link LdapApiService} implementation.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class DefaultLdapCodecService implements LdapCodecService
+public class DefaultLdapCodecService implements LdapApiService
 {
     /** A logger */
     private static final Logger LOG = LoggerFactory.getLogger( DefaultLdapCodecService.class );

Modified: directory/shared/branches/shared-osgi/ldap/codec/standalone/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/standalone/pom.xml?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/standalone/pom.xml (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/standalone/pom.xml Tue May 17 15:12:35 2011
@@ -92,8 +92,15 @@
               org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,
               org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory
             </extra.controls>
-            <default.extendedOperations>
-            </default.extendedOperations>
+            <default.extendedOperation.requests>
+              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
+            </default.extendedOperation.requests>
+            <default.extendedOperation.responses>
+              org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory
+            </default.extendedOperation.responses>
           </systemPropertyVariables>
         </configuration>
       </plugin>

Copied: directory/shared/branches/shared-osgi/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/LdapApiActivator.java (from r1103786, directory/shared/branches/shared-osgi/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/CodecHostActivator.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/LdapApiActivator.java?p2=directory/shared/branches/shared-osgi/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/LdapApiActivator.java&p1=directory/shared/branches/shared-osgi/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/CodecHostActivator.java&r1=1103786&r2=1104318&rev=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/CodecHostActivator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/LdapApiActivator.java Tue May 17 15:12:35 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.codec.standalone;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -32,14 +32,14 @@ import org.osgi.framework.ServiceRegistr
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class CodecHostActivator implements BundleActivator
+public class LdapApiActivator implements BundleActivator
 {
     private StandaloneLdapApiService codec;
     private ServiceRegistration registration;
     private BundleContext bundleContext;
     
     
-    public CodecHostActivator( StandaloneLdapApiService codec )
+    public LdapApiActivator( StandaloneLdapApiService codec )
     {
         this.codec = codec;
     }
@@ -52,7 +52,7 @@ public class CodecHostActivator implemen
     {
         this.bundleContext = bundleContext;
         
-        registration = bundleContext.registerService( LdapCodecService.class.getName(), codec, null );
+        registration = bundleContext.registerService( LdapApiService.class.getName(), codec, null );
         
         /*
         if ( codec.getPluginDirectory() != null )

Modified: directory/shared/branches/shared-osgi/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java Tue May 17 15:12:35 2011
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.api.ExtendedRequestDecorator;
 import org.apache.directory.shared.ldap.codec.api.ExtendedRequestFactory;
 import org.apache.directory.shared.ldap.codec.api.ExtendedResponseDecorator;
-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.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
 import org.apache.directory.shared.ldap.codec.api.UnsolicitedResponseFactory;
@@ -60,12 +60,12 @@ import org.slf4j.LoggerFactory;
 
 
 /**
- * The default {@link org.apache.directory.shared.ldap.codec.api.LdapCodecService} implementation.
+ * The default {@link org.apache.directory.shared.ldap.codec.api.LdapApiService} implementation.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class StandaloneLdapApiService implements LdapCodecService
+public class StandaloneLdapApiService implements LdapApiService
 {
     /** A logger */
     private static final Logger LOG = LoggerFactory.getLogger( StandaloneLdapApiService.class );
@@ -83,7 +83,7 @@ public class StandaloneLdapApiService im
     private ProtocolCodecFactory protocolCodecFactory;
     
     /** The codec's {@link BundleActivator} */
-    private CodecHostActivator activator;
+    private LdapApiActivator activator;
     
     /** The list of default controls to load at startup */ 
     public static String DEFAULT_CONTROLS_LIST = "default.controls";
@@ -91,8 +91,11 @@ public class StandaloneLdapApiService im
     /** The list of extra controls to load at startup */ 
     public static String EXTRA_CONTROLS_LIST = "extra.controls";
 
-    /** The list of default controls to load at startup */ 
-    public static String DEFAULT_EXTENDED_OPERATION_LIST = "default.extendedOperations";
+    /** The list of default extended operation requests to load at startup */ 
+    public static String DEFAULT_EXTENDED_OPERATION_REQUESTS_LIST = "default.extendedOperation.requests";
+
+    /** The list of default extended operation responses to load at startup */ 
+    public static String DEFAULT_EXTENDED_OPERATION_RESPONSES_LIST = "default.extendedOperation.responses";
 
     /** The list of extra controls to load at startup */ 
     public static String EXTRA_EXTENDED_OPERATION_LIST = "extra.extendedOperations";
@@ -166,7 +169,7 @@ public class StandaloneLdapApiService im
         loadControls();
         
         // Load the extended operations
-        //loadExtendedOperations();
+        loadExtendedOperations();
         
         // Load the schema elements
         //loadSchemaElements();
@@ -179,6 +182,11 @@ public class StandaloneLdapApiService im
     }
     
     
+    /**
+     * Load the controls
+     * 
+     * @throws Exception
+     */
     private void loadControls() throws Exception
     {
         // first load the default controls
@@ -190,7 +198,7 @@ public class StandaloneLdapApiService im
     
     
     /**
-     * Loads the Controls implement out of the box in the codec.
+     * Loads the Controls implemented out of the box in the codec.
      */
     private void loadDefaultControls() throws Exception
     {
@@ -201,7 +209,7 @@ public class StandaloneLdapApiService im
         {
             System.out.println( control );
 
-            Class<?>[] types = new Class<?>[] { LdapCodecService.class };
+            Class<?>[] types = new Class<?>[] { LdapApiService.class };
             Class<? extends ControlFactory<?, ?>> clazz = ( Class<? extends ControlFactory<?, ?>> )Class.forName( control );
             Constructor<?> constructor = clazz.getConstructor(types);
             
@@ -229,7 +237,7 @@ public class StandaloneLdapApiService im
         {
             System.out.println( control );
 
-            Class<?>[] types = new Class<?>[] { LdapCodecService.class };
+            Class<?>[] types = new Class<?>[] { LdapApiService.class };
             Class<? extends ControlFactory<?, ?>> clazz = ( Class<? extends ControlFactory<?, ?>> )Class.forName( control );
             Constructor<?> constructor = clazz.getConstructor(types);
             
@@ -241,6 +249,84 @@ public class StandaloneLdapApiService im
     
 
     /**
+     * Load the extended operations
+     * 
+     * @throws Exception
+     */
+    private void loadExtendedOperations() throws Exception
+    {
+        loadDefaultExtendedOperationRequests();
+        loadDefaultExtendedOperationResponses();
+        loadExtraExtendedOperations();
+    }
+    
+    
+    /**
+     * Loads the default extended operation requests
+     */
+    private void loadDefaultExtendedOperationRequests() throws Exception
+    {
+        // Load from command line properties if it exists
+        String defaultExtendedOperationsList = System.getProperty( DEFAULT_EXTENDED_OPERATION_REQUESTS_LIST );
+        
+        if ( Strings.isEmpty( defaultExtendedOperationsList ) )
+        {
+            return;
+        }
+        
+        for ( String extendedOperation : defaultExtendedOperationsList.split( "," ) )
+        {
+            System.out.println( extendedOperation );
+
+            Class<?>[] types = new Class<?>[] { LdapApiService.class };
+            Class<? extends ExtendedRequestFactory<?,?>> clazz = ( Class<? extends ExtendedRequestFactory<?,?>> )Class.forName( extendedOperation );
+            Constructor<?> constructor = clazz.getConstructor(types);
+            
+            ExtendedRequestFactory<?,?> factory = (ExtendedRequestFactory<?,?>)constructor.newInstance( new Object[]{ this } );
+            extReqFactories.put( factory.getOid(), factory );
+            LOG.info( "Registered pre-bundled extended operation factory: {}", factory.getOid() );
+        }
+    }
+    
+    
+    /**
+     * Loads the default extended operation responses
+     */
+    private void loadDefaultExtendedOperationResponses() throws Exception
+    {
+        // Load from command line properties if it exists
+        String defaultExtendedOperationsList = System.getProperty( DEFAULT_EXTENDED_OPERATION_RESPONSES_LIST );
+        
+        if ( Strings.isEmpty( defaultExtendedOperationsList ) )
+        {
+            return;
+        }
+        
+        for ( String extendedOperation : defaultExtendedOperationsList.split( "," ) )
+        {
+            System.out.println( extendedOperation );
+
+            Class<?>[] types = new Class<?>[] { LdapApiService.class };
+            Class<? extends UnsolicitedResponseFactory<?>> clazz = ( Class<? extends UnsolicitedResponseFactory<?>> )Class.forName( extendedOperation );
+            Constructor<?> constructor = clazz.getConstructor(types);
+            
+            UnsolicitedResponseFactory<?> factory = (UnsolicitedResponseFactory<?>)constructor.newInstance( new Object[]{ this } );
+            unsolicitedFactories.put( factory.getOid(), factory );
+            LOG.info( "Registered pre-bundled extended operation factory: {}", factory.getOid() );
+        }
+    }
+    
+    
+    /**
+     * Loads the extra extended operations
+     */
+    private void loadExtraExtendedOperations()
+    {
+        
+    }
+    
+
+    /**
      * Assembles the <code>org.osgi.framework.system.packages.extra</code> list
      * of system packages exported by the embedding host to interact with bundles
      * running inside {@link Felix}.

Modified: directory/shared/branches/shared-osgi/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java Tue May 17 15:12:35 2011
@@ -63,8 +63,15 @@ public abstract class AbstractCodecServi
             "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_LIST, "" ); 
+        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, "" ); 
 
         codec = new StandaloneLdapApiService();

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java Tue May 17 15:12:35 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
 
 import org.apache.directory.shared.ldap.codec.api.ControlFactory;
 import org.apache.directory.shared.ldap.codec.api.ExtendedRequestFactory;
-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.UnsolicitedResponseFactory;
 import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue;
 import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
@@ -41,11 +41,11 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponse;
 import org.apache.directory.shared.ldap.extras.extended.GracefulShutdownRequest;
 import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequest;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.CancelFactory;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.CertGenerationFactory;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.GracefulDisconnectFactory;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.GracefulShutdownFactory;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.StoredProcedureFactory;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelFactory;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -67,8 +67,8 @@ public class ExtrasBundleActivator imple
      */
     public void start( BundleContext context ) throws Exception
     {
-        codecServiceRef = context.getServiceReference( LdapCodecService.class.getName() );
-        LdapCodecService codec = ( LdapCodecService ) context.getService( codecServiceRef );
+        codecServiceRef = context.getServiceReference( LdapApiService.class.getName() );
+        LdapApiService codec = ( LdapApiService ) context.getService( codecServiceRef );
         registerExtrasControls( codec );
         registerExtrasExtendedOps( codec );
     }
@@ -79,7 +79,7 @@ public class ExtrasBundleActivator imple
      *
      * @param codec The codec service.
      */
-    private void registerExtrasControls( LdapCodecService codec )
+    private void registerExtrasControls( LdapApiService codec )
     {
         ControlFactory<?,?> factory = new SyncDoneValueFactory( codec );
         codec.registerControl( factory );
@@ -106,7 +106,7 @@ public class ExtrasBundleActivator imple
      *
      * @param codec The codec service.
      */
-    private void registerExtrasExtendedOps( LdapCodecService codec )
+    private void registerExtrasExtendedOps( LdapApiService codec )
     {
         // --------------------------------------------------------------------
         // Register Extended Request Factories
@@ -131,7 +131,7 @@ public class ExtrasBundleActivator imple
         // --------------------------------------------------------------------
         
         
-        UnsolicitedResponseFactory<?> unsolicitedResponseFactory = new GracefulDisconnectFactory();
+        UnsolicitedResponseFactory<?> unsolicitedResponseFactory = new GracefulDisconnectFactory( codec );
         codec.registerUnsolicitedResponse( unsolicitedResponseFactory );
     }
     
@@ -141,7 +141,7 @@ public class ExtrasBundleActivator imple
      */
     public void stop( BundleContext context ) throws Exception
     {
-        LdapCodecService codec = ( LdapCodecService ) context.getService( codecServiceRef );
+        LdapApiService codec = ( LdapApiService ) context.getService( codecServiceRef );
         
         codec.unregisterControl( SyncDoneValue.OID );
         codec.unregisterControl( SyncInfoValue.OID );

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyContainer.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyContainer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyContainer.java Tue May 17 15:12:35 2011
@@ -22,7 +22,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.extras.controls.ppolicy.PasswordPolicy;
 import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyImpl;
 
@@ -37,7 +37,7 @@ public class PasswordPolicyContainer ext
     private PasswordPolicyDecorator control;
 
 
-    public PasswordPolicyContainer( LdapCodecService codec )
+    public PasswordPolicyContainer( LdapApiService codec )
     {
         super();
         control = new PasswordPolicyDecorator( codec, new PasswordPolicyImpl() );
@@ -47,7 +47,7 @@ public class PasswordPolicyContainer ext
     }
 
 
-    public PasswordPolicyContainer( LdapCodecService codec, PasswordPolicy ppolicyResponse )
+    public PasswordPolicyContainer( LdapApiService codec, PasswordPolicy ppolicyResponse )
     {
         super();
         

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyDecorator.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyDecorator.java Tue May 17 15:12:35 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;
 
 
 /**
@@ -52,19 +52,19 @@ public class PasswordPolicyDecorator ext
     private int graceAuthNsRemainingTagLength;
     
     
-    public PasswordPolicyDecorator( LdapCodecService codec )
+    public PasswordPolicyDecorator( LdapApiService codec )
     {
         super( codec, new PasswordPolicyImpl() );
     }
     
     
-    public PasswordPolicyDecorator( LdapCodecService codec, boolean hasResponse )
+    public PasswordPolicyDecorator( LdapApiService codec, boolean hasResponse )
     {
         super( codec, new PasswordPolicyImpl( hasResponse ) );
     }
 
 
-    public PasswordPolicyDecorator( LdapCodecService codec, PasswordPolicy policy )
+    public PasswordPolicyDecorator( LdapApiService codec, PasswordPolicy policy )
     {
         super( codec, policy );
     }

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyFactory.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyFactory.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyFactory.java Tue May 17 15:12:35 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.extras.controls.ppolicy.PasswordPolicy;
 
 
@@ -34,14 +34,14 @@ import org.apache.directory.shared.ldap.
 public class PasswordPolicyFactory implements ControlFactory<PasswordPolicy, PasswordPolicyDecorator>
 {
     
-    private LdapCodecService codec;
+    private LdapApiService codec;
     
 
     /**
      * Creates a new instance of PasswordPolicyFactory.
      *
      */
-    public PasswordPolicyFactory( LdapCodecService codec )
+    public PasswordPolicyFactory( LdapApiService codec )
     {
         this.codec = codec;
     }

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java Tue May 17 15:12:35 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;
 
 
 /**
@@ -35,7 +35,7 @@ public class SyncDoneValueContainer exte
     /** syncDoneValue*/
     private SyncDoneValueDecorator control;
 
-    private LdapCodecService codec;
+    private LdapApiService codec;
     
     
     /**
@@ -43,7 +43,7 @@ public class SyncDoneValueContainer exte
      * Creates a new SyncDoneValueControlContainer object.
      *
      */
-    public SyncDoneValueContainer( LdapCodecService codec )
+    public SyncDoneValueContainer( LdapApiService codec )
     {
         super();
         this.codec = codec;
@@ -59,7 +59,7 @@ public class SyncDoneValueContainer exte
      * Creates a new SyncDoneValueControlContainer object.
      *
      */
-    public SyncDoneValueContainer( LdapCodecService codec, SyncDoneValueDecorator control )
+    public SyncDoneValueContainer( LdapApiService codec, SyncDoneValueDecorator control )
     {
         super();
         this.codec = codec;
@@ -91,7 +91,7 @@ public class SyncDoneValueContainer exte
     }
 
     
-    public LdapCodecService getCodecService()
+    public LdapApiService getCodecService()
     {
         return codec;
     }

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java Tue May 17 15:12:35 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.extras.controls.SyncDoneValue;
 import org.apache.directory.shared.ldap.extras.controls.SyncDoneValueImpl;
@@ -54,7 +54,7 @@ public class SyncDoneValueDecorator exte
     /**
      * Creates a new instance of SyncDoneValueControlCodec.
      */
-    public SyncDoneValueDecorator( LdapCodecService codec )
+    public SyncDoneValueDecorator( LdapApiService codec )
     {
         super( codec, new SyncDoneValueImpl() );
     }
@@ -66,7 +66,7 @@ public class SyncDoneValueDecorator exte
      * @param codec The LDAP codec
      * @param control The control to be decorated
      */
-    public SyncDoneValueDecorator( LdapCodecService codec, SyncDoneValue control )
+    public SyncDoneValueDecorator( LdapApiService codec, SyncDoneValue control )
     {
         super( codec, control );
     }

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java Tue May 17 15:12:35 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.extras.controls.SyncDoneValue;
 
 
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
 public class SyncDoneValueFactory implements ControlFactory<SyncDoneValue, SyncDoneValueDecorator>
 {
     /** The codec for this factory */
-    private LdapCodecService codec;
+    private LdapApiService codec;
     
 
     /**
@@ -42,7 +42,7 @@ public class SyncDoneValueFactory implem
      *
      * @param codec The codec for this factory.
      */
-    public SyncDoneValueFactory( LdapCodecService codec )
+    public SyncDoneValueFactory( LdapApiService codec )
     {
         this.codec = codec;
     }

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java Tue May 17 15:12:35 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;
 
 
 /**
@@ -34,14 +34,14 @@ public class SyncInfoValueContainer exte
     /** SyncInfoValueControl */
     private SyncInfoValueDecorator control;
 
-    private LdapCodecService codec;
+    private LdapApiService codec;
 
     
     /**
      * Creates a new SyncInfoValueControlContainer object. We will store one grammar,
      * it's enough ...
      */
-    public SyncInfoValueContainer( LdapCodecService codec )
+    public SyncInfoValueContainer( LdapApiService codec )
     {
         super();
         this.codec = codec;
@@ -56,7 +56,7 @@ public class SyncInfoValueContainer exte
      * Creates a new SyncInfoValueControlContainer object. We will store one grammar,
      * it's enough ...
      */
-    public SyncInfoValueContainer( LdapCodecService codec, SyncInfoValueDecorator control )
+    public SyncInfoValueContainer( LdapApiService codec, SyncInfoValueDecorator control )
     {
         super();
         this.codec = codec;
@@ -88,7 +88,7 @@ public class SyncInfoValueContainer exte
     }
 
     
-    public LdapCodecService getCodecService()
+    public LdapApiService getCodecService()
     {
         return codec;
     }

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java Tue May 17 15:12:35 2011
@@ -33,7 +33,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.extras.controls.SyncInfoValue;
 import org.apache.directory.shared.ldap.extras.controls.SyncInfoValueImpl;
 import org.apache.directory.shared.ldap.extras.controls.SynchronizationInfoEnum;
@@ -57,7 +57,7 @@ public class SyncInfoValueDecorator exte
     /**
      * The constructor for this codec. Dont't forget to set the type.
      */
-    public SyncInfoValueDecorator( LdapCodecService codec )
+    public SyncInfoValueDecorator( LdapApiService codec )
     {
         super( codec, new SyncInfoValueImpl() );
     }
@@ -66,7 +66,7 @@ public class SyncInfoValueDecorator exte
     /**
      * The constructor for this codec. Dont't forget to set the type.
      */
-    public SyncInfoValueDecorator( LdapCodecService codec, SyncInfoValue control )
+    public SyncInfoValueDecorator( LdapApiService codec, SyncInfoValue control )
     {
         super( codec, control );
     }
@@ -77,7 +77,7 @@ public class SyncInfoValueDecorator exte
      * @param type The kind of syncInfo we will store. Can be newCookie,
      * refreshPresent, refreshDelete or syncIdSet
      */
-    public SyncInfoValueDecorator( LdapCodecService codec, SynchronizationInfoEnum type )
+    public SyncInfoValueDecorator( LdapApiService codec, SynchronizationInfoEnum type )
     {
         this( codec );
 

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java Tue May 17 15:12:35 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.extras.controls.SyncInfoValue;
 
 
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
 public class SyncInfoValueFactory implements ControlFactory<SyncInfoValue, SyncInfoValueDecorator>
 {
     
-    private LdapCodecService codec;
+    private LdapApiService codec;
     
 
     /**
@@ -42,7 +42,7 @@ public class SyncInfoValueFactory implem
      *
      * @param codec The codec for this factory.
      */
-    public SyncInfoValueFactory( LdapCodecService codec )
+    public SyncInfoValueFactory( LdapApiService codec )
     {
         this.codec = codec;
     }

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnContainer.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnContainer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnContainer.java Tue May 17 15:12:35 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;
 
 
 /**
@@ -39,7 +39,7 @@ public class SyncModifyDnContainer exten
      * Creates a new SyncStateValueControlContainer object. We will store one grammar,
      * it's enough ...
      */
-    public SyncModifyDnContainer( LdapCodecService codec )
+    public SyncModifyDnContainer( LdapApiService codec )
     {
         super();
         this.control = new SyncModifyDnDecorator( codec );

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnDecorator.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnDecorator.java Tue May 17 15:12:35 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.asn1.util.Asn1StringUtils;
 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.extras.controls.SyncModifyDn;
 import org.apache.directory.shared.ldap.extras.controls.SyncModifyDnImpl;
@@ -76,20 +76,20 @@ public class SyncModifyDnDecorator exten
     private Asn1Decoder decoder = new Asn1Decoder();
 
 
-    public SyncModifyDnDecorator( LdapCodecService codec )
+    public SyncModifyDnDecorator( LdapApiService codec )
     {
         super( codec, new SyncModifyDnImpl() );
     }
 
 
-    public SyncModifyDnDecorator( LdapCodecService codec, SyncModifyDnType type )
+    public SyncModifyDnDecorator( LdapApiService codec, SyncModifyDnType type )
     {
         this( codec );
         this.modDnType = type;
     }
 
 
-    public SyncModifyDnDecorator( LdapCodecService codec, SyncModifyDn control )
+    public SyncModifyDnDecorator( LdapApiService codec, SyncModifyDn control )
     {
         super( codec, control );
     }

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnFactory.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnFactory.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnFactory.java Tue May 17 15:12:35 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.extras.controls.SyncModifyDn;
 
 
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
 public class SyncModifyDnFactory implements ControlFactory<SyncModifyDn, SyncModifyDnDecorator>
 {
     
-    private LdapCodecService codec;
+    private LdapApiService codec;
     
 
     /**
@@ -42,7 +42,7 @@ public class SyncModifyDnFactory impleme
      *
      * @param codec The codec for this factory.
      */
-    public SyncModifyDnFactory( LdapCodecService codec )
+    public SyncModifyDnFactory( LdapApiService codec )
     {
         this.codec = codec;
     }

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java Tue May 17 15:12:35 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.extras.controls.SyncRequestValue;
 import org.apache.directory.shared.ldap.extras.controls.SyncRequestValueImpl;
@@ -52,13 +52,13 @@ public class SyncRequestValueDecorator  
     private static final Asn1Decoder decoder = new Asn1Decoder();
 
 
-    public SyncRequestValueDecorator( LdapCodecService codec )
+    public SyncRequestValueDecorator( LdapApiService codec )
     {
         super( codec, new SyncRequestValueImpl() );
     }
 
 
-    public SyncRequestValueDecorator( LdapCodecService codec, SyncRequestValue control )
+    public SyncRequestValueDecorator( LdapApiService codec, SyncRequestValue control )
     {
         super( codec, control );
     }

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java Tue May 17 15:12:35 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.extras.controls.SyncRequestValue;
 
 
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
 public class SyncRequestValueFactory implements ControlFactory<SyncRequestValue, SyncRequestValueDecorator>
 {
     /** The codec for this factory */
-    private LdapCodecService codec;
+    private LdapApiService codec;
     
 
     /**
@@ -42,7 +42,7 @@ public class SyncRequestValueFactory imp
      *
      * @param codec The codec for this factory.
      */
-    public SyncRequestValueFactory( LdapCodecService codec )
+    public SyncRequestValueFactory( LdapApiService codec )
     {
         this.codec = codec;
     }

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java Tue May 17 15:12:35 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.extras.controls.SyncStateTypeEnum;
 import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
 import org.apache.directory.shared.ldap.extras.controls.SyncStateValueImpl;
@@ -51,13 +51,13 @@ public class SyncStateValueDecorator ext
     private static final Asn1Decoder decoder = new Asn1Decoder();
 
 
-    public SyncStateValueDecorator( LdapCodecService codec )
+    public SyncStateValueDecorator( LdapApiService codec )
     {
         super( codec, new SyncStateValueImpl() );
     }
 
 
-    public SyncStateValueDecorator( LdapCodecService codec, SyncStateValue value )
+    public SyncStateValueDecorator( LdapApiService codec, SyncStateValue value )
     {
         super( codec, value );
     }

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java Tue May 17 15:12:35 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.extras.controls.SyncStateValue;
 
 
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
 public class SyncStateValueFactory implements ControlFactory<SyncStateValue, SyncStateValueDecorator>
 {
     /** The codec for this factory */
-    private LdapCodecService codec;
+    private LdapApiService codec;
     
 
     /**
@@ -42,7 +42,7 @@ public class SyncStateValueFactory imple
      *
      * @param codec The codec for this factory.
      */
-    public SyncStateValueFactory( LdapCodecService codec )
+    public SyncStateValueFactory( LdapApiService codec )
     {
         this.codec = codec;
     }

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/Cancel.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/Cancel.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/Cancel.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/Cancel.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/Cancel.java&r1=1103720&r2=1104318&rev=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/Cancel.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/Cancel.java Tue May 17 15:12:35 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel;
 
 
 import java.nio.ByteBuffer;

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelContainer.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelContainer.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelContainer.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelContainer.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelContainer.java&r1=1103720&r2=1104318&rev=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelContainer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelContainer.java Tue May 17 15:12:35 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel;
 
 
 import org.apache.directory.shared.asn1.ber.AbstractContainer;

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelDecoder.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelDecoder.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelDecoder.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelDecoder.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelDecoder.java&r1=1103720&r2=1104318&rev=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelDecoder.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelDecoder.java Tue May 17 15:12:35 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel;
 
 
 import java.nio.ByteBuffer;

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelFactory.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelFactory.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelFactory.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelFactory.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelFactory.java&r1=1103720&r2=1104318&rev=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelFactory.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelFactory.java Tue May 17 15:12:35 2011
@@ -17,14 +17,14 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel;
 
 
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.ldap.codec.api.ExtendedRequestDecorator;
 import org.apache.directory.shared.ldap.codec.api.ExtendedRequestFactory;
 import org.apache.directory.shared.ldap.codec.api.ExtendedResponseDecorator;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.extras.extended.CancelRequestImpl;
 import org.apache.directory.shared.ldap.extras.extended.CancelResponseImpl;
 import org.apache.directory.shared.ldap.extras.extended.CancelRequest;
@@ -41,10 +41,10 @@ import org.apache.directory.shared.ldap.
  */
 public class CancelFactory implements ExtendedRequestFactory<CancelRequest, CancelResponse>
 {
-    private LdapCodecService codec;
+    private LdapApiService codec;
     
     
-    public CancelFactory( LdapCodecService codec )
+    public CancelFactory( LdapApiService codec )
     {
         this.codec = codec;
     }

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelGrammar.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelGrammar.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelGrammar.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelGrammar.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelGrammar.java&r1=1103720&r2=1104318&rev=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelGrammar.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelGrammar.java Tue May 17 15:12:35 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel;
 
 
 import org.apache.directory.shared.asn1.ber.Asn1Container;

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelRequestDecorator.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelRequestDecorator.java&r1=1103720&r2=1104318&rev=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelRequestDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java Tue May 17 15:12:35 2011
@@ -17,14 +17,14 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel;
 
 
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.ExtendedRequestDecorator;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.extras.extended.CancelRequest;
 import org.apache.directory.shared.ldap.extras.extended.CancelResponse;
 import org.slf4j.Logger;
@@ -41,7 +41,7 @@ public class CancelRequestDecorator exte
     private static final Logger LOG = LoggerFactory.getLogger( CancelRequestDecorator.class );
     
     
-    public CancelRequestDecorator( LdapCodecService codec, CancelRequest decoratedMessage )
+    public CancelRequestDecorator( LdapApiService codec, CancelRequest decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelResponseDecorator.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelResponseDecorator.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelResponseDecorator.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelResponseDecorator.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelResponseDecorator.java&r1=1103720&r2=1104318&rev=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelResponseDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelResponseDecorator.java Tue May 17 15:12:35 2011
@@ -17,11 +17,11 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel;
 
 
 import org.apache.directory.shared.ldap.codec.api.ExtendedResponseDecorator;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.extras.extended.CancelResponse;
 
 
@@ -38,7 +38,7 @@ public class CancelResponseDecorator ext
      * @param codec
      * @param decoratedMessage
      */
-    public CancelResponseDecorator( LdapCodecService codec, CancelResponse decoratedMessage )
+    public CancelResponseDecorator( LdapApiService codec, CancelResponse decoratedMessage )
     {
         super( codec, decoratedMessage );
     }

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelStatesEnum.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelStatesEnum.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelStatesEnum.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelStatesEnum.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelStatesEnum.java&r1=1103720&r2=1104318&rev=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelStatesEnum.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/cancel/CancelStatesEnum.java Tue May 17 15:12:35 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel;
 
 
 import org.apache.directory.shared.asn1.ber.grammar.Grammar;

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationContainer.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationContainer.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationContainer.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationContainer.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationContainer.java&r1=1103720&r2=1104318&rev=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationContainer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationContainer.java Tue May 17 15:12:35 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration;
 
 
 import org.apache.directory.shared.asn1.ber.AbstractContainer;

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationDecoder.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationDecoder.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationDecoder.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationDecoder.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationDecoder.java&r1=1103720&r2=1104318&rev=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationDecoder.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationDecoder.java Tue May 17 15:12:35 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration;
 
 
 import java.nio.ByteBuffer;

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationFactory.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationFactory.java&r1=1103720&r2=1104318&rev=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationFactory.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java Tue May 17 15:12:35 2011
@@ -17,14 +17,14 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration;
 
 
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.ldap.codec.api.ExtendedRequestDecorator;
 import org.apache.directory.shared.ldap.codec.api.ExtendedRequestFactory;
 import org.apache.directory.shared.ldap.codec.api.ExtendedResponseDecorator;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.extras.extended.CertGenerationRequestImpl;
 import org.apache.directory.shared.ldap.extras.extended.CertGenerationResponseImpl;
 import org.apache.directory.shared.ldap.extras.extended.CertGenerationRequest;
@@ -42,10 +42,10 @@ import org.apache.directory.shared.ldap.
 public class CertGenerationFactory 
     implements ExtendedRequestFactory<CertGenerationRequest, CertGenerationResponse>
 {
-    private LdapCodecService codec;
+    private LdapApiService codec;
     
     
-    public CertGenerationFactory( LdapCodecService codec )
+    public CertGenerationFactory( LdapApiService codec )
     {
         this.codec = codec;
     }