directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r760984 [1/3] - in /directory/shared/branches/shared-replication/ldap/src: main/java/org/apache/directory/shared/ldap/codec/ main/java/org/apache/directory/shared/ldap/codec/actions/ main/java/org/apache/directory/shared/ldap/codec/search/ ...
Date Wed, 01 Apr 2009 17:51:46 GMT
Author: elecharny
Date: Wed Apr  1 17:51:40 2009
New Revision: 760984

URL: http://svn.apache.org/viewvc?rev=760984&view=rev
Log:
Renamed some more messages classes to InternalXXX

Added:
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java
      - copied, changed from r760802, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalAbstractMessage.java
      - copied, changed from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalAbstractRequest.java
      - copied, changed from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractRequest.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalAbstractResponse.java
      - copied, changed from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractResponse.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalAbstractResultResponse.java
      - copied, changed from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractResultResponse.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalLdapResult.java
      - copied, changed from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResult.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalMessage.java
      - copied, changed from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/Message.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalRequest.java
      - copied, changed from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/Request.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalResponse.java
      - copied, changed from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/Response.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalResultResponse.java
      - copied, changed from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultResponse.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalResultResponseRequest.java
      - copied, changed from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultResponseRequest.java
Removed:
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractRequest.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractResponse.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractResultResponse.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResult.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/Message.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/Request.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/Response.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultResponse.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultResponseRequest.java
Modified:
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageCodec.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreAnyAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreFinalAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreMatchValueAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreTypeMatchingRuleAction.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonableRequest.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractAbandonableRequest.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalAbandonRequest.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalAddResponse.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalBindResponse.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalCompareResponse.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalDeleteResponse.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalExtendedResponse.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalModifyDnResponse.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalModifyResponse.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalSearchResponseDone.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalSearchResponseEntry.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalSearchResponseReference.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalUnbindRequest.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ManyReplyRequest.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageEncoder.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponseImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponseImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/SingleReplyRequest.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequestImpl.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageCodec.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageCodec.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageCodec.java Wed Apr  1 17:51:40 2009
@@ -48,7 +48,7 @@
 import org.apache.directory.shared.ldap.codec.modify.ModifyResponse;
 import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNRequest;
 import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNResponse;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 import org.apache.directory.shared.ldap.codec.search.SearchResultDone;
 import org.apache.directory.shared.ldap.codec.search.SearchResultEntry;
 import org.apache.directory.shared.ldap.codec.search.SearchResultReference;
@@ -493,9 +493,9 @@
      * 
      * @return Returns the SearchRequest ldapObject.
      */
-    public SearchRequest getSearchRequest()
+    public SearchRequestCodec getSearchRequest()
     {
-        return ( SearchRequest ) protocolOp;
+        return ( SearchRequestCodec ) protocolOp;
     }
 
 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Wed Apr  1 17:51:40 2009
@@ -89,7 +89,7 @@
 import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNRequest;
 import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNResponse;
 import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 import org.apache.directory.shared.ldap.codec.search.SearchResultDone;
 import org.apache.directory.shared.ldap.codec.search.SearchResultEntry;
 import org.apache.directory.shared.ldap.codec.search.SearchResultReference;
@@ -3687,7 +3687,7 @@
 
                     // Now, we can allocate the SearchRequest
                     // And we associate it to the ldapMessage Object
-                    ldapMessage.setProtocolOP( new SearchRequest() );
+                    ldapMessage.setProtocolOP( new SearchRequestCodec() );
                 }
             } );
 
@@ -3708,7 +3708,7 @@
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
                     LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-                    SearchRequest searchRequest = ldapMessage.getSearchRequest();
+                    SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -3768,7 +3768,7 @@
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    SearchRequest searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
+                    SearchRequestCodec searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -3833,7 +3833,7 @@
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    SearchRequest searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
+                    SearchRequestCodec searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -3897,7 +3897,7 @@
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    SearchRequest searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
+                    SearchRequestCodec searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -3945,7 +3945,7 @@
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    SearchRequest searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
+                    SearchRequestCodec searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -3994,7 +3994,7 @@
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    SearchRequest searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
+                    SearchRequestCodec searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -5142,7 +5142,7 @@
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
                     LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-                    SearchRequest searchRequest = ldapMessage.getSearchRequest();
+                    SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -5216,7 +5216,7 @@
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
                     LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-                    SearchRequest searchRequest = ldapMessage.getSearchRequest();
+                    SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -6137,7 +6137,7 @@
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
                     LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-                    SearchRequest searchRequest = ldapMessage.getSearchRequest();
+                    SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -6264,7 +6264,7 @@
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
                     LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-                    SearchRequest searchRequest = ldapMessage.getSearchRequest();
+                    SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java Wed Apr  1 17:51:40 2009
@@ -21,9 +21,9 @@
 package org.apache.directory.shared.ldap.codec;
 
 import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.message.Message;
+import org.apache.directory.shared.ldap.message.InternalMessage;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.ResultResponse;
+import org.apache.directory.shared.ldap.message.InternalResultResponse;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 
@@ -45,7 +45,7 @@
     private static final long serialVersionUID = 1L;
 
     /** The response with the error cause */
-    private transient Message response;
+    private transient InternalMessage response;
     
     /**
      * Creates a DecoderException
@@ -64,7 +64,7 @@
      * @param message A message with meaning to a human
      * @param cause The Exception which caused the error
      */
-    public ResponseCarryingException(String message, ResultResponse response, ResultCodeEnum code, 
+    public ResponseCarryingException(String message, InternalResultResponse response, ResultCodeEnum code, 
         LdapDN matchedDn, Throwable cause)
     {
         super( message, cause );
@@ -80,7 +80,7 @@
      * Set a response if we get an exception while parsing the message
      * @param response the constructed response
      */
-    public void setResponse( Message response ) 
+    public void setResponse( InternalMessage response ) 
     {
         this.response = response;
     }
@@ -89,7 +89,7 @@
      * Get the constructed response
      * @return The constructed response
      */
-    public Message getResponse()
+    public InternalMessage getResponse()
     {
         return response;
     }

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java Wed Apr  1 17:51:40 2009
@@ -58,7 +58,7 @@
 import org.apache.directory.shared.ldap.codec.search.NotFilter;
 import org.apache.directory.shared.ldap.codec.search.OrFilter;
 import org.apache.directory.shared.ldap.codec.search.PresentFilter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 import org.apache.directory.shared.ldap.codec.search.SearchResultDone;
 import org.apache.directory.shared.ldap.codec.search.SearchResultEntry;
 import org.apache.directory.shared.ldap.codec.search.SearchResultReference;
@@ -96,7 +96,7 @@
 import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
 import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;
 import org.apache.directory.shared.ldap.message.LdapResultImpl;
-import org.apache.directory.shared.ldap.message.Message;
+import org.apache.directory.shared.ldap.message.InternalMessage;
 import org.apache.directory.shared.ldap.message.ModifyDnRequestImpl;
 import org.apache.directory.shared.ldap.message.ModifyDnResponseImpl;
 import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
@@ -151,7 +151,7 @@
      * @param messageId The message Id
      * @return A Snickers AbandonRequestImpl
      */
-    public static Message transformAbandonRequest( LdapMessageCodec twixMessage, int messageId )
+    public static InternalMessage transformAbandonRequest( LdapMessageCodec twixMessage, int messageId )
     {
         AbandonRequestImpl snickersMessage = new AbandonRequestImpl( messageId );
         AbandonRequestCodec abandonRequest = twixMessage.getAbandonRequest();
@@ -170,7 +170,7 @@
      * @param messageId The message Id
      * @return A Snickers AddRequestImpl
      */
-    public static Message transformAddRequest( LdapMessageCodec twixMessage, int messageId )
+    public static InternalMessage transformAddRequest( LdapMessageCodec twixMessage, int messageId )
     {
         AddRequestImpl snickersMessage = new AddRequestImpl( messageId );
         AddRequest addRequest = twixMessage.getAddRequest();
@@ -192,7 +192,7 @@
      * @param messageId The message Id
      * @return A Snickers BindRequestImpl
      */
-    public static Message transformBindRequest( LdapMessageCodec twixMessage, int messageId )
+    public static InternalMessage transformBindRequest( LdapMessageCodec twixMessage, int messageId )
     {
         BindRequestImpl snickersMessage = new BindRequestImpl( messageId );
         BindRequestCodec bindRequest = twixMessage.getBindRequest();
@@ -235,7 +235,7 @@
      * @param messageId The message Id
      * @return a Snickers BindResponseImpl
      */
-    public static Message transformBindResponse( LdapMessageCodec twixMessage, int messageId )
+    public static InternalMessage transformBindResponse( LdapMessageCodec twixMessage, int messageId )
     {
         BindResponseImpl snickersMessage = new BindResponseImpl( messageId );
         BindResponseCodec bindResponse = twixMessage.getBindResponse();
@@ -256,7 +256,7 @@
      * @param snickersResult the Snickers LdapResult representation
      */
     public static void transformLdapResultTwixToSnickers( LdapResultCodec twixResult, 
-        org.apache.directory.shared.ldap.message.LdapResult snickersResult )
+        org.apache.directory.shared.ldap.message.InternalLdapResult snickersResult )
     {
         snickersResult.setErrorMessage( twixResult.getErrorMessage() );
         
@@ -299,7 +299,7 @@
      * @param messageId The message Id
      * @return A Snickers CompareRequestImpl
      */
-    public static Message transformCompareRequest( LdapMessageCodec twixMessage, int messageId )
+    public static InternalMessage transformCompareRequest( LdapMessageCodec twixMessage, int messageId )
     {
         CompareRequestImpl snickersMessage = new CompareRequestImpl( messageId );
         CompareRequest compareRequest = twixMessage.getCompareRequest();
@@ -331,7 +331,7 @@
      * @param messageId The message Id
      * @return A Snickers DeleteRequestImpl
      */
-    public static Message transformDelRequest( LdapMessageCodec twixMessage, int messageId )
+    public static InternalMessage transformDelRequest( LdapMessageCodec twixMessage, int messageId )
     {
         DeleteRequestImpl snickersMessage = new DeleteRequestImpl( messageId );
         DelRequest delRequest = twixMessage.getDelRequest();
@@ -351,7 +351,7 @@
      * @param messageId The message Id
      * @return A Snickers ExtendedRequestImpl
      */
-    public static Message transformExtendedRequest( LdapMessageCodec twixMessage, int messageId )
+    public static InternalMessage transformExtendedRequest( LdapMessageCodec twixMessage, int messageId )
     {
         ExtendedRequest extendedRequest = twixMessage.getExtendedRequest();
         ExtendedRequestImpl snickersMessage;
@@ -383,7 +383,7 @@
      * @param messageId The message Id
      * @return A Snickers ModifyDNRequestImpl
      */
-    public static Message transformModifyDNRequest( LdapMessageCodec twixMessage, int messageId )
+    public static InternalMessage transformModifyDNRequest( LdapMessageCodec twixMessage, int messageId )
     {
         ModifyDnRequestImpl snickersMessage = new ModifyDnRequestImpl( messageId );
         ModifyDNRequest modifyDNRequest = twixMessage.getModifyDNRequest();
@@ -411,7 +411,7 @@
      * @param messageId The message Id
      * @return A Snickers ModifyRequestImpl
      */
-    public static Message transformModifyRequest( LdapMessageCodec twixMessage, int messageId )
+    public static InternalMessage transformModifyRequest( LdapMessageCodec twixMessage, int messageId )
     {
         ModifyRequestImpl snickersMessage = new ModifyRequestImpl( messageId );
         ModifyRequest modifyRequest = twixMessage.getModifyRequest();
@@ -752,10 +752,10 @@
      * @param messageId The message Id
      * @return A Snickers SearchRequestImpl
      */
-    public static Message transformSearchRequest( LdapMessageCodec twixMessage, int messageId )
+    public static InternalMessage transformSearchRequest( LdapMessageCodec twixMessage, int messageId )
     {
         SearchRequestImpl snickersMessage = new SearchRequestImpl( messageId );
-        SearchRequest searchRequest = twixMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = twixMessage.getSearchRequest();
 
         // Twix : LdapDN baseObject -> Snickers : String baseDn
         snickersMessage.setBase( searchRequest.getBaseObject() );
@@ -826,7 +826,7 @@
      * @param messageId The message Id
      * @return A Snickers UnBindRequestImpl
      */
-    public static Message transformUnBindRequest( LdapMessageCodec twixMessage, int messageId )
+    public static InternalMessage transformUnBindRequest( LdapMessageCodec twixMessage, int messageId )
     {
         return new UnbindRequestImpl( messageId );
     }
@@ -838,7 +838,7 @@
      * @param obj the object to transform
      * @return the object transformed
      */
-    public static Message transform( Object obj )
+    public static InternalMessage transform( Object obj )
     {
         LdapMessageCodec twixMessage = ( LdapMessageCodec ) obj;
         int messageId = twixMessage.getMessageId();
@@ -849,7 +849,7 @@
                 + "> from Twix to Snickers." );
         }
 
-        Message snickersMessage = null;
+        InternalMessage snickersMessage = null;
 
         int messageType = twixMessage.getMessageType();
 
@@ -1136,7 +1136,7 @@
      * @param twixMessage The Twix AddResponse to produce
      * @param snickersMessage The incoming Snickers AddResponse
      */
-    public static void transformAddResponse( LdapMessageCodec twixMessage, Message snickersMessage )
+    public static void transformAddResponse( LdapMessageCodec twixMessage, InternalMessage snickersMessage )
     {
         AddResponseImpl snickersAddResponse = ( AddResponseImpl ) snickersMessage;
 
@@ -1156,7 +1156,7 @@
      * @param twixMessage The Twix BindResponse to produce
      * @param snickersMessage The incoming Snickers BindResponse
      */
-    public static void transformBindResponse( LdapMessageCodec twixMessage, Message snickersMessage )
+    public static void transformBindResponse( LdapMessageCodec twixMessage, InternalMessage snickersMessage )
     {
         BindResponseImpl snickersBindResponse = ( BindResponseImpl ) snickersMessage;
 
@@ -1185,7 +1185,7 @@
      * @param twixMessage The Twix BindRequest to produce
      * @param snickersMessage The incoming Snickers BindRequest
      */
-    public static void transformBindRequest( LdapMessageCodec twixMessage, Message snickersMessage )
+    public static void transformBindRequest( LdapMessageCodec twixMessage, InternalMessage snickersMessage )
     {
         BindRequestImpl snickersBindRequest = ( BindRequestImpl ) snickersMessage;
 
@@ -1220,7 +1220,7 @@
      * @param twixMessage The Twix CompareResponse to produce
      * @param snickersMessage The incoming Snickers CompareResponse
      */
-    public static void transformCompareResponse( LdapMessageCodec twixMessage, Message snickersMessage )
+    public static void transformCompareResponse( LdapMessageCodec twixMessage, InternalMessage snickersMessage )
     {
         CompareResponseImpl snickersCompareResponse = ( CompareResponseImpl ) snickersMessage;
 
@@ -1241,7 +1241,7 @@
      * @param twixMessage The Twix DelResponse to produce
      * @param snickersMessage The incoming Snickers DelResponse
      */
-    public static void transformDelResponse( LdapMessageCodec twixMessage, Message snickersMessage )
+    public static void transformDelResponse( LdapMessageCodec twixMessage, InternalMessage snickersMessage )
     {
         DeleteResponseImpl snickersDelResponse = ( DeleteResponseImpl ) snickersMessage;
 
@@ -1261,7 +1261,7 @@
      * @param twixMessage The Twix ExtendedResponse to produce
      * @param snickersMessage The incoming Snickers ExtendedResponse
      */
-    public static void transformExtendedResponse( LdapMessageCodec twixMessage, Message snickersMessage )
+    public static void transformExtendedResponse( LdapMessageCodec twixMessage, InternalMessage snickersMessage )
     {
         ExtendedResponseImpl snickersExtendedResponse = ( ExtendedResponseImpl ) snickersMessage;
         ExtendedResponse extendedResponse = new ExtendedResponse();
@@ -1295,7 +1295,7 @@
      * @param twixMessage The Twix ModifyResponse to produce
      * @param snickersMessage The incoming Snickers ModifyResponse
      */
-    public static void transformModifyResponse( LdapMessageCodec twixMessage, Message snickersMessage )
+    public static void transformModifyResponse( LdapMessageCodec twixMessage, InternalMessage snickersMessage )
     {
         ModifyResponseImpl snickersModifyResponse = ( ModifyResponseImpl ) snickersMessage;
 
@@ -1315,7 +1315,7 @@
      * @param twixMessage The Twix ModifyDNResponse to produce
      * @param snickersMessage The incoming Snickers ModifyDNResponse
      */
-    public static void transformModifyDNResponse( LdapMessageCodec twixMessage, Message snickersMessage )
+    public static void transformModifyDNResponse( LdapMessageCodec twixMessage, InternalMessage snickersMessage )
     {
         ModifyDnResponseImpl snickersModifyDNResponse = ( ModifyDnResponseImpl ) snickersMessage;
 
@@ -1336,7 +1336,7 @@
      * @param twixMessage The Twix SearchResultDone to produce
      * @param snickersMessage The incoming Snickers SearchResponseDone
      */
-    public static void transformSearchResultDone( LdapMessageCodec twixMessage, Message snickersMessage )
+    public static void transformSearchResultDone( LdapMessageCodec twixMessage, InternalMessage snickersMessage )
     {
         SearchResponseDoneImpl snickersSearchResponseDone = ( SearchResponseDoneImpl ) snickersMessage;
         SearchResultDone searchResultDone = new SearchResultDone();
@@ -1356,7 +1356,7 @@
      * @param twixMessage The Twix SearchResultEntry to produce
      * @param snickersMessage The incoming Snickers SearchResponseEntry
      */
-    public static void transformSearchResultEntry( LdapMessageCodec twixMessage, Message snickersMessage )
+    public static void transformSearchResultEntry( LdapMessageCodec twixMessage, InternalMessage snickersMessage )
     {
         SearchResponseEntryImpl snickersSearchResultResponse = ( SearchResponseEntryImpl ) snickersMessage;
         SearchResultEntry searchResultEntry = new SearchResultEntry();
@@ -1380,7 +1380,7 @@
      * @param twixMessage The Twix SearchResultReference to produce
      * @param snickersMessage The incoming Snickers SearchResponseReference
      */
-    public static void transformSearchResultReference( LdapMessageCodec twixMessage, Message snickersMessage )
+    public static void transformSearchResultReference( LdapMessageCodec twixMessage, InternalMessage snickersMessage )
     {
         SearchResponseReferenceImpl snickersSearchResponseReference = ( SearchResponseReferenceImpl ) snickersMessage;
         SearchResultReference searchResultReference = new SearchResultReference();
@@ -1421,7 +1421,7 @@
      * @param msg the message to transform
      * @return the msg transformed
      */
-    public static Object transform( Message msg )
+    public static Object transform( InternalMessage msg )
     {
         if ( IS_DEBUG )
         {
@@ -1502,7 +1502,7 @@
      * @param twixMessage the Twix message
      * @param msg the Snickers message
      */
-    public static void transformControlsTwixToSnickers( LdapMessageCodec twixMessage, Message msg )
+    public static void transformControlsTwixToSnickers( LdapMessageCodec twixMessage, InternalMessage msg )
     {
         if ( twixMessage.getControls() == null )
         {
@@ -1521,7 +1521,7 @@
      * @param twixMessage The Twix SearchResultReference to produce
      * @param msg The incoming Snickers SearchResponseReference
      */
-    public static void transformControls( LdapMessageCodec twixMessage, Message msg )
+    public static void transformControls( LdapMessageCodec twixMessage, InternalMessage msg )
     {
         for ( javax.naming.ldap.Control control:msg.getControls().values() )
         {

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java Wed Apr  1 17:51:40 2009
@@ -25,7 +25,7 @@
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 import org.slf4j.Logger;
@@ -58,7 +58,7 @@
     {
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-        SearchRequest searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessageContainer.getLdapMessage().getSearchRequest();
 
         TLV tlv = ldapMessageContainer.getCurrentTLV();
         String attributeDescription = null;

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java Wed Apr  1 17:51:40 2009
@@ -28,7 +28,7 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.search.AndFilter;
 import org.apache.directory.shared.ldap.codec.search.Filter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -69,7 +69,7 @@
             throw new DecoderException( "The And filter PDU must not be empty" );
         }
 
-        SearchRequest searchRequest = ldapMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
         // We can allocate the SearchRequest
         Filter andFilter = new AndFilter( ldapMessageContainer.getTlvId() );

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java Wed Apr  1 17:51:40 2009
@@ -28,7 +28,7 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter;
 import org.apache.directory.shared.ldap.codec.search.Filter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,7 +57,7 @@
     {
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
         LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-        SearchRequest searchRequest = ldapMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
         // We can allocate the Attribute Value Assertion
         Filter filter = new AttributeValueAssertionFilter( 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java Wed Apr  1 17:51:40 2009
@@ -28,7 +28,7 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientBinaryValue;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
@@ -64,7 +64,7 @@
     {
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
         LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-        SearchRequest searchRequest = ldapMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
         TLV tlv = ldapMessageContainer.getCurrentTLV();
 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java Wed Apr  1 17:51:40 2009
@@ -28,7 +28,7 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 import org.slf4j.Logger;
@@ -61,7 +61,7 @@
     {
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
         LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-        SearchRequest searchRequest = ldapMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
         TLV tlv = ldapMessageContainer.getCurrentTLV();
 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java Wed Apr  1 17:51:40 2009
@@ -28,7 +28,7 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter;
 import org.apache.directory.shared.ldap.codec.search.Filter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,7 +60,7 @@
     {
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
         LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-        SearchRequest searchRequest = ldapMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
         // We can allocate the Attribute Value Assertion
         Filter filter = new AttributeValueAssertionFilter( 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java Wed Apr  1 17:51:40 2009
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter;
 import org.apache.directory.shared.ldap.codec.search.Filter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,7 +56,7 @@
     {
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
         LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-        SearchRequest searchRequest = ldapMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
         // We can allocate the ExtensibleMatch Filter
         Filter extensibleMatchFilter = new ExtensibleMatchFilter( ldapMessageContainer.getTlvId() );

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java Wed Apr  1 17:51:40 2009
@@ -28,7 +28,7 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter;
 import org.apache.directory.shared.ldap.codec.search.Filter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,7 +60,7 @@
     {
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
         LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-        SearchRequest searchRequest = ldapMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
         // We can allocate the Attribute Value Assertion
         Filter filter = new AttributeValueAssertionFilter( 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java Wed Apr  1 17:51:40 2009
@@ -28,7 +28,7 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter;
 import org.apache.directory.shared.ldap.codec.search.Filter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,7 +60,7 @@
     {
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
         LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-        SearchRequest searchRequest = ldapMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
         // We can allocate the Attribute Value Assertion
         Filter filter = new AttributeValueAssertionFilter( 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java Wed Apr  1 17:51:40 2009
@@ -28,7 +28,7 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.search.Filter;
 import org.apache.directory.shared.ldap.codec.search.NotFilter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -69,7 +69,7 @@
             throw new DecoderException( "The Not filter PDU must not be empty" );
         }
 
-        SearchRequest searchRequest = ldapMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
         // We can allocate the SearchRequest
         Filter notFilter = new NotFilter( ldapMessageContainer.getTlvId() );

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java Wed Apr  1 17:51:40 2009
@@ -28,7 +28,7 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.search.Filter;
 import org.apache.directory.shared.ldap.codec.search.OrFilter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -69,7 +69,7 @@
             throw new DecoderException( "The Or filter PDU must not be empty" );
         }
 
-        SearchRequest searchRequest = ldapMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
         // We can allocate the SearchRequest
         Filter orFilter = new OrFilter( ldapMessageContainer.getTlvId() );

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java Wed Apr  1 17:51:40 2009
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.search.PresentFilter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 import org.slf4j.Logger;
@@ -57,7 +57,7 @@
     {
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
         LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-        SearchRequest searchRequest = ldapMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
         TLV tlv = ldapMessageContainer.getCurrentTLV();
 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java Wed Apr  1 17:51:40 2009
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.search.Filter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 import org.apache.directory.shared.ldap.codec.search.SubstringFilter;
 
 import org.slf4j.Logger;
@@ -60,7 +60,7 @@
     {
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
         LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-        SearchRequest searchRequest = ldapMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
         TLV tlv = ldapMessageContainer.getCurrentTLV();
 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreAnyAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreAnyAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreAnyAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreAnyAction.java Wed Apr  1 17:51:40 2009
@@ -26,7 +26,7 @@
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 import org.apache.directory.shared.ldap.codec.search.SubstringFilter;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -60,7 +60,7 @@
     {
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
         LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-        SearchRequest searchRequest = ldapMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
         TLV tlv = ldapMessageContainer.getCurrentTLV();
 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreFinalAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreFinalAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreFinalAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreFinalAction.java Wed Apr  1 17:51:40 2009
@@ -26,7 +26,7 @@
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 import org.apache.directory.shared.ldap.codec.search.SubstringFilter;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -60,7 +60,7 @@
     {
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
         LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-        SearchRequest searchRequest = ldapMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
         TLV tlv = ldapMessageContainer.getCurrentTLV();
 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreMatchValueAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreMatchValueAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreMatchValueAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreMatchValueAction.java Wed Apr  1 17:51:40 2009
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 import org.slf4j.Logger;
@@ -60,7 +60,7 @@
     {
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
         LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-        SearchRequest searchRequest = ldapMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
         TLV tlv = ldapMessageContainer.getCurrentTLV();
 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreTypeMatchingRuleAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreTypeMatchingRuleAction.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreTypeMatchingRuleAction.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreTypeMatchingRuleAction.java Wed Apr  1 17:51:40 2009
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 import org.slf4j.Logger;
@@ -60,7 +60,7 @@
     {
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
         LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
-        SearchRequest searchRequest = ldapMessage.getSearchRequest();
+        SearchRequestCodec searchRequest = ldapMessage.getSearchRequest();
 
         TLV tlv = ldapMessageContainer.getCurrentTLV();
 

Copied: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java (from r760802, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java?p2=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java&p1=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java&r1=760802&r2=760984&rev=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java Wed Apr  1 17:51:40 2009
@@ -49,7 +49,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$, 
  */
-public class SearchRequest extends LdapMessageCodec
+public class SearchRequestCodec extends LdapMessageCodec
 {
     // ~ Instance fields
     // ----------------------------------------------------------------------------
@@ -108,7 +108,7 @@
     /**
      * Creates a new SearchRequest object.
      */
-    public SearchRequest()
+    public SearchRequestCodec()
     {
         super();
     }

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java Wed Apr  1 17:51:40 2009
@@ -26,7 +26,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class AbandonRequestImpl extends AbstractRequest implements InternalAbandonRequest
+public class AbandonRequestImpl extends InternalAbstractRequest implements InternalAbandonRequest
 {
     static final long serialVersionUID = -4688193359792740969L;
 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonableRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonableRequest.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonableRequest.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonableRequest.java Wed Apr  1 17:51:40 2009
@@ -26,7 +26,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface AbandonableRequest extends Request
+public interface AbandonableRequest extends InternalRequest
 {
     /**
      * Abandons this request.

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractAbandonableRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractAbandonableRequest.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractAbandonableRequest.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractAbandonableRequest.java Wed Apr  1 17:51:40 2009
@@ -31,7 +31,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class AbstractAbandonableRequest extends AbstractRequest implements AbandonableRequest
+public class AbstractAbandonableRequest extends InternalAbstractRequest implements AbandonableRequest
 {
     static final long serialVersionUID = -4511116249089399040L;
 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java Wed Apr  1 17:51:40 2009
@@ -128,7 +128,7 @@
      * 
      * @return the result containing response for this request
      */
-    public ResultResponse getResultResponse()
+    public InternalResultResponse getResultResponse()
     {
         if ( response == null )
         {

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java Wed Apr  1 17:51:40 2009
@@ -26,7 +26,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class AddResponseImpl extends AbstractResultResponse implements InternalAddResponse
+public class AddResponseImpl extends InternalAbstractResultResponse implements InternalAddResponse
 {
     // ------------------------------------------------------------------------
     // Constructors

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java Wed Apr  1 17:51:40 2009
@@ -33,7 +33,7 @@
  * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
  * @version $Rev$
  */
-public class BindRequestImpl extends AbstractRequest implements InternalBindRequest
+public class BindRequestImpl extends InternalAbstractRequest implements InternalBindRequest
 {
     static final long serialVersionUID = 7945504184130380071L;
 
@@ -293,7 +293,7 @@
      * 
      * @return the result containing response for this request
      */
-    public ResultResponse getResultResponse()
+    public InternalResultResponse getResultResponse()
     {
         if ( response == null )
         {

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java Wed Apr  1 17:51:40 2009
@@ -31,7 +31,7 @@
  * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
  * @version $Rev$
  */
-public class BindResponseImpl extends AbstractResultResponse implements InternalBindResponse
+public class BindResponseImpl extends InternalAbstractResultResponse implements InternalBindResponse
 {
     static final long serialVersionUID = -5146809476518669755L;
 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java Wed Apr  1 17:51:40 2009
@@ -181,7 +181,7 @@
      * 
      * @return the result containing response for this request
      */
-    public ResultResponse getResultResponse()
+    public InternalResultResponse getResultResponse()
     {
         if ( response == null )
         {

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java Wed Apr  1 17:51:40 2009
@@ -26,7 +26,7 @@
  * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
  * @version $Rev$
  */
-public class CompareResponseImpl extends AbstractResultResponse implements InternalCompareResponse
+public class CompareResponseImpl extends InternalAbstractResultResponse implements InternalCompareResponse
 {
 
     // ------------------------------------------------------------------------

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java Wed Apr  1 17:51:40 2009
@@ -105,7 +105,7 @@
      * 
      * @return the result containing response for this request
      */
-    public ResultResponse getResultResponse()
+    public InternalResultResponse getResultResponse()
     {
         if ( response == null )
         {

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java Wed Apr  1 17:51:40 2009
@@ -26,7 +26,7 @@
  * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
  * @version $Rev$
  */
-public class DeleteResponseImpl extends AbstractResultResponse implements InternalDeleteResponse
+public class DeleteResponseImpl extends InternalAbstractResultResponse implements InternalDeleteResponse
 {
 
     // ------------------------------------------------------------------------

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java Wed Apr  1 17:51:40 2009
@@ -34,7 +34,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ExtendedRequestImpl extends AbstractRequest implements InternalExtendedRequest
+public class ExtendedRequestImpl extends InternalAbstractRequest implements InternalExtendedRequest
 {
     static final long serialVersionUID = 7916990159044177480L;
 
@@ -44,7 +44,7 @@
     /** Extended request's payload or <b>requestValue</b> */
     protected byte[] payload;
 
-    protected ResultResponse response;
+    protected InternalResultResponse response;
 
 
     // -----------------------------------------------------------------------
@@ -151,7 +151,7 @@
      * 
      * @return the result containing response for this request
      */
-    public ResultResponse getResultResponse()
+    public InternalResultResponse getResultResponse()
     {
         if ( response == null )
         {

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java Wed Apr  1 17:51:40 2009
@@ -28,7 +28,7 @@
  * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
  * @version $Rev$
  */
-public class ExtendedResponseImpl extends AbstractResultResponse implements InternalExtendedResponse
+public class ExtendedResponseImpl extends InternalAbstractResultResponse implements InternalExtendedResponse
 {
     static final long serialVersionUID = -6646752766410531060L;
 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalAbandonRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalAbandonRequest.java?rev=760984&r1=760983&r2=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalAbandonRequest.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalAbandonRequest.java Wed Apr  1 17:51:40 2009
@@ -27,7 +27,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface InternalAbandonRequest extends Request
+public interface InternalAbandonRequest extends InternalRequest
 {
     /** Ldap abandon request type code */
     MessageTypeEnum TYPE = MessageTypeEnum.ABANDON_REQUEST;

Copied: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalAbstractMessage.java (from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalAbstractMessage.java?p2=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalAbstractMessage.java&p1=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java&r1=759581&r2=760984&rev=760984&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalAbstractMessage.java Wed Apr  1 17:51:40 2009
@@ -34,7 +34,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public abstract class AbstractMessage implements Message
+public abstract class InternalAbstractMessage implements InternalMessage
 {
     static final long serialVersionUID = 7601738291101182094L;
 
@@ -59,7 +59,7 @@
      * @param type
      *            the type of the message
      */
-    protected AbstractMessage( final int id, final MessageTypeEnum type )
+    protected InternalAbstractMessage( final int id, final MessageTypeEnum type )
     {
         this.id = id;
         this.type = type;
@@ -95,7 +95,7 @@
 
     
     /**
-     * @see org.apache.directory.shared.ldap.message.Message#hasControl(java.lang.String)
+     * @see org.apache.directory.shared.ldap.message.InternalMessage#hasControl(java.lang.String)
      */
     public boolean hasControl( String oid )
     {
@@ -199,12 +199,12 @@
             return true;
         }
 
-        if ( ( obj == null ) || !( obj instanceof Message ) )
+        if ( ( obj == null ) || !( obj instanceof InternalMessage ) )
         {
             return false;
         }
 
-        Message msg = ( Message ) obj;
+        InternalMessage msg = ( InternalMessage ) obj;
 
         if ( msg.getMessageId() != id )
         {



Mime
View raw message