directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1104318 [4/4] - in /directory: apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ shared/branches/share...
Date Tue, 17 May 2011 15:12:48 GMT
Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationGrammar.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/CertGenerationGrammar.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationGrammar.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/CertGenerationGrammar.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.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.grammar.AbstractGrammar;

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationObject.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/CertGenerationObject.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationObject.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/CertGenerationObject.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationObject.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/CertGenerationRequestDecorator.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationRequestDecorator.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/CertGenerationRequestDecorator.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationRequestDecorator.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/CertGenerationRequestDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.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.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.CertGenerationRequest;
 import org.apache.directory.shared.ldap.extras.extended.CertGenerationResponse;
 import org.slf4j.Logger;
@@ -46,14 +46,14 @@ public class CertGenerationRequestDecora
     private CertGenerationObject certGenObj;
 
 
-    public CertGenerationRequestDecorator( LdapCodecService codec, CertGenerationRequest decoratedMessage )
+    public CertGenerationRequestDecorator( LdapApiService codec, CertGenerationRequest decoratedMessage )
     {
         super( codec, decoratedMessage );
         certGenObj = new CertGenerationObject( decoratedMessage );
     }
 
     
-    CertGenerationObject getCertGenerationObject()
+    public CertGenerationObject getCertGenerationObject()
     {
         return certGenObj;
     }

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationResponseDecorator.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationResponseDecorator.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/CertGenerationResponseDecorator.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationResponseDecorator.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationResponseDecorator.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/CertGenerationResponseDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationResponseDecorator.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.certGeneration;
 
 
 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.CertGenerationResponse;
 
 
@@ -38,7 +38,7 @@ public class CertGenerationResponseDecor
      * @param codec
      * @param decoratedMessage
      */
-    public CertGenerationResponseDecorator( LdapCodecService codec, CertGenerationResponse decoratedMessage )
+    public CertGenerationResponseDecorator( LdapApiService codec, CertGenerationResponse 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/certGeneration/CertGenerationStatesEnum.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationStatesEnum.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/CertGenerationStatesEnum.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationStatesEnum.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationStatesEnum.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/CertGenerationStatesEnum.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationStatesEnum.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.grammar.Grammar;

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulAction.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulAction.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/gracefulDisconnect/GracefulAction.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulAction.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulAction.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/GracefulAction.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulAction.java Tue May 17 15:12:35 2011
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect;
 
 
 import org.apache.directory.shared.asn1.AbstractAsn1Object;

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulActionConstants.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulActionConstants.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/gracefulDisconnect/GracefulActionConstants.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulActionConstants.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulActionConstants.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/GracefulActionConstants.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulActionConstants.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.gracefulDisconnect;
 
 
 /**

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnect.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnect.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/gracefulDisconnect/GracefulDisconnect.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnect.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnect.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/GracefulDisconnect.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnect.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.gracefulDisconnect;
 
 
 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/gracefulDisconnect/GracefulDisconnectContainer.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectContainer.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/gracefulDisconnect/GracefulDisconnectContainer.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectContainer.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectContainer.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/GracefulDisconnectContainer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectContainer.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.gracefulDisconnect;
 
 
 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/gracefulDisconnect/GracefulDisconnectDecoder.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectDecoder.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/gracefulDisconnect/GracefulDisconnectDecoder.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectDecoder.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectDecoder.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/GracefulDisconnectDecoder.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectDecoder.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.gracefulDisconnect;
 
 
 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/gracefulDisconnect/GracefulDisconnectFactory.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectFactory.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/gracefulDisconnect/GracefulDisconnectFactory.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectFactory.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/GracefulDisconnectFactory.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java Tue May 17 15:12:35 2011
@@ -17,16 +17,16 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect;
 
 
 import org.apache.directory.shared.asn1.DecoderException;
 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.UnsolicitedResponseFactory;
-import org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponseImpl;
 import org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponse;
+import org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponseImpl;
 import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
 
 
@@ -38,7 +38,13 @@ import org.apache.directory.shared.ldap.
  */
 public class GracefulDisconnectFactory implements UnsolicitedResponseFactory<GracefulDisconnectResponse>
 {
-    private LdapCodecService codec;
+    private LdapApiService codec;
+    
+    
+    public GracefulDisconnectFactory( 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/gracefulDisconnect/GracefulDisconnectGrammar.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectGrammar.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/gracefulDisconnect/GracefulDisconnectGrammar.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectGrammar.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectGrammar.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/GracefulDisconnectGrammar.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectGrammar.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.gracefulDisconnect;
 
 
 import org.apache.directory.shared.asn1.DecoderException;

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectResponseDecorator.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/gracefulDisconnect/GracefulDisconnectResponseDecorator.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectResponseDecorator.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/GracefulDisconnectResponseDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.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.gracefulDisconnect;
 
 
 import java.nio.ByteBuffer;
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.i18n.I18n;
 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.GracefulDisconnectResponse;
 import org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponseImpl;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
@@ -57,7 +57,7 @@ public class GracefulDisconnectResponseD
      * @param codec
      * @param decoratedMessage
      */
-    public GracefulDisconnectResponseDecorator( LdapCodecService codec, GracefulDisconnectResponse decoratedMessage )
+    public GracefulDisconnectResponseDecorator( LdapApiService codec, GracefulDisconnectResponse decoratedMessage )
     {
         super( codec, decoratedMessage );
         responseValue = null;
@@ -71,7 +71,7 @@ public class GracefulDisconnectResponseD
      * @param codec
      * @param responseValue
      */
-    public GracefulDisconnectResponseDecorator( LdapCodecService codec, byte[] responseValue ) throws DecoderException
+    public GracefulDisconnectResponseDecorator( LdapApiService codec, byte[] responseValue ) throws DecoderException
     {
         super( codec, new GracefulDisconnectResponseImpl() );
         this.responseValue = responseValue;
@@ -82,11 +82,11 @@ public class GracefulDisconnectResponseD
     private void decodeValue() throws DecoderException
     {
         GracefulDisconnectDecoder decoder = new GracefulDisconnectDecoder();
-        org.apache.directory.shared.ldap.extras.extended.ads_impl.GracefulDisconnect codec = null;
+        org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnect codec = null;
 
         try
         {
-            codec = (org.apache.directory.shared.ldap.extras.extended.ads_impl.GracefulDisconnect) decoder
+            codec = (org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnect) decoder
                 .decode( responseValue );
             getDecorated().setTimeOffline( codec.getTimeOffline() );
             getDecorated().setDelay( codec.getDelay() );
@@ -108,8 +108,8 @@ public class GracefulDisconnectResponseD
 
     private void encodeResponse()
     {
-        org.apache.directory.shared.ldap.extras.extended.ads_impl.GracefulDisconnect codec = 
-            new org.apache.directory.shared.ldap.extras.extended.ads_impl.GracefulDisconnect();
+        org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnect codec = 
+            new org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnect();
         codec.setTimeOffline( getDecorated().getTimeOffline() );
         codec.setDelay( getDecorated().getDelay() );
 
@@ -194,7 +194,7 @@ public class GracefulDisconnectResponseD
             LOG.error( I18n.err( I18n.ERR_04172 ), e );
         }
 
-        org.apache.directory.shared.ldap.extras.extended.ads_impl.GracefulDisconnect codec = container
+        org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnect codec = container
             .getGracefulDisconnect();
         
         getDecorated().setDelay( codec.getDelay() );

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectStatesEnum.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectStatesEnum.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/gracefulDisconnect/GracefulDisconnectStatesEnum.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectStatesEnum.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectStatesEnum.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/GracefulDisconnectStatesEnum.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectStatesEnum.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.gracefulDisconnect;
 
 
 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/gracefulShutdown/GracefulShutdown.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdown.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/gracefulShutdown/GracefulShutdown.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdown.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdown.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/GracefulShutdown.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdown.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.gracefulShutdown;
 
 
 import java.nio.ByteBuffer;
@@ -26,6 +26,8 @@ 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.asn1.EncoderException;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulAction;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulActionConstants;
 
 
 /**

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownContainer.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownContainer.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/gracefulShutdown/GracefulShutdownContainer.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownContainer.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownContainer.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/GracefulShutdownContainer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownContainer.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.gracefulShutdown;
 
 
 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/gracefulShutdown/GracefulShutdownDecoder.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownDecoder.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/gracefulShutdown/GracefulShutdownDecoder.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownDecoder.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownDecoder.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/GracefulShutdownDecoder.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownDecoder.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.gracefulShutdown;
 
 
 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/gracefulShutdown/GracefulShutdownFactory.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownFactory.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/gracefulShutdown/GracefulShutdownFactory.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownFactory.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/GracefulShutdownFactory.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.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.gracefulShutdown;
 
 
 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.GracefulShutdownRequestImpl;
 import org.apache.directory.shared.ldap.extras.extended.GracefulShutdownResponseImpl;
 import org.apache.directory.shared.ldap.extras.extended.GracefulShutdownRequest;
@@ -42,10 +42,10 @@ import org.apache.directory.shared.ldap.
 public class GracefulShutdownFactory 
     implements ExtendedRequestFactory<GracefulShutdownRequest, GracefulShutdownResponse>
 {
-    private LdapCodecService codec;
+    private LdapApiService codec;
     
     
-    public GracefulShutdownFactory( LdapCodecService codec )
+    public GracefulShutdownFactory( 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/gracefulShutdown/GracefulShutdownGrammar.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownGrammar.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/gracefulShutdown/GracefulShutdownGrammar.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownGrammar.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownGrammar.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/GracefulShutdownGrammar.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownGrammar.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.gracefulShutdown;
 
 
 import org.apache.directory.shared.asn1.DecoderException;
@@ -29,6 +29,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
 import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulActionConstants;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownRequestDecorator.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/gracefulShutdown/GracefulShutdownRequestDecorator.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownRequestDecorator.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/GracefulShutdownRequestDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.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.gracefulShutdown;
 
 
 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.GracefulShutdownRequest;
 import org.apache.directory.shared.ldap.extras.extended.GracefulShutdownResponse;
 import org.slf4j.Logger;
@@ -48,7 +48,7 @@ public class GracefulShutdownRequestDeco
      * @param codec
      * @param decoratedMessage
      */
-    public GracefulShutdownRequestDecorator( LdapCodecService codec, GracefulShutdownRequest decoratedMessage )
+    public GracefulShutdownRequestDecorator( LdapApiService codec, GracefulShutdownRequest 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/gracefulShutdown/GracefulShutdownResponseDecorator.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownResponseDecorator.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/gracefulShutdown/GracefulShutdownResponseDecorator.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownResponseDecorator.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownResponseDecorator.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/GracefulShutdownResponseDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownResponseDecorator.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.gracefulShutdown;
 
 
 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.GracefulShutdownResponse;
 
 
@@ -38,7 +38,7 @@ public class GracefulShutdownResponseDec
      * @param codec
      * @param decoratedMessage
      */
-    public GracefulShutdownResponseDecorator( LdapCodecService codec, GracefulShutdownResponse decoratedMessage )
+    public GracefulShutdownResponseDecorator( LdapApiService codec, GracefulShutdownResponse 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/gracefulShutdown/GracefulShutdownStatesEnum.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownStatesEnum.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/gracefulShutdown/GracefulShutdownStatesEnum.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownStatesEnum.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownStatesEnum.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/GracefulShutdownStatesEnum.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownStatesEnum.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.gracefulShutdown;
 
 
 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/storedProcedure/StoredProcedureContainer.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureContainer.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/storedProcedure/StoredProcedureContainer.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureContainer.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureContainer.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/StoredProcedureContainer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureContainer.java Tue May 17 15:12:35 2011
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure;
 
 
 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/storedProcedure/StoredProcedureDecoder.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureDecoder.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/storedProcedure/StoredProcedureDecoder.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureDecoder.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureDecoder.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/StoredProcedureDecoder.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureDecoder.java Tue May 17 15:12:35 2011
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure;
 
 
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureFactory.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/storedProcedure/StoredProcedureFactory.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureFactory.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/StoredProcedureFactory.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.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.storedProcedure;
 
 
 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.StoredProcedureRequest;
 import org.apache.directory.shared.ldap.extras.extended.StoredProcedureResponse;
 import org.apache.directory.shared.ldap.extras.extended.StoredProcedureResponseImpl;
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
  */
 public class StoredProcedureFactory implements ExtendedRequestFactory<StoredProcedureRequest, StoredProcedureResponse>
 {
-    private LdapCodecService codec;
+    private LdapApiService codec;
     
     
     /**
@@ -48,7 +48,7 @@ public class StoredProcedureFactory impl
      *
      * @param codec
      */
-    public StoredProcedureFactory( LdapCodecService codec )
+    public StoredProcedureFactory( 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/storedProcedure/StoredProcedureGrammar.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureGrammar.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/storedProcedure/StoredProcedureGrammar.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureGrammar.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/StoredProcedureGrammar.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java Tue May 17 15:12:35 2011
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure;
 
 
 import org.apache.directory.shared.asn1.DecoderException;

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureRequestDecorator.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/storedProcedure/StoredProcedureRequestDecorator.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureRequestDecorator.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/StoredProcedureRequestDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.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.storedProcedure;
 
 
 import java.nio.BufferOverflowException;
@@ -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.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.StoredProcedureParameter;
 import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequest;
 import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequestImpl;
@@ -71,13 +71,13 @@ public class StoredProcedureRequestDecor
     private List<Integer> paramValueLength;
     
     
-    public StoredProcedureRequestDecorator( LdapCodecService codec )
+    public StoredProcedureRequestDecorator( LdapApiService codec )
     {
         super( codec, new StoredProcedureRequestImpl() );
     }
 
     
-    public StoredProcedureRequestDecorator( LdapCodecService codec, StoredProcedureRequest decoratedRequest )
+    public StoredProcedureRequestDecorator( LdapApiService codec, StoredProcedureRequest decoratedRequest )
     {
         super( codec, decoratedRequest );
         if ( decoratedRequest == null )

Copied: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureResponseDecorator.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureResponseDecorator.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/storedProcedure/StoredProcedureResponseDecorator.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureResponseDecorator.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureResponseDecorator.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/StoredProcedureResponseDecorator.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureResponseDecorator.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.storedProcedure;
 
 
 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.StoredProcedureResponse;
 
 
@@ -38,7 +38,7 @@ public class StoredProcedureResponseDeco
      * @param codec
      * @param decoratedMessage
      */
-    public StoredProcedureResponseDecorator( LdapCodecService codec, StoredProcedureResponse decoratedMessage )
+    public StoredProcedureResponseDecorator( LdapApiService codec, StoredProcedureResponse 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/storedProcedure/StoredProcedureStatesEnum.java (from r1103720, directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureStatesEnum.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/storedProcedure/StoredProcedureStatesEnum.java?p2=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureStatesEnum.java&p1=directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureStatesEnum.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/StoredProcedureStatesEnum.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureStatesEnum.java Tue May 17 15:12:35 2011
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.shared.ldap.extras.extended.ads_impl;
+package org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure;
 
 
 import org.apache.directory.shared.asn1.ber.grammar.Grammar;

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelRequestTest.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelRequestTest.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelRequestTest.java Tue May 17 15:12:35 2011
@@ -31,9 +31,9 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.ber.Asn1Container;
 import org.apache.directory.shared.asn1.EncoderException;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.Cancel;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.CancelContainer;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.CancelDecoder;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.Cancel;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelContainer;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelDecoder;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java Tue May 17 15:12:35 2011
@@ -31,7 +31,8 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
 import org.apache.directory.shared.ldap.extras.extended.CertGenerationRequestImpl;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.CertGenerationContainer;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationContainer;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationRequestDecorator;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectTest.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectTest.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectTest.java Tue May 17 15:12:35 2011
@@ -29,6 +29,9 @@ import java.nio.ByteBuffer;
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnect;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectContainer;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectDecoder;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownTest.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownTest.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownTest.java Tue May 17 15:12:35 2011
@@ -29,8 +29,8 @@ import java.nio.ByteBuffer;
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.GracefulShutdown;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.GracefulShutdownContainer;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdown;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownContainer;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureTest.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureTest.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureTest.java Tue May 17 15:12:35 2011
@@ -32,8 +32,9 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.DecoderException;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.StoredProcedureContainer;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.StoredProcedureDecoder;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureContainer;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureDecoder;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureRequestDecorator;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-osgi/ldap/extras/util/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/util/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java?rev=1104318&r1=1104317&r2=1104318&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/util/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/util/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java Tue May 17 15:12:35 2011
@@ -48,7 +48,7 @@ import javax.naming.ldap.LdapName;
 
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
-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.exception.LdapAffectMultipleDsaException;
 import org.apache.directory.shared.ldap.model.exception.LdapAliasDereferencingException;
 import org.apache.directory.shared.ldap.model.exception.LdapAliasException;
@@ -94,7 +94,7 @@ public final class JndiUtils
 
 
     // @TODO not really needed and can be moved out
-    public static javax.naming.ldap.Control toJndiControl( LdapCodecService codec, Control control ) 
+    public static javax.naming.ldap.Control toJndiControl( LdapApiService codec, Control control ) 
         throws EncoderException
     {
         return codec.toJndiControl( control );
@@ -102,7 +102,7 @@ public final class JndiUtils
 
 
     // @TODO not really needed and can be moved out
-    public static javax.naming.ldap.Control[] toJndiControls( LdapCodecService codec, Control... controls ) 
+    public static javax.naming.ldap.Control[] toJndiControls( LdapApiService codec, Control... controls ) 
          throws EncoderException
     {
         if ( controls != null )
@@ -125,7 +125,7 @@ public final class JndiUtils
 
 
     // @TODO not really needed and can be moved out
-    public static Control fromJndiControl( LdapCodecService codec, javax.naming.ldap.Control jndiControl ) 
+    public static Control fromJndiControl( LdapApiService codec, javax.naming.ldap.Control jndiControl ) 
         throws DecoderException
     {
         return codec.fromJndiControl( jndiControl );
@@ -133,7 +133,7 @@ public final class JndiUtils
 
 
     // @TODO not really needed and can be moved out
-    public static Control[] fromJndiControls( LdapCodecService codec, javax.naming.ldap.Control... jndiControls )
+    public static Control[] fromJndiControls( LdapApiService codec, javax.naming.ldap.Control... jndiControls )
         throws DecoderException
     {
         if ( jndiControls != null )



Mime
View raw message