directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r986534 [4/7] - in /directory: apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/ apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/event/ apacheds/br...
Date Wed, 18 Aug 2010 00:27:23 GMT
Modified: directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java Wed Aug 18 00:27:16 2010
@@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.extended.LaunchDiagnosticUiRequest;
 import org.apache.directory.shared.ldap.message.extended.LaunchDiagnosticUiResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
+import org.apache.directory.shared.ldap.message.internal.ExtendedRequest;
 import org.apache.directory.shared.ldap.name.DN;
 
 
@@ -76,7 +76,7 @@ public class LaunchDiagnosticUiHandler i
 
     // This will suppress PMD.EmptyCatchBlock warnings in this method
     @SuppressWarnings("PMD.EmptyCatchBlock")
-    public void handleExtendedOperation( LdapSession requestor, InternalExtendedRequest req )
+    public void handleExtendedOperation( LdapSession requestor, ExtendedRequest req )
         throws Exception
     {
         DirectoryService service = requestor.getCoreSession().getDirectoryService();

Modified: directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java Wed Aug 18 00:27:16 2010
@@ -61,13 +61,13 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.UnbindRequestImpl;
 import org.apache.directory.shared.ldap.message.internal.BindResponse;
 import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalMessage;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalUnbindRequest;
+import org.apache.directory.shared.ldap.message.internal.AddRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
+import org.apache.directory.shared.ldap.message.internal.DeleteRequest;
+import org.apache.directory.shared.ldap.message.internal.Message;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.internal.ModifyRequest;
+import org.apache.directory.shared.ldap.message.internal.UnbindRequest;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -172,7 +172,7 @@ public class ImportCommand extends ToolC
 
                 if ( ldapMessageContainer.getState() == TLVStateEnum.PDU_DECODED )
                 {
-                    InternalMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalMessage();
+                    Message message = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalMessage();
 
                     if ( message instanceof BindResponse )
                     {
@@ -222,7 +222,7 @@ public class ImportCommand extends ToolC
     private int addEntry( LdifEntry ldifEntry, int messageId ) throws IOException, DecoderException, LdapException,
         EncoderException
     {
-        InternalAddRequest addRequest = new AddRequestImpl();
+        AddRequest addRequest = new AddRequestImpl();
 
         String dn = ldifEntry.getDn().getName();
 
@@ -293,7 +293,7 @@ public class ImportCommand extends ToolC
         LdapInvalidDnException, EncoderException
     {
         LdapProtocolEncoder encoder = new LdapProtocolEncoder();
-        InternalDeleteRequest delRequest = new DeleteRequestImpl( messageId );
+        DeleteRequest delRequest = new DeleteRequestImpl( messageId );
 
         String dn = entry.getDn().getName();
 
@@ -346,7 +346,7 @@ public class ImportCommand extends ToolC
     private int changeModRDNEntry( LdifEntry entry, int messageId ) throws IOException, DecoderException,
         LdapInvalidDnException, EncoderException
     {
-        InternalModifyDnRequest modifyDNRequest = new ModifyDnRequestImpl();
+        ModifyDnRequest modifyDNRequest = new ModifyDnRequestImpl();
 
         String dn = entry.getDn().getName();
 
@@ -408,7 +408,7 @@ public class ImportCommand extends ToolC
     private int changeModifyEntry( LdifEntry entry, int messageId ) throws IOException, DecoderException,
         LdapInvalidDnException, EncoderException
     {
-        InternalModifyRequest modifyRequest = new ModifyRequestImpl();
+        ModifyRequest modifyRequest = new ModifyRequestImpl();
 
         String dn = entry.getDn().getName();
 
@@ -499,7 +499,7 @@ public class ImportCommand extends ToolC
      */
     private void bind( int messageId ) throws LdapInvalidDnException, EncoderException, DecoderException, IOException
     {
-        InternalBindRequest bindRequest = new BindRequestImpl( messageId );
+        BindRequest bindRequest = new BindRequestImpl( messageId );
 
         if ( "simple".equals( auth ) )
         {
@@ -551,7 +551,7 @@ public class ImportCommand extends ToolC
      */
     private void unbind( int messageId ) throws EncoderException, DecoderException, IOException
     {
-        InternalUnbindRequest unbindRequest = new UnbindRequestImpl( messageId );
+        UnbindRequest unbindRequest = new UnbindRequestImpl( messageId );
         LdapProtocolEncoder encoder = new LdapProtocolEncoder();
 
         ByteBuffer bb = encoder.encodeMessage( unbindRequest );

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java Wed Aug 18 00:27:16 2010
@@ -14,14 +14,14 @@ import org.apache.directory.ldap.client.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.internal.AddRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
+import org.apache.directory.shared.ldap.message.internal.CompareRequest;
+import org.apache.directory.shared.ldap.message.internal.DeleteRequest;
+import org.apache.directory.shared.ldap.message.internal.ExtendedRequest;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.internal.ModifyRequest;
+import org.apache.directory.shared.ldap.message.internal.SearchRequest;
 import org.apache.directory.shared.ldap.name.DN;
 
 
@@ -45,7 +45,7 @@ public interface LdapAsyncConnection ext
      * @return the add operation's response
      * @throws LdapException
      */
-    AddFuture addAsync( InternalAddRequest addRequest ) throws LdapException;
+    AddFuture addAsync( AddRequest addRequest ) throws LdapException;
 
 
     /**
@@ -84,7 +84,7 @@ public interface LdapAsyncConnection ext
      * @param bindRequest The BindRequest to send
      * @return BindFuture A future
      */
-    BindFuture bindAsync( InternalBindRequest bindRequest ) throws LdapException, IOException;
+    BindFuture bindAsync( BindRequest bindRequest ) throws LdapException, IOException;
 
 
     /**
@@ -122,7 +122,7 @@ public interface LdapAsyncConnection ext
      * @param searchRequest The search request to send to the server
      * @return A Future 
      */
-    SearchFuture searchAsync( InternalSearchRequest searchRequest ) throws LdapException;
+    SearchFuture searchAsync( SearchRequest searchRequest ) throws LdapException;
 
 
     /**
@@ -133,7 +133,7 @@ public interface LdapAsyncConnection ext
      * @return the modify operation's future
      * @throws LdapException in case of modify operation failure or timeout happens
      */
-    ModifyFuture modifyAsync( InternalModifyRequest modRequest ) throws LdapException;
+    ModifyFuture modifyAsync( ModifyRequest modRequest ) throws LdapException;
 
 
     /**
@@ -145,7 +145,7 @@ public interface LdapAsyncConnection ext
      * @return modifyDn operations response, null if non-null listener is provided
      * @throws LdapException
      */
-    ModifyDnFuture modifyDnAsync( InternalModifyDnRequest modDnRequest ) throws LdapException;
+    ModifyDnFuture modifyDnAsync( ModifyDnRequest modDnRequest ) throws LdapException;
 
 
     /**
@@ -155,7 +155,7 @@ public interface LdapAsyncConnection ext
      * @return delete operation's response, null if a non-null listener value is provided
      * @throws LdapException If the DN is not valid or if the deletion failed
      */
-    DeleteFuture deleteAsync( InternalDeleteRequest delRequest ) throws LdapException;
+    DeleteFuture deleteAsync( DeleteRequest delRequest ) throws LdapException;
 
 
     /**
@@ -165,7 +165,7 @@ public interface LdapAsyncConnection ext
      * @return compare operation's future
      * @throws LdapException
      */
-    CompareFuture compareAsync( InternalCompareRequest compareRequest ) throws LdapException;
+    CompareFuture compareAsync( CompareRequest compareRequest ) throws LdapException;
 
 
     /**
@@ -175,7 +175,7 @@ public interface LdapAsyncConnection ext
      * @return extended operation's Future
      * @throws LdapException
      */
-    ExtendedFuture extendedAsync( InternalExtendedRequest extendedRequest ) throws LdapException;
+    ExtendedFuture extendedAsync( ExtendedRequest extendedRequest ) throws LdapException;
 
 
     /**

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java Wed Aug 18 00:27:16 2010
@@ -17,15 +17,15 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.internal.CompareResponse;
 import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
 import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalAbandonRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.internal.AbandonRequest;
+import org.apache.directory.shared.ldap.message.internal.AddRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
+import org.apache.directory.shared.ldap.message.internal.CompareRequest;
+import org.apache.directory.shared.ldap.message.internal.DeleteRequest;
+import org.apache.directory.shared.ldap.message.internal.ExtendedRequest;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.internal.ModifyRequest;
+import org.apache.directory.shared.ldap.message.internal.SearchRequest;
 import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
 import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
 import org.apache.directory.shared.ldap.message.internal.Response;
@@ -93,7 +93,7 @@ public interface LdapConnection
      * @return the add operation's response
      * @throws LdapException
      */
-    public abstract AddResponse add( InternalAddRequest addRequest ) throws LdapException;
+    public abstract AddResponse add( AddRequest addRequest ) throws LdapException;
 
 
     /**
@@ -114,7 +114,7 @@ public interface LdapConnection
      *
      * @param abandonRequest the abandon operation's request
      */
-    public abstract void abandon( InternalAbandonRequest abandonRequest );
+    public abstract void abandon( AbandonRequest abandonRequest );
 
 
     /**
@@ -154,7 +154,7 @@ public interface LdapConnection
      * parameters
      * @return A LdapResponse containing the result
      */
-    public abstract BindResponse bind( InternalBindRequest bindRequest ) throws LdapException, IOException;
+    public abstract BindResponse bind( BindRequest bindRequest ) throws LdapException, IOException;
 
 
     /**
@@ -206,7 +206,7 @@ public interface LdapConnection
      * @return A {@link Cursor} containing Entries and Referencs
      * @throws LdapException @TODO
      */
-    public abstract Cursor<Response> search( InternalSearchRequest searchRequest ) throws LdapException;
+    public abstract Cursor<Response> search( SearchRequest searchRequest ) throws LdapException;
 
 
     //------------------------ The LDAP operations ------------------------//
@@ -271,7 +271,7 @@ public interface LdapConnection
      * @return the modify operation's response
      * @throws LdapException in case of modify operation failure or timeout happens
      */
-    public abstract ModifyResponse modify( InternalModifyRequest modRequest ) throws LdapException;
+    public abstract ModifyResponse modify( ModifyRequest modRequest ) throws LdapException;
 
 
     /**
@@ -370,7 +370,7 @@ public interface LdapConnection
      * @return modifyDn operations response, null if non-null listener is provided
      * @throws LdapException
      */
-    public abstract ModifyDnResponse modifyDn( InternalModifyDnRequest modDnRequest ) throws LdapException;
+    public abstract ModifyDnResponse modifyDn( ModifyDnRequest modDnRequest ) throws LdapException;
 
 
     /**
@@ -398,7 +398,7 @@ public interface LdapConnection
      * @return delete operation's response, null if a non-null listener value is provided
      * @throws LdapException If the DN is not valid or if the deletion failed
      */
-    public abstract DeleteResponse delete( InternalDeleteRequest deleteRequest ) throws LdapException;
+    public abstract DeleteResponse delete( DeleteRequest deleteRequest ) throws LdapException;
 
 
     /**
@@ -486,7 +486,7 @@ public interface LdapConnection
      * @return compare operation's response
      * @throws LdapException
      */
-    public abstract CompareResponse compare( InternalCompareRequest compareRequest ) throws LdapException;
+    public abstract CompareResponse compare( CompareRequest compareRequest ) throws LdapException;
 
 
     /**
@@ -525,7 +525,7 @@ public interface LdapConnection
      * @return Extended operation's response
      * @throws LdapException If the DN is not valid or if the extended operation failed
      */
-    public abstract ExtendedResponse extended( InternalExtendedRequest extendedRequest ) throws LdapException;
+    public abstract ExtendedResponse extended( ExtendedRequest extendedRequest ) throws LdapException;
 
 
     /**

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Wed Aug 18 00:27:16 2010
@@ -87,17 +87,17 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
 import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
 import org.apache.directory.shared.ldap.message.internal.IntermediateResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalAbandonRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalMessage;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalUnbindRequest;
+import org.apache.directory.shared.ldap.message.internal.AbandonRequest;
+import org.apache.directory.shared.ldap.message.internal.AddRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
+import org.apache.directory.shared.ldap.message.internal.CompareRequest;
+import org.apache.directory.shared.ldap.message.internal.DeleteRequest;
+import org.apache.directory.shared.ldap.message.internal.ExtendedRequest;
+import org.apache.directory.shared.ldap.message.internal.Message;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.internal.ModifyRequest;
+import org.apache.directory.shared.ldap.message.internal.SearchRequest;
+import org.apache.directory.shared.ldap.message.internal.UnbindRequest;
 import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
 import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
 import org.apache.directory.shared.ldap.message.internal.Response;
@@ -541,7 +541,7 @@ public class LdapNetworkConnection exten
             throw new IllegalArgumentException( msg );
         }
 
-        InternalAddRequest addRequest = new AddRequestImpl();
+        AddRequest addRequest = new AddRequestImpl();
         addRequest.setEntry( entry );
 
         return add( addRequest );
@@ -560,7 +560,7 @@ public class LdapNetworkConnection exten
             throw new IllegalArgumentException( msg );
         }
 
-        InternalAddRequest addRequest = new AddRequestImpl();
+        AddRequest addRequest = new AddRequestImpl();
         addRequest.setEntry( entry );
 
         return addAsync( addRequest );
@@ -570,7 +570,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public AddResponse add( InternalAddRequest addRequest ) throws LdapException
+    public AddResponse add( AddRequest addRequest ) throws LdapException
     {
         AddFuture addFuture = addAsync( addRequest );
 
@@ -634,7 +634,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public AddFuture addAsync( InternalAddRequest addRequest ) throws LdapException
+    public AddFuture addAsync( AddRequest addRequest ) throws LdapException
     {
         checkSession();
 
@@ -668,7 +668,7 @@ public class LdapNetworkConnection exten
      */
     public void abandon( int messageId )
     {
-        InternalAbandonRequest abandonRequest = new AbandonRequestImpl();
+        AbandonRequest abandonRequest = new AbandonRequestImpl();
         abandonRequest.setAbandoned( messageId );
 
         abandonInternal( abandonRequest );
@@ -678,7 +678,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public void abandon( InternalAbandonRequest abandonRequest )
+    public void abandon( AbandonRequest abandonRequest )
     {
         abandonInternal( abandonRequest );
     }
@@ -687,7 +687,7 @@ public class LdapNetworkConnection exten
     /**
      * Internal AbandonRequest handling
      */
-    private void abandonInternal( InternalAbandonRequest abandonRequest )
+    private void abandonInternal( AbandonRequest abandonRequest )
     {
         LOG.debug( "-----------------------------------------------------------------" );
         LOG.debug( "Sending request \n{}", abandonRequest );
@@ -730,7 +730,7 @@ public class LdapNetworkConnection exten
         LOG.debug( "Anonymous Bind request" );
 
         // Create the BindRequest
-        InternalBindRequest bindRequest = createBindRequest( StringTools.EMPTY, StringTools.EMPTY_BYTES );
+        BindRequest bindRequest = createBindRequest( StringTools.EMPTY, StringTools.EMPTY_BYTES );
 
         return bind( bindRequest );
     }
@@ -744,7 +744,7 @@ public class LdapNetworkConnection exten
         LOG.debug( "Anonymous Bind request" );
 
         // Create the BindRequest
-        InternalBindRequest bindRequest = createBindRequest( StringTools.EMPTY, StringTools.EMPTY_BYTES );
+        BindRequest bindRequest = createBindRequest( StringTools.EMPTY, StringTools.EMPTY_BYTES );
 
         return bindAsync( bindRequest );
     }
@@ -758,7 +758,7 @@ public class LdapNetworkConnection exten
         LOG.debug( "Bind request : {}", name );
 
         // Create the BindRequest
-        InternalBindRequest bindRequest = createBindRequest( name, StringTools.getBytesUtf8( credentials ) );
+        BindRequest bindRequest = createBindRequest( name, StringTools.getBytesUtf8( credentials ) );
 
         return bind( bindRequest );
     }
@@ -772,7 +772,7 @@ public class LdapNetworkConnection exten
         LOG.debug( "Bind request : {}", name );
 
         // Create the BindRequest
-        InternalBindRequest bindRequest = createBindRequest( name, StringTools.getBytesUtf8( credentials ) );
+        BindRequest bindRequest = createBindRequest( name, StringTools.getBytesUtf8( credentials ) );
 
         return bindAsync( bindRequest );
     }
@@ -786,7 +786,7 @@ public class LdapNetworkConnection exten
         LOG.debug( "Bind request : {}", name );
 
         // Create the BindRequest
-        InternalBindRequest bindRequest = createBindRequest( name, StringTools.getBytesUtf8( credentials ), null,
+        BindRequest bindRequest = createBindRequest( name, StringTools.getBytesUtf8( credentials ), null,
             ( Control ) null );
 
         return bind( bindRequest );
@@ -801,7 +801,7 @@ public class LdapNetworkConnection exten
         LOG.debug( "Bind request : {}", name );
 
         // Create the BindRequest
-        InternalBindRequest bindRequest = createBindRequest( name, StringTools.getBytesUtf8( credentials ) );
+        BindRequest bindRequest = createBindRequest( name, StringTools.getBytesUtf8( credentials ) );
 
         return bindAsync( bindRequest );
     }
@@ -810,7 +810,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public BindResponse bind( InternalBindRequest bindRequest ) throws LdapException, IOException
+    public BindResponse bind( BindRequest bindRequest ) throws LdapException, IOException
     {
         BindFuture bindFuture = bindAsync( bindRequest );
 
@@ -960,7 +960,7 @@ public class LdapNetworkConnection exten
     /**
      * Create a Simple BindRequest ready to be sent.
      */
-    private InternalBindRequest createBindRequest( String name, byte[] credentials ) throws LdapException
+    private BindRequest createBindRequest( String name, byte[] credentials ) throws LdapException
     {
         return createBindRequest( name, credentials, null, ( Control[] ) null );
     }
@@ -969,7 +969,7 @@ public class LdapNetworkConnection exten
     /**
      * Create a Simple BindRequest ready to be sent.
      */
-    private InternalBindRequest createBindRequest( DN name, byte[] credentials ) throws LdapException
+    private BindRequest createBindRequest( DN name, byte[] credentials ) throws LdapException
     {
         return createBindRequest( name, credentials, null, ( Control[] ) null );
     }
@@ -978,7 +978,7 @@ public class LdapNetworkConnection exten
     /**
      * Create a Simple BindRequest with controls ready to be sent.
      */
-    private InternalBindRequest createBindRequest( String name, byte[] credentials, Control[] controls )
+    private BindRequest createBindRequest( String name, byte[] credentials, Control[] controls )
         throws LdapException
     {
         return createBindRequest( name, credentials, null, controls );
@@ -988,7 +988,7 @@ public class LdapNetworkConnection exten
     /**
      * Create a Simple BindRequest with controls ready to be sent.
      */
-    private InternalBindRequest createBindRequest( DN name, byte[] credentials, Control[] controls )
+    private BindRequest createBindRequest( DN name, byte[] credentials, Control[] controls )
         throws LdapException
     {
         return createBindRequest( name, credentials, null, controls );
@@ -998,7 +998,7 @@ public class LdapNetworkConnection exten
     /**
      * Create a SASL BindRequest ready to be sent.
      */
-    private InternalBindRequest createBindRequest( String name, byte[] credentials, String mechanism )
+    private BindRequest createBindRequest( String name, byte[] credentials, String mechanism )
         throws LdapException
     {
         return createBindRequest( name, credentials, mechanism, ( Control[] ) null );
@@ -1008,7 +1008,7 @@ public class LdapNetworkConnection exten
     /**
      * Create a SASL BindRequest ready to be sent.
      */
-    private InternalBindRequest createBindRequest( DN name, byte[] credentials, String mechanism ) throws LdapException
+    private BindRequest createBindRequest( DN name, byte[] credentials, String mechanism ) throws LdapException
     {
         return createBindRequest( name, credentials, mechanism, ( Control ) null );
     }
@@ -1017,7 +1017,7 @@ public class LdapNetworkConnection exten
     /**
      * Create a complete BindRequest ready to be sent.
      */
-    private InternalBindRequest createBindRequest( String name, byte[] credentials, String saslMechanism,
+    private BindRequest createBindRequest( String name, byte[] credentials, String saslMechanism,
         Control... controls ) throws LdapException
     {
         // Set the name
@@ -1041,14 +1041,14 @@ public class LdapNetworkConnection exten
     /**
      * Create a complete BindRequest ready to be sent.
      */
-    private InternalBindRequest createBindRequest( DN name, byte[] credentials, String saslMechanism,
+    private BindRequest createBindRequest( DN name, byte[] credentials, String saslMechanism,
         Control... controls ) throws LdapException
     {
         // clear the mappings if any (in case of a second call to bind() without calling unBind())
         //clearMaps();
 
         // Set the new messageId
-        InternalBindRequest bindRequest = new BindRequestImpl();
+        BindRequest bindRequest = new BindRequestImpl();
 
         // Set the version
         bindRequest.setVersion3( true );
@@ -1084,7 +1084,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public BindFuture bindAsync( InternalBindRequest bindRequest ) throws LdapException, IOException
+    public BindFuture bindAsync( BindRequest bindRequest ) throws LdapException, IOException
     {
         // First switch to anonymous state
         authenticated.set( false );
@@ -1137,7 +1137,7 @@ public class LdapNetworkConnection exten
         }
 
         // Create a new SearchRequest object
-        InternalSearchRequest searchRequest = new SearchRequestImpl();
+        SearchRequest searchRequest = new SearchRequestImpl();
 
         searchRequest.setBase( baseDn );
         searchRequest.setFilter( filter );
@@ -1167,7 +1167,7 @@ public class LdapNetworkConnection exten
         throws LdapException
     {
         // Create a new SearchRequest object
-        InternalSearchRequest searchRequest = new SearchRequestImpl();
+        SearchRequest searchRequest = new SearchRequestImpl();
 
         searchRequest.setBase( baseDn );
         searchRequest.setFilter( filter );
@@ -1193,7 +1193,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public SearchFuture searchAsync( InternalSearchRequest searchRequest ) throws LdapException
+    public SearchFuture searchAsync( SearchRequest searchRequest ) throws LdapException
     {
         // If the session has not been establish, or is closed, we get out immediately
         checkSession();
@@ -1234,7 +1234,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public Cursor<Response> search( InternalSearchRequest searchRequest ) throws LdapException
+    public Cursor<Response> search( SearchRequest searchRequest ) throws LdapException
     {
         SearchFuture searchFuture = searchAsync( searchRequest );
 
@@ -1260,7 +1260,7 @@ public class LdapNetworkConnection exten
         int newId = messageId.incrementAndGet();
 
         // Create the UnbindRequest
-        InternalUnbindRequest unbindRequest = new UnbindRequestImpl( newId );
+        UnbindRequest unbindRequest = new UnbindRequestImpl( newId );
 
         LOG.debug( "-----------------------------------------------------------------" );
         LOG.debug( "Sending Unbind request \n{}", unbindRequest );
@@ -1344,7 +1344,7 @@ public class LdapNetworkConnection exten
     public void messageReceived( IoSession session, Object message ) throws Exception
     {
         // Feed the response and store it into the session
-        InternalMessage response = ( InternalMessage ) message;
+        Message response = ( Message ) message;
         LOG.debug( "-------> {} Message received <-------", response );
         int messageId = response.getMessageId();
 
@@ -1726,7 +1726,7 @@ public class LdapNetworkConnection exten
             throw new IllegalArgumentException( "Entry to be modified cannot be null" );
         }
 
-        InternalModifyRequest modReq = new ModifyRequestImpl();
+        ModifyRequest modReq = new ModifyRequestImpl();
         modReq.setName( entry.getDn() );
 
         Iterator<EntryAttribute> itr = entry.iterator();
@@ -1750,7 +1750,7 @@ public class LdapNetworkConnection exten
             throw new IllegalArgumentException( "The DN to be modified cannot be null" );
         }
 
-        InternalModifyRequest modReq = new ModifyRequestImpl();
+        ModifyRequest modReq = new ModifyRequestImpl();
         modReq.setName( dn );
 
         for ( Modification modification : modifications )
@@ -1774,7 +1774,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public ModifyResponse modify( InternalModifyRequest modRequest ) throws LdapException
+    public ModifyResponse modify( ModifyRequest modRequest ) throws LdapException
     {
         ModifyFuture modifyFuture = modifyAsync( modRequest );
 
@@ -1838,7 +1838,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public ModifyFuture modifyAsync( InternalModifyRequest modRequest ) throws LdapException
+    public ModifyFuture modifyAsync( ModifyRequest modRequest ) throws LdapException
     {
         checkSession();
 
@@ -1905,7 +1905,7 @@ public class LdapNetworkConnection exten
      */
     public ModifyDnResponse rename( DN entryDn, RDN newRdn, boolean deleteOldRdn ) throws LdapException
     {
-        InternalModifyDnRequest modDnRequest = new ModifyDnRequestImpl();
+        ModifyDnRequest modDnRequest = new ModifyDnRequestImpl();
         modDnRequest.setName( entryDn );
         modDnRequest.setNewRdn( newRdn );
         modDnRequest.setDeleteOldRdn( deleteOldRdn );
@@ -1936,7 +1936,7 @@ public class LdapNetworkConnection exten
      */
     public ModifyDnResponse move( DN entryDn, DN newSuperiorDn ) throws LdapException
     {
-        InternalModifyDnRequest modDnRequest = new ModifyDnRequestImpl();
+        ModifyDnRequest modDnRequest = new ModifyDnRequestImpl();
         modDnRequest.setName( entryDn );
         modDnRequest.setNewSuperior( newSuperiorDn );
 
@@ -2000,7 +2000,7 @@ public class LdapNetworkConnection exten
         }
 
         // Create the request
-        InternalModifyDnRequest modDnRequest = new ModifyDnRequestImpl();
+        ModifyDnRequest modDnRequest = new ModifyDnRequestImpl();
         modDnRequest.setName( entryDn );
         modDnRequest.setNewRdn( newDn.getRdn() );
         modDnRequest.setNewSuperior( newDn.getParent() );
@@ -2026,7 +2026,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public ModifyDnResponse modifyDn( InternalModifyDnRequest modDnRequest ) throws LdapException
+    public ModifyDnResponse modifyDn( ModifyDnRequest modDnRequest ) throws LdapException
     {
         ModifyDnFuture modifyDnFuture = modifyDnAsync( modDnRequest );
 
@@ -2090,7 +2090,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public ModifyDnFuture modifyDnAsync( InternalModifyDnRequest modDnRequest ) throws LdapException
+    public ModifyDnFuture modifyDnAsync( ModifyDnRequest modDnRequest ) throws LdapException
     {
         checkSession();
 
@@ -2131,7 +2131,7 @@ public class LdapNetworkConnection exten
      */
     public DeleteResponse delete( DN dn ) throws LdapException
     {
-        InternalDeleteRequest deleteRequest = new DeleteRequestImpl();
+        DeleteRequest deleteRequest = new DeleteRequestImpl();
         deleteRequest.setName( dn );
 
         return delete( deleteRequest );
@@ -2151,7 +2151,7 @@ public class LdapNetworkConnection exten
 
         if ( isControlSupported( treeDeleteOid ) )
         {
-            InternalDeleteRequest deleteRequest = new DeleteRequestImpl();
+            DeleteRequest deleteRequest = new DeleteRequestImpl();
             deleteRequest.setName( dn );
             deleteRequest.addControl( new ControlImpl( treeDeleteOid ) );
             return delete( deleteRequest );
@@ -2182,7 +2182,7 @@ public class LdapNetworkConnection exten
 
             if ( isControlSupported( treeDeleteOid ) )
             {
-                InternalDeleteRequest deleteRequest = new DeleteRequestImpl();
+                DeleteRequest deleteRequest = new DeleteRequestImpl();
                 deleteRequest.setName( newDn );
                 deleteRequest.addControl( new ControlImpl( treeDeleteOid ) );
                 return delete( deleteRequest );
@@ -2262,7 +2262,7 @@ public class LdapNetworkConnection exten
                 LOG.debug( "deleting {}", dn.getName() );
                 cursorMap.remove( dn );
                 cursor.close();
-                InternalDeleteRequest deleteRequest = new DeleteRequestImpl();
+                DeleteRequest deleteRequest = new DeleteRequestImpl();
                 deleteRequest.setName( dn );
                 delResponse = delete( deleteRequest );
             }
@@ -2283,7 +2283,7 @@ public class LdapNetworkConnection exten
                 cursorMap.remove( dn );
                 cursor.close();
                 LOG.debug( "deleting {}", dn.getName() );
-                InternalDeleteRequest deleteRequest = new DeleteRequestImpl();
+                DeleteRequest deleteRequest = new DeleteRequestImpl();
                 deleteRequest.setName( dn );
                 delResponse = delete( deleteRequest );
             }
@@ -2302,7 +2302,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public DeleteResponse delete( InternalDeleteRequest deleteRequest ) throws LdapException
+    public DeleteResponse delete( DeleteRequest deleteRequest ) throws LdapException
     {
         DeleteFuture deleteFuture = deleteAsync( deleteRequest );
 
@@ -2366,7 +2366,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public DeleteFuture deleteAsync( InternalDeleteRequest delRequest ) throws LdapException
+    public DeleteFuture deleteAsync( DeleteRequest delRequest ) throws LdapException
     {
         checkSession();
 
@@ -2426,7 +2426,7 @@ public class LdapNetworkConnection exten
      */
     public CompareResponse compare( DN dn, String attributeName, String value ) throws LdapException
     {
-        InternalCompareRequest compareRequest = new CompareRequestImpl();
+        CompareRequest compareRequest = new CompareRequestImpl();
         compareRequest.setName( dn );
         compareRequest.setAttributeId( attributeName );
         compareRequest.setAssertionValue( value );
@@ -2440,7 +2440,7 @@ public class LdapNetworkConnection exten
      */
     public CompareResponse compare( DN dn, String attributeName, byte[] value ) throws LdapException
     {
-        InternalCompareRequest compareRequest = new CompareRequestImpl();
+        CompareRequest compareRequest = new CompareRequestImpl();
         compareRequest.setName( dn );
         compareRequest.setAttributeId( attributeName );
         compareRequest.setAssertionValue( value );
@@ -2454,7 +2454,7 @@ public class LdapNetworkConnection exten
      */
     public CompareResponse compare( DN dn, String attributeName, Value<?> value ) throws LdapException
     {
-        InternalCompareRequest compareRequest = new CompareRequestImpl();
+        CompareRequest compareRequest = new CompareRequestImpl();
         compareRequest.setName( dn );
         compareRequest.setAttributeId( attributeName );
 
@@ -2474,7 +2474,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public CompareResponse compare( InternalCompareRequest compareRequest ) throws LdapException
+    public CompareResponse compare( CompareRequest compareRequest ) throws LdapException
     {
         CompareFuture compareFuture = compareAsync( compareRequest );
 
@@ -2538,7 +2538,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public CompareFuture compareAsync( InternalCompareRequest compareRequest ) throws LdapException
+    public CompareFuture compareAsync( CompareRequest compareRequest ) throws LdapException
     {
         checkSession();
 
@@ -2607,7 +2607,7 @@ public class LdapNetworkConnection exten
      */
     public ExtendedResponse extended( OID oid, byte[] value ) throws LdapException
     {
-        InternalExtendedRequest extendedRequest = new ExtendedRequestImpl();
+        ExtendedRequest extendedRequest = new ExtendedRequestImpl();
         extendedRequest.setRequestName( oid.toString() );
         extendedRequest.setRequestValue( value );
 
@@ -2618,7 +2618,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public ExtendedResponse extended( InternalExtendedRequest extendedRequest ) throws LdapException
+    public ExtendedResponse extended( ExtendedRequest extendedRequest ) throws LdapException
     {
         ExtendedFuture extendedFuture = extendedAsync( extendedRequest );
 
@@ -2683,7 +2683,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public ExtendedFuture extendedAsync( InternalExtendedRequest extendedRequest ) throws LdapException
+    public ExtendedFuture extendedAsync( ExtendedRequest extendedRequest ) throws LdapException
     {
         checkSession();
 
@@ -2957,7 +2957,7 @@ public class LdapNetworkConnection exten
     }
 
 
-    private void addControls( InternalMessage codec, InternalMessage message )
+    private void addControls( Message codec, Message message )
     {
         Map<String, Control> controls = codec.getControls();
 

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java Wed Aug 18 00:27:16 2010
@@ -27,7 +27,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.TLVStateEnum;
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.message.internal.InternalMessage;
+import org.apache.directory.shared.ldap.message.internal.Message;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.session.IoSession;
@@ -89,7 +89,7 @@ public class LdapProtocolDecoder impleme
                 if ( ldapMessageContainer.getState() == TLVStateEnum.PDU_DECODED )
                 {
                     // get back the decoded message
-                    InternalMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalMessage();
+                    Message message = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalMessage();
 
                     if ( IS_DEBUG )
                     {

Modified: directory/shared/branches/shared-codec-merge/ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/JndiUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/JndiUtils.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/JndiUtils.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/JndiUtils.java Wed Aug 18 00:27:16 2010
@@ -79,7 +79,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.MessageException;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
 import org.apache.directory.shared.ldap.message.internal.LdapResult;
 import org.apache.directory.shared.ldap.message.internal.ResultResponse;
 import org.apache.directory.shared.ldap.name.DN;
@@ -160,7 +159,8 @@ public class JndiUtils
      * @param request
      * @return
      */
-    public static ExtendedResponse toJndiExtendedResponse( final InternalExtendedRequest request )
+    public static ExtendedResponse toJndiExtendedResponse(
+        final org.apache.directory.shared.ldap.message.internal.ExtendedRequest request )
     {
         class JndiExtendedResponse implements ExtendedResponse
         {
@@ -180,7 +180,8 @@ public class JndiUtils
     }
 
 
-    public static ExtendedRequest toJndiExtendedRequest( final InternalExtendedRequest request )
+    public static ExtendedRequest toJndiExtendedRequest(
+        final org.apache.directory.shared.ldap.message.internal.ExtendedRequest request )
     {
         class JndiExtendedRequest implements ExtendedRequest
         {
@@ -355,9 +356,10 @@ public class JndiUtils
     }
 
 
-    public static InternalExtendedRequest fromJndiExtendedRequest( final ExtendedRequest request )
+    public static org.apache.directory.shared.ldap.message.internal.ExtendedRequest fromJndiExtendedRequest(
+        final ExtendedRequest request )
     {
-        class ServerExtendedRequest implements InternalExtendedRequest
+        class ServerExtendedRequest implements org.apache.directory.shared.ldap.message.internal.ExtendedRequest
         {
             public org.apache.directory.shared.ldap.message.internal.ExtendedResponse createExtendedResponse(
                 String id, byte[] berValue, int offset, int length ) throws NamingException

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java Wed Aug 18 00:27:16 2010
@@ -29,7 +29,7 @@ import java.nio.channels.WritableByteCha
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.asn1.codec.stateful.EncoderCallback;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.message.internal.InternalMessage;
+import org.apache.directory.shared.ldap.message.internal.Message;
 import org.apache.directory.shared.ldap.message.spi.Provider;
 import org.apache.directory.shared.ldap.message.spi.ProviderEncoder;
 import org.apache.directory.shared.ldap.message.spi.ProviderException;
@@ -209,10 +209,10 @@ public class LdapEncoder implements Prov
     public void encode( Object request ) throws EncoderException
     {
         //TM long t0 = System.nanoTime();
-        InternalMessage message = ( InternalMessage ) request;
+        Message message = ( Message ) request;
         ByteBuffer encoded = null;
 
-        LdapMessageCodec ldapRequest = ( LdapMessageCodec ) LdapTransformer.transform( ( InternalMessage ) request );
+        LdapMessageCodec ldapRequest = ( LdapMessageCodec ) LdapTransformer.transform( ( Message ) request );
         encoded = ldapRequest.encode();
 
         encoded.flip();

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java Wed Aug 18 00:27:16 2010
@@ -28,17 +28,17 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
 import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
 import org.apache.directory.shared.ldap.message.internal.IntermediateResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalAbandonRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalMessage;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalUnbindRequest;
+import org.apache.directory.shared.ldap.message.internal.AbandonRequest;
+import org.apache.directory.shared.ldap.message.internal.AddRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
+import org.apache.directory.shared.ldap.message.internal.CompareRequest;
+import org.apache.directory.shared.ldap.message.internal.DeleteRequest;
+import org.apache.directory.shared.ldap.message.internal.ExtendedRequest;
+import org.apache.directory.shared.ldap.message.internal.Message;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.internal.ModifyRequest;
+import org.apache.directory.shared.ldap.message.internal.SearchRequest;
+import org.apache.directory.shared.ldap.message.internal.UnbindRequest;
 import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
 import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
 import org.apache.directory.shared.ldap.message.internal.SearchResultDone;
@@ -60,7 +60,7 @@ public class LdapMessageContainer extend
     // ----------------------------------------------------------------------------
 
     /** The internal ldap message */
-    private InternalMessage internalMessage;
+    private Message internalMessage;
 
     /** checks if attribute is binary */
     private final BinaryAttributeDetector binaryAttributeDetector;
@@ -112,7 +112,7 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the ldapMessage.
      */
-    public InternalMessage getInternalMessage()
+    public Message getInternalMessage()
     {
         return internalMessage;
     }
@@ -121,18 +121,18 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the AbandonRequest stored in the container
      */
-    public InternalAbandonRequest getAbandonRequest()
+    public AbandonRequest getAbandonRequest()
     {
-        return ( InternalAbandonRequest ) internalMessage;
+        return ( AbandonRequest ) internalMessage;
     }
 
 
     /**
      * @return Returns the AddRequest stored in the container
      */
-    public InternalAddRequest getAddRequest()
+    public AddRequest getAddRequest()
     {
-        return ( InternalAddRequest ) internalMessage;
+        return ( AddRequest ) internalMessage;
     }
 
 
@@ -148,9 +148,9 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the BindRequest stored in the container
      */
-    public InternalBindRequest getBindRequest()
+    public BindRequest getBindRequest()
     {
-        return ( InternalBindRequest ) internalMessage;
+        return ( BindRequest ) internalMessage;
     }
 
 
@@ -166,9 +166,9 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the CompareRequest stored in the container
      */
-    public InternalCompareRequest getCompareRequest()
+    public CompareRequest getCompareRequest()
     {
-        return ( InternalCompareRequest ) internalMessage;
+        return ( CompareRequest ) internalMessage;
     }
 
 
@@ -184,9 +184,9 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the DelRequest stored in the container
      */
-    public InternalDeleteRequest getDeleteRequest()
+    public DeleteRequest getDeleteRequest()
     {
-        return ( InternalDeleteRequest ) internalMessage;
+        return ( DeleteRequest ) internalMessage;
     }
 
 
@@ -202,9 +202,9 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the ExtendedRequest stored in the container
      */
-    public InternalExtendedRequest getExtendedRequest()
+    public ExtendedRequest getExtendedRequest()
     {
-        return ( InternalExtendedRequest ) internalMessage;
+        return ( ExtendedRequest ) internalMessage;
     }
 
 
@@ -229,9 +229,9 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the ModifyRequest stored in the container
      */
-    public InternalModifyRequest getModifyRequest()
+    public ModifyRequest getModifyRequest()
     {
-        return ( InternalModifyRequest ) internalMessage;
+        return ( ModifyRequest ) internalMessage;
     }
 
 
@@ -247,9 +247,9 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the ModifyDnRequest stored in the container
      */
-    public InternalModifyDnRequest getModifyDnRequest()
+    public ModifyDnRequest getModifyDnRequest()
     {
-        return ( InternalModifyDnRequest ) internalMessage;
+        return ( ModifyDnRequest ) internalMessage;
     }
 
 
@@ -265,9 +265,9 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the SearchRequest stored in the container
      */
-    public InternalSearchRequest getSearchRequest()
+    public SearchRequest getSearchRequest()
     {
-        return ( InternalSearchRequest ) internalMessage;
+        return ( SearchRequest ) internalMessage;
     }
 
 
@@ -301,9 +301,9 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the UnbindRequest stored in the container
      */
-    public InternalUnbindRequest getUnbindRequest()
+    public UnbindRequest getUnbindRequest()
     {
-        return ( InternalUnbindRequest ) internalMessage;
+        return ( UnbindRequest ) internalMessage;
     }
 
 
@@ -313,7 +313,7 @@ public class LdapMessageContainer extend
      * 
      * @param internalMessage The message to set.
      */
-    public void setInternalMessage( InternalMessage internalMessage )
+    public void setInternalMessage( Message internalMessage )
     {
         this.internalMessage = internalMessage;
     }

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Wed Aug 18 00:27:16 2010
@@ -108,18 +108,18 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
 import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
 import org.apache.directory.shared.ldap.message.internal.IntermediateResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalAbandonRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalMessage;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalReferral;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalUnbindRequest;
+import org.apache.directory.shared.ldap.message.internal.AbandonRequest;
+import org.apache.directory.shared.ldap.message.internal.AddRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
+import org.apache.directory.shared.ldap.message.internal.CompareRequest;
+import org.apache.directory.shared.ldap.message.internal.DeleteRequest;
+import org.apache.directory.shared.ldap.message.internal.ExtendedRequest;
+import org.apache.directory.shared.ldap.message.internal.Message;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.internal.ModifyRequest;
+import org.apache.directory.shared.ldap.message.internal.Referral;
+import org.apache.directory.shared.ldap.message.internal.SearchRequest;
+import org.apache.directory.shared.ldap.message.internal.UnbindRequest;
 import org.apache.directory.shared.ldap.message.internal.LdapResult;
 import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
 import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
@@ -303,7 +303,7 @@ public class LdapMessageGrammar extends 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
                     // Create the UnbindRequest LdapMessage instance and store it in the container
-                    InternalUnbindRequest unbindRequest = new UnbindRequestImpl( ldapMessageContainer.getMessageId() );
+                    UnbindRequest unbindRequest = new UnbindRequestImpl( ldapMessageContainer.getMessageId() );
                     ldapMessageContainer.setInternalMessage( unbindRequest );
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -350,7 +350,7 @@ public class LdapMessageGrammar extends 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
                     // Create the DeleteRequest LdapMessage instance and store it in the container
-                    InternalDeleteRequest delRequest = new DeleteRequestImpl( ldapMessageContainer.getMessageId() );
+                    DeleteRequest delRequest = new DeleteRequestImpl( ldapMessageContainer.getMessageId() );
                     ldapMessageContainer.setInternalMessage( delRequest );
 
                     // And store the DN into it
@@ -426,7 +426,7 @@ public class LdapMessageGrammar extends 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
                     // Create the AbandonRequest LdapMessage instance and store it in the container
-                    InternalAbandonRequest abandonRequest = new AbandonRequestImpl( ldapMessageContainer.getMessageId() );
+                    AbandonRequest abandonRequest = new AbandonRequestImpl( ldapMessageContainer.getMessageId() );
                     ldapMessageContainer.setInternalMessage( abandonRequest );
 
                     // The current TLV should be a integer
@@ -499,7 +499,7 @@ public class LdapMessageGrammar extends 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
                     // Create the BindRequest LdapMessage instance and store it in the container
-                    InternalBindRequest bindRequest = new BindRequestImpl( ldapMessageContainer.getMessageId() );
+                    BindRequest bindRequest = new BindRequestImpl( ldapMessageContainer.getMessageId() );
                     ldapMessageContainer.setInternalMessage( bindRequest );
 
                     // We will check that the request is not null
@@ -531,7 +531,7 @@ public class LdapMessageGrammar extends 
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
+                    BindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
 
                     // The current TLV should be a integer between 1 and 127
                     // We get it and store it in Version
@@ -577,7 +577,7 @@ public class LdapMessageGrammar extends 
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
+                    BindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
 
                     // Get the Value and store it in the BindRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -637,7 +637,7 @@ public class LdapMessageGrammar extends 
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
+                    BindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // Allocate the Authentication Object
@@ -695,7 +695,7 @@ public class LdapMessageGrammar extends 
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
+                    BindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // We will check that the sasl is not null
@@ -734,7 +734,7 @@ public class LdapMessageGrammar extends 
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
+                    BindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // We have to handle the special case of a 0 length
@@ -774,7 +774,7 @@ public class LdapMessageGrammar extends 
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
+                    BindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
 
                     // Get the Value and store it in the BindRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -1032,10 +1032,10 @@ public class LdapMessageGrammar extends 
                         throw new DecoderException( msg );
                     }
 
-                    InternalMessage response = ldapMessageContainer.getInternalMessage();
+                    Message response = ldapMessageContainer.getInternalMessage();
                     LdapResult ldapResult = ( ( ResultResponse ) response ).getLdapResult();
 
-                    InternalReferral referral = new ReferralImpl();
+                    Referral referral = new ReferralImpl();
 
                     ldapResult.setReferral( referral );
                 }
@@ -1419,7 +1419,7 @@ public class LdapMessageGrammar extends 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
                     // Now, we can allocate the ModifyRequest Object
-                    InternalModifyRequest modifyRequest = new ModifyRequestImpl( ldapMessageContainer.getMessageId() );
+                    ModifyRequest modifyRequest = new ModifyRequestImpl( ldapMessageContainer.getMessageId() );
                     ldapMessageContainer.setInternalMessage( modifyRequest );
                 }
             } );
@@ -1440,7 +1440,7 @@ public class LdapMessageGrammar extends 
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalModifyRequest modifyRequest = ldapMessageContainer.getModifyRequest();
+                    ModifyRequest modifyRequest = ldapMessageContainer.getModifyRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -1523,7 +1523,7 @@ public class LdapMessageGrammar extends 
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalModifyRequest modifyRequest = ldapMessageContainer.getModifyRequest();
+                    ModifyRequest modifyRequest = ldapMessageContainer.getModifyRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -1605,7 +1605,7 @@ public class LdapMessageGrammar extends 
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalModifyRequest modifyRequest = ldapMessageContainer.getModifyRequest();
+                    ModifyRequest modifyRequest = ldapMessageContainer.getModifyRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -1830,7 +1830,7 @@ public class LdapMessageGrammar extends 
 
                     // Now, we can allocate the AddRequest Object
                     int messageId = ldapMessageContainer.getMessageId();
-                    InternalAddRequest addRequest = new AddRequestImpl( messageId );
+                    AddRequest addRequest = new AddRequestImpl( messageId );
                     ldapMessageContainer.setInternalMessage( addRequest );
 
                     // We will check that the request is not null
@@ -1863,7 +1863,7 @@ public class LdapMessageGrammar extends 
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalAddRequest addRequest = ldapMessageContainer.getAddRequest();
+                    AddRequest addRequest = ldapMessageContainer.getAddRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -1948,7 +1948,7 @@ public class LdapMessageGrammar extends 
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalAddRequest addRequest = ldapMessageContainer.getAddRequest();
+                    AddRequest addRequest = ldapMessageContainer.getAddRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -2145,7 +2145,7 @@ public class LdapMessageGrammar extends 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
                     // Now, we can allocate the ModifyDNRequest Object
-                    InternalModifyDnRequest modifyDnRequest = new ModifyDnRequestImpl( ldapMessageContainer
+                    ModifyDnRequest modifyDnRequest = new ModifyDnRequestImpl( ldapMessageContainer
                         .getMessageId() );
                     ldapMessageContainer.setInternalMessage( modifyDnRequest );
 
@@ -2169,7 +2169,7 @@ public class LdapMessageGrammar extends 
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    InternalModifyDnRequest modifyDNRequest = ldapMessageContainer.getModifyDnRequest();
+                    ModifyDnRequest modifyDNRequest = ldapMessageContainer.getModifyDnRequest();
 
                     // Get the Value and store it in the modifyDNRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2232,7 +2232,7 @@ public class LdapMessageGrammar extends 
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    InternalModifyDnRequest modifyDnRequest = ldapMessageContainer.getModifyDnRequest();
+                    ModifyDnRequest modifyDnRequest = ldapMessageContainer.getModifyDnRequest();
 
                     // Get the Value and store it in the modifyDNRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2297,7 +2297,7 @@ public class LdapMessageGrammar extends 
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalModifyDnRequest modifyDnRequest = ldapMessageContainer.getModifyDnRequest();
+                    ModifyDnRequest modifyDnRequest = ldapMessageContainer.getModifyDnRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -2354,7 +2354,7 @@ public class LdapMessageGrammar extends 
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalModifyDnRequest modifyDnRequest = ldapMessageContainer.getModifyDnRequest();
+                    ModifyDnRequest modifyDnRequest = ldapMessageContainer.getModifyDnRequest();
 
                     // Get the Value and store it in the modifyDNRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2494,7 +2494,7 @@ public class LdapMessageGrammar extends 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
                     // Now, we can allocate the CompareRequest Object
-                    InternalCompareRequest compareRequest = new CompareRequestImpl( ldapMessageContainer.getMessageId() );
+                    CompareRequest compareRequest = new CompareRequestImpl( ldapMessageContainer.getMessageId() );
                     ldapMessageContainer.setInternalMessage( compareRequest );
 
                     log.debug( "Compare Request" );
@@ -2517,7 +2517,7 @@ public class LdapMessageGrammar extends 
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalCompareRequest compareRequest = ldapMessageContainer.getCompareRequest();
+                    CompareRequest compareRequest = ldapMessageContainer.getCompareRequest();
 
                     // Get the Value and store it in the CompareRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2593,7 +2593,7 @@ public class LdapMessageGrammar extends 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
                     // Get the CompareRequest Object
-                    InternalCompareRequest compareRequest = ldapMessageContainer.getCompareRequest();
+                    CompareRequest compareRequest = ldapMessageContainer.getCompareRequest();
 
                     // Get the Value and store it in the CompareRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2640,7 +2640,7 @@ public class LdapMessageGrammar extends 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
                     // Get the CompareRequest Object
-                    InternalCompareRequest compareRequest = ldapMessageContainer.getCompareRequest();
+                    CompareRequest compareRequest = ldapMessageContainer.getCompareRequest();
 
                     // Get the Value and store it in the CompareRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2814,7 +2814,7 @@ public class LdapMessageGrammar extends 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
                     // Now, we can allocate the ExtendedRequest Object
-                    InternalExtendedRequest extendedRequest = new ExtendedRequestImpl( ldapMessageContainer
+                    ExtendedRequest extendedRequest = new ExtendedRequestImpl( ldapMessageContainer
                         .getMessageId() );
                     ldapMessageContainer.setInternalMessage( extendedRequest );
 
@@ -2839,7 +2839,7 @@ public class LdapMessageGrammar extends 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
                     // We can allocate the ExtendedRequest Object
-                    InternalExtendedRequest extendedRequest = ldapMessageContainer.getExtendedRequest();
+                    ExtendedRequest extendedRequest = ldapMessageContainer.getExtendedRequest();
 
                     // Get the Value and store it in the ExtendedRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2914,7 +2914,7 @@ public class LdapMessageGrammar extends 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
                     // We can allocate the ExtendedRequest Object
-                    InternalExtendedRequest extendedRequest = ldapMessageContainer.getExtendedRequest();
+                    ExtendedRequest extendedRequest = ldapMessageContainer.getExtendedRequest();
 
                     // Get the Value and store it in the ExtendedRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -3448,7 +3448,7 @@ public class LdapMessageGrammar extends 
                         throw new DecoderException( I18n.err( I18n.ERR_04099, oidValue ) );
                     }
 
-                    InternalMessage message = ldapMessageContainer.getInternalMessage();
+                    Message message = ldapMessageContainer.getInternalMessage();
 
                     Control control = ControlEnum.getControl( oidValue );
 
@@ -3492,7 +3492,7 @@ public class LdapMessageGrammar extends 
                     // Get the current control
                     Control control = null;
 
-                    InternalMessage message = ldapMessageContainer.getInternalMessage();
+                    Message message = ldapMessageContainer.getInternalMessage();
                     control = message.getCurrentControl();
 
                     // Store the criticality
@@ -3602,7 +3602,7 @@ public class LdapMessageGrammar extends 
                     // Now, we can allocate the SearchRequest Object
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
-                    InternalSearchRequest searchRequest = new SearchRequestImpl( ldapMessageContainer.getMessageId() );
+                    SearchRequest searchRequest = new SearchRequestImpl( ldapMessageContainer.getMessageId() );
                     ( ( SearchRequestImpl ) searchRequest ).setTlvId( tlv.getId() );
                     ldapMessageContainer.setInternalMessage( searchRequest );
 
@@ -3625,7 +3625,7 @@ public class LdapMessageGrammar extends 
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
+                    SearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -3683,7 +3683,7 @@ public class LdapMessageGrammar extends 
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
+                    SearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -3746,7 +3746,7 @@ public class LdapMessageGrammar extends 
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
+                    SearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -3809,7 +3809,7 @@ public class LdapMessageGrammar extends 
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
+                    SearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -3855,7 +3855,7 @@ public class LdapMessageGrammar extends 
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
+                    SearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -3902,7 +3902,7 @@ public class LdapMessageGrammar extends 
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
+                    SearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -5043,7 +5043,7 @@ public class LdapMessageGrammar extends 
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
+                    SearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -5118,7 +5118,7 @@ public class LdapMessageGrammar extends 
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
+                    SearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -6040,7 +6040,7 @@ public class LdapMessageGrammar extends 
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
+                    SearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -6167,7 +6167,7 @@ public class LdapMessageGrammar extends 
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
+                    SearchRequest searchRequest = ldapMessageContainer.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java Wed Aug 18 00:27:16 2010
@@ -50,7 +50,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.SimpleNode;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalMessage;
+import org.apache.directory.shared.ldap.message.internal.Message;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -365,11 +365,11 @@ public class LdapTransformer
      * @param obj the object to transform
      * @return the object transformed
      */
-    public static InternalMessage transform( Object obj )
+    public static Message transform( Object obj )
     {
-        if ( obj instanceof InternalMessage )
+        if ( obj instanceof Message )
         {
-            return ( InternalMessage ) obj;
+            return ( Message ) obj;
         }
 
         LdapMessageCodec codecMessage = ( LdapMessageCodec ) obj;
@@ -381,7 +381,7 @@ public class LdapTransformer
                 + "> from Codec to nternal." );
         }
 
-        InternalMessage internalMessage = null;
+        Message internalMessage = null;
 
         MessageTypeEnum messageType = codecMessage.getMessageType();
 
@@ -422,7 +422,7 @@ public class LdapTransformer
      * @return the msg transformed
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "NP_NULL_ON_SOME_PATH", justification = "The number of Ldap Message we are dealing with is finite, and we won't ever have to deal with any other unexpected one")
-    public static Object transform( InternalMessage msg )
+    public static Object transform( Message msg )
     {
         if ( IS_DEBUG )
         {
@@ -454,7 +454,7 @@ public class LdapTransformer
      * @param codecMessage the Codec message
      * @param msg the Internal message
      */
-    private static void transformControlsCodecToInternal( LdapMessageCodec codecMessage, InternalMessage internalMessage )
+    private static void transformControlsCodecToInternal( LdapMessageCodec codecMessage, Message internalMessage )
     {
         if ( codecMessage.getControls() == null )
         {
@@ -473,7 +473,7 @@ public class LdapTransformer
      * @param codecMessage The Codec SearchResultReference to produce
      * @param msg The incoming Internal Message
      */
-    private static void transformControlsInternalToCodec( LdapMessageCodec codecMessage, InternalMessage internalMessage )
+    private static void transformControlsInternalToCodec( LdapMessageCodec codecMessage, Message internalMessage )
     {
         if ( internalMessage.getControls() == null )
         {

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java Wed Aug 18 00:27:16 2010
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
 
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalMessage;
+import org.apache.directory.shared.ldap.message.internal.Message;
 import org.apache.directory.shared.ldap.message.internal.ResultResponse;
 import org.apache.directory.shared.ldap.name.DN;
 
@@ -44,7 +44,7 @@ public class ResponseCarryingException e
     private static final long serialVersionUID = 1L;
 
     /** The response with the error cause */
-    private transient InternalMessage response;
+    private transient Message response;
     
     /**
      * Creates a DecoderException
@@ -79,7 +79,7 @@ public class ResponseCarryingException e
      * Set a response if we get an exception while parsing the message
      * @param response the constructed response
      */
-    public void setResponse( InternalMessage response ) 
+    public void setResponse( Message response ) 
     {
         this.response = response;
     }
@@ -88,7 +88,7 @@ public class ResponseCarryingException e
      * Get the constructed response
      * @return The constructed response
      */
-    public InternalMessage getResponse()
+    public Message getResponse()
     {
         return response;
     }



Mime
View raw message