Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 1430 invoked from network); 18 Aug 2010 00:29:15 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 18 Aug 2010 00:29:15 -0000 Received: (qmail 61438 invoked by uid 500); 18 Aug 2010 00:29:14 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 61399 invoked by uid 500); 18 Aug 2010 00:29:14 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 61392 invoked by uid 99); 18 Aug 2010 00:29:14 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Aug 2010 00:29:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Aug 2010 00:28:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 827D92388B3A; Wed, 18 Aug 2010 00:27:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r986534 [5/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 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100818002726.827D92388B3A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.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/actions/AttributeDescAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java Wed Aug 18 00:27:16 2010 @@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1. 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.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,7 +58,7 @@ public class AttributeDescAction extends { LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container; - InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); + SearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); TLV tlv = ldapMessageContainer.getCurrentTLV(); String attributeDescription = null; Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.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/actions/ControlValueAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java Wed Aug 18 00:27:16 2010 @@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.controls.CodecControl; import org.apache.directory.shared.ldap.codec.controls.ControlDecoder; 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.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,7 +57,7 @@ public class ControlValueAction extends TLV tlv = ldapMessageContainer.getCurrentTLV(); Control control = null; - InternalMessage message = ldapMessageContainer.getInternalMessage(); + Message message = ldapMessageContainer.getInternalMessage(); control = message.getCurrentControl(); // Get the current control Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.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/actions/InitAndFilterAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java Wed Aug 18 00:27:16 2010 @@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.search.AndFilter; import org.apache.directory.shared.ldap.codec.search.Filter; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,7 +70,7 @@ public class InitAndFilterAction extends throw new DecoderException( msg ); } - InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); + SearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); // We can allocate the SearchRequest Filter andFilter = new AndFilter( ldapMessageContainer.getTlvId() ); Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.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/actions/InitApproxMatchFilterAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java Wed Aug 18 00:27:16 2010 @@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter; import org.apache.directory.shared.ldap.codec.search.Filter; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,7 +56,7 @@ public class InitApproxMatchFilterAction public void action( IAsn1Container container ) throws DecoderException { LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container; - InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); + SearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); // We can allocate the Attribute Value Assertion Filter filter = new AttributeValueAssertionFilter( ldapMessageContainer.getTlvId(), Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.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/actions/InitAssertionValueFilterAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java Wed Aug 18 00:27:16 2010 @@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.StringValue; import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,7 +63,7 @@ public class InitAssertionValueFilterAct 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/actions/InitAttributeDescFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.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/actions/InitAttributeDescFilterAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java Wed Aug 18 00:27:16 2010 @@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,7 +61,7 @@ public class InitAttributeDescFilterActi 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/actions/InitEqualityMatchFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.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/actions/InitEqualityMatchFilterAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java Wed Aug 18 00:27:16 2010 @@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter; import org.apache.directory.shared.ldap.codec.search.Filter; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,7 +59,7 @@ public class InitEqualityMatchFilterActi public void action( IAsn1Container container ) throws DecoderException { LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container; - InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); + SearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); // We can allocate the Attribute Value Assertion Filter filter = new AttributeValueAssertionFilter( ldapMessageContainer.getTlvId(), Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.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/actions/InitExtensibleMatchFilterAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java Wed Aug 18 00:27:16 2010 @@ -27,7 +27,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter; import org.apache.directory.shared.ldap.codec.search.Filter; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,7 +55,7 @@ public class InitExtensibleMatchFilterAc public void action( IAsn1Container container ) throws DecoderException { LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container; - InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); + SearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); // We can allocate the ExtensibleMatch Filter Filter extensibleMatchFilter = new ExtensibleMatchFilter( ldapMessageContainer.getTlvId() ); Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.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/actions/InitGreaterOrEqualFilterAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java Wed Aug 18 00:27:16 2010 @@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter; import org.apache.directory.shared.ldap.codec.search.Filter; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,7 +59,7 @@ public class InitGreaterOrEqualFilterAct public void action( IAsn1Container container ) throws DecoderException { LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container; - InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); + SearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); // We can allocate the Attribute Value Assertion Filter filter = new AttributeValueAssertionFilter( ldapMessageContainer.getTlvId(), Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.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/actions/InitLessOrEqualFilterAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java Wed Aug 18 00:27:16 2010 @@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter; import org.apache.directory.shared.ldap.codec.search.Filter; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,7 +59,7 @@ public class InitLessOrEqualFilterAction public void action( IAsn1Container container ) throws DecoderException { LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container; - InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); + SearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); // We can allocate the Attribute Value Assertion Filter filter = new AttributeValueAssertionFilter( ldapMessageContainer.getTlvId(), Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.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/actions/InitNotFilterAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java Wed Aug 18 00:27:16 2010 @@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.search.Filter; import org.apache.directory.shared.ldap.codec.search.NotFilter; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,7 +70,7 @@ public class InitNotFilterAction extends throw new DecoderException( msg ); } - InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); + SearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); // We can allocate the SearchRequest Filter notFilter = new NotFilter( ldapMessageContainer.getTlvId() ); Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.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/actions/InitOrFilterAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java Wed Aug 18 00:27:16 2010 @@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.search.Filter; import org.apache.directory.shared.ldap.codec.search.OrFilter; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,7 +70,7 @@ public class InitOrFilterAction extends throw new DecoderException( msg ); } - InternalSearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); + SearchRequest searchRequest = ldapMessageContainer.getSearchRequest(); // We can allocate the SearchRequest Filter orFilter = new OrFilter( ldapMessageContainer.getTlvId() ); Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.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/actions/InitPresentFilterAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java Wed Aug 18 00:27:16 2010 @@ -27,7 +27,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.search.PresentFilter; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,7 +56,7 @@ public class InitPresentFilterAction ext 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/actions/InitReferralsAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitReferralsAction.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/actions/InitReferralsAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitReferralsAction.java Wed Aug 18 00:27:16 2010 @@ -27,7 +27,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.i18n.I18n; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.message.ReferralImpl; -import org.apache.directory.shared.ldap.message.internal.InternalReferral; +import org.apache.directory.shared.ldap.message.internal.Referral; import org.apache.directory.shared.ldap.message.internal.LdapResult; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.slf4j.Logger; @@ -76,7 +76,7 @@ public class InitReferralsAction extends ResultResponse response = ( ResultResponse ) ldapMessageContainer.getInternalMessage(); LdapResult ldapResult = response.getLdapResult(); - InternalReferral referral = new ReferralImpl(); + Referral referral = new ReferralImpl(); ldapResult.setReferral( referral ); if ( IS_DEBUG ) Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.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/actions/InitSubstringsFilterAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java Wed Aug 18 00:27:16 2010 @@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.search.Filter; import org.apache.directory.shared.ldap.codec.search.SubstringFilter; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,7 +60,7 @@ public class InitSubstringsFilterAction 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/actions/ModifyAttributeValueAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.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/actions/ModifyAttributeValueAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java Wed Aug 18 00:27:16 2010 @@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.tlv.TLV; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.message.ModifyRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest; +import org.apache.directory.shared.ldap.message.internal.ModifyRequest; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,7 +57,7 @@ public class ModifyAttributeValueAction public void action( IAsn1Container container ) { LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container; - InternalModifyRequest modifyRequest = ldapMessageContainer.getModifyRequest(); + ModifyRequest modifyRequest = ldapMessageContainer.getModifyRequest(); TLV tlv = ldapMessageContainer.getCurrentTLV(); Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ReferralAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ReferralAction.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/actions/ReferralAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ReferralAction.java Wed Aug 18 00:27:16 2010 @@ -28,8 +28,8 @@ import org.apache.directory.shared.i18n. import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException; 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.InternalReferral; +import org.apache.directory.shared.ldap.message.internal.Message; +import org.apache.directory.shared.ldap.message.internal.Referral; import org.apache.directory.shared.ldap.message.internal.LdapResult; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.apache.directory.shared.ldap.util.LdapURL; @@ -67,9 +67,9 @@ public class ReferralAction extends Gram TLV tlv = ldapMessageContainer.getCurrentTLV(); - InternalMessage response = ldapMessageContainer.getInternalMessage(); + Message response = ldapMessageContainer.getInternalMessage(); LdapResult ldapResult = ( ( ResultResponse ) response ).getLdapResult(); - InternalReferral referral = ldapResult.getReferral(); + Referral referral = ldapResult.getReferral(); if ( tlv.getLength() == 0 ) { Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreAnyAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreAnyAction.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/actions/StoreAnyAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreAnyAction.java Wed Aug 18 00:27:16 2010 @@ -28,7 +28,7 @@ import org.apache.directory.shared.i18n. import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.search.SubstringFilter; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,7 +60,7 @@ public class StoreAnyAction extends Gram 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/actions/StoreFinalAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreFinalAction.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/actions/StoreFinalAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreFinalAction.java Wed Aug 18 00:27:16 2010 @@ -28,7 +28,7 @@ import org.apache.directory.shared.i18n. import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.search.SubstringFilter; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,7 +60,7 @@ public class StoreFinalAction extends Gr 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/actions/StoreMatchValueAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreMatchValueAction.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/actions/StoreMatchValueAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreMatchValueAction.java Wed Aug 18 00:27:16 2010 @@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter; import org.apache.directory.shared.ldap.entry.BinaryValue; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,7 +59,7 @@ public class StoreMatchValueAction exten 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/actions/StoreReferenceAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreReferenceAction.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/actions/StoreReferenceAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreReferenceAction.java Wed Aug 18 00:27:16 2010 @@ -28,7 +28,7 @@ import org.apache.directory.shared.i18n. import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException; import org.apache.directory.shared.ldap.message.ReferralImpl; -import org.apache.directory.shared.ldap.message.internal.InternalReferral; +import org.apache.directory.shared.ldap.message.internal.Referral; import org.apache.directory.shared.ldap.message.internal.SearchResultReference; import org.apache.directory.shared.ldap.util.LdapURL; import org.apache.directory.shared.ldap.util.StringTools; @@ -70,7 +70,7 @@ public class StoreReferenceAction extend TLV tlv = ldapMessageContainer.getCurrentTLV(); // Get the referral, or create it if not existing - InternalReferral referral = searchResultReference.getReferral(); + Referral referral = searchResultReference.getReferral(); if ( referral == null ) { Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreTypeMatchingRuleAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreTypeMatchingRuleAction.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/actions/StoreTypeMatchingRuleAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreTypeMatchingRuleAction.java Wed Aug 18 00:27:16 2010 @@ -28,7 +28,7 @@ import org.apache.directory.shared.i18n. import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,7 +60,7 @@ public class StoreTypeMatchingRuleAction 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/actions/ValueAction.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ValueAction.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/actions/ValueAction.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ValueAction.java Wed Aug 18 00:27:16 2010 @@ -24,7 +24,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.grammar.GrammarAction; import org.apache.directory.shared.asn1.ber.tlv.TLV; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; -import org.apache.directory.shared.ldap.message.internal.InternalAddRequest; +import org.apache.directory.shared.ldap.message.internal.AddRequest; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,7 +57,7 @@ public class ValueAction extends Grammar { LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container; - InternalAddRequest addRequest = ldapMessageContainer.getAddRequest(); + AddRequest addRequest = ldapMessageContainer.getAddRequest(); TLV tlv = ldapMessageContainer.getCurrentTLV(); Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonListener.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonListener.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonListener.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonListener.java Wed Aug 18 00:27:16 2010 @@ -19,7 +19,7 @@ */ package org.apache.directory.shared.ldap.message; -import org.apache.directory.shared.ldap.message.internal.InternalAbandonableRequest; +import org.apache.directory.shared.ldap.message.internal.AbandonableRequest; /** @@ -35,5 +35,5 @@ public interface AbandonListener * @param req * the request which is abandoned. */ - void requestAbandoned( InternalAbandonableRequest req ); + void requestAbandoned( AbandonableRequest req ); } Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java Wed Aug 18 00:27:16 2010 @@ -21,8 +21,8 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.message.internal.InternalAbandonRequest; -import org.apache.directory.shared.ldap.message.internal.InternalAbstractRequest; +import org.apache.directory.shared.ldap.message.internal.AbandonRequest; +import org.apache.directory.shared.ldap.message.internal.AbstractRequest; /** @@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class AbandonRequestImpl extends InternalAbstractRequest implements InternalAbandonRequest +public class AbandonRequestImpl extends AbstractRequest implements AbandonRequest { static final long serialVersionUID = -4688193359792740969L; @@ -97,7 +97,7 @@ public class AbandonRequestImpl extends return true; } - if ( ( obj == null ) || !( obj instanceof InternalAbandonRequest ) ) + if ( ( obj == null ) || !( obj instanceof AbandonRequest ) ) { return false; } @@ -107,7 +107,7 @@ public class AbandonRequestImpl extends return false; } - InternalAbandonRequest req = ( InternalAbandonRequest ) obj; + AbandonRequest req = ( AbandonRequest ) obj; if ( req.getAbandoned() != abandonId ) { Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractAbandonableRequest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractAbandonableRequest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractAbandonableRequest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractAbandonableRequest.java Wed Aug 18 00:27:16 2010 @@ -24,8 +24,8 @@ import java.util.Observable; import java.util.Observer; import org.apache.directory.shared.ldap.codec.MessageTypeEnum; -import org.apache.directory.shared.ldap.message.internal.InternalAbandonableRequest; -import org.apache.directory.shared.ldap.message.internal.InternalAbstractRequest; +import org.apache.directory.shared.ldap.message.internal.AbandonableRequest; +import org.apache.directory.shared.ldap.message.internal.AbstractRequest; /** @@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class AbstractAbandonableRequest extends InternalAbstractRequest implements InternalAbandonableRequest +public class AbstractAbandonableRequest extends AbstractRequest implements AbandonableRequest { static final long serialVersionUID = -4511116249089399040L; Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java Wed Aug 18 00:27:16 2010 @@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.message.internal.AddResponse; -import org.apache.directory.shared.ldap.message.internal.InternalAddRequest; +import org.apache.directory.shared.ldap.message.internal.AddRequest; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.apache.directory.shared.ldap.name.DN; @@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class AddRequestImpl extends AbstractAbandonableRequest implements InternalAddRequest +public class AddRequestImpl extends AbstractAbandonableRequest implements AddRequest { static final long serialVersionUID = 7534132448349520346L; @@ -329,7 +329,7 @@ public class AddRequestImpl extends Abst } // Check the object class. If null, it will exit. - if ( !( obj instanceof InternalAddRequest ) ) + if ( !( obj instanceof AddRequest ) ) { return false; } @@ -339,7 +339,7 @@ public class AddRequestImpl extends Abst return false; } - InternalAddRequest req = ( InternalAddRequest ) obj; + AddRequest req = ( AddRequest ) obj; // Check the entry if ( entry == null ) Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java Wed Aug 18 00:27:16 2010 @@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.ldap.message.internal.AddResponse; -import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse; +import org.apache.directory.shared.ldap.message.internal.AbstractResultResponse; /** @@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class AddResponseImpl extends InternalAbstractResultResponse implements AddResponse +public class AddResponseImpl extends AbstractResultResponse implements AddResponse { /** The encoded addResponse length */ private int addResponseLength; Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java Wed Aug 18 00:27:16 2010 @@ -25,7 +25,7 @@ import java.util.Arrays; import org.apache.directory.shared.i18n.I18n; import org.apache.directory.shared.ldap.codec.MessageTypeEnum; import org.apache.directory.shared.ldap.message.internal.BindResponse; -import org.apache.directory.shared.ldap.message.internal.InternalBindRequest; +import org.apache.directory.shared.ldap.message.internal.BindRequest; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.util.StringTools; @@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class BindRequestImpl extends AbstractAbandonableRequest implements InternalBindRequest +public class BindRequestImpl extends AbstractAbandonableRequest implements BindRequest { static final long serialVersionUID = 7945504184130380071L; @@ -354,7 +354,7 @@ public class BindRequestImpl extends Abs return true; } - if ( ( obj == null ) || !( obj instanceof InternalBindRequest ) ) + if ( ( obj == null ) || !( obj instanceof BindRequest ) ) { return false; } @@ -364,7 +364,7 @@ public class BindRequestImpl extends Abs return false; } - InternalBindRequest req = ( InternalBindRequest ) obj; + BindRequest req = ( BindRequest ) obj; if ( req.isSimple() != isSimple() ) { Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java Wed Aug 18 00:27:16 2010 @@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap import java.util.Arrays; -import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse; +import org.apache.directory.shared.ldap.message.internal.AbstractResultResponse; import org.apache.directory.shared.ldap.message.internal.BindResponse; import org.apache.directory.shared.ldap.util.StringTools; @@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class BindResponseImpl extends InternalAbstractResultResponse implements BindResponse +public class BindResponseImpl extends AbstractResultResponse implements BindResponse { static final long serialVersionUID = -5146809476518669755L; Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java Wed Aug 18 00:27:16 2010 @@ -25,7 +25,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.StringValue; import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.message.internal.CompareResponse; -import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest; +import org.apache.directory.shared.ldap.message.internal.CompareRequest; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.util.StringTools; @@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class CompareRequestImpl extends AbstractAbandonableRequest implements InternalCompareRequest +public class CompareRequestImpl extends AbstractAbandonableRequest implements CompareRequest { static final long serialVersionUID = 1699731530016468977L; @@ -344,7 +344,7 @@ public class CompareRequestImpl extends return false; } - InternalCompareRequest req = ( InternalCompareRequest ) obj; + CompareRequest req = ( CompareRequest ) obj; DN reqName = req.getName(); if ( ( name != null ) && ( reqName == null ) ) Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java Wed Aug 18 00:27:16 2010 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.message; -import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse; +import org.apache.directory.shared.ldap.message.internal.AbstractResultResponse; import org.apache.directory.shared.ldap.message.internal.CompareResponse; @@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class CompareResponseImpl extends InternalAbstractResultResponse implements CompareResponse +public class CompareResponseImpl extends AbstractResultResponse implements CompareResponse { /** The encoded compareResponse length */ private int compareResponseLength; Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java Wed Aug 18 00:27:16 2010 @@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.ldap.codec.MessageTypeEnum; import org.apache.directory.shared.ldap.message.internal.DeleteResponse; -import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest; +import org.apache.directory.shared.ldap.message.internal.DeleteRequest; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.apache.directory.shared.ldap.name.DN; @@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class DeleteRequestImpl extends AbstractAbandonableRequest implements InternalDeleteRequest +public class DeleteRequestImpl extends AbstractAbandonableRequest implements DeleteRequest { static final long serialVersionUID = 3187847454305567542L; @@ -170,7 +170,7 @@ public class DeleteRequestImpl extends A return false; } - InternalDeleteRequest req = ( InternalDeleteRequest ) obj; + DeleteRequest req = ( DeleteRequest ) obj; if ( name != null && req.getName() == null ) { Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java Wed Aug 18 00:27:16 2010 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.message; -import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse; +import org.apache.directory.shared.ldap.message.internal.AbstractResultResponse; import org.apache.directory.shared.ldap.message.internal.DeleteResponse; @@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class DeleteResponseImpl extends InternalAbstractResultResponse implements DeleteResponse +public class DeleteResponseImpl extends AbstractResultResponse implements DeleteResponse { /** The encoded deleteResponse length */ private int deleteResponseLength; Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java Wed Aug 18 00:27:16 2010 @@ -26,8 +26,8 @@ import javax.naming.NamingException; import javax.naming.ldap.ExtendedResponse; import org.apache.directory.shared.ldap.codec.MessageTypeEnum; -import org.apache.directory.shared.ldap.message.internal.InternalAbstractRequest; -import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest; +import org.apache.directory.shared.ldap.message.internal.AbstractRequest; +import org.apache.directory.shared.ldap.message.internal.ExtendedRequest; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.apache.directory.shared.ldap.util.StringTools; @@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class ExtendedRequestImpl extends InternalAbstractRequest implements InternalExtendedRequest +public class ExtendedRequestImpl extends AbstractRequest implements ExtendedRequest { static final long serialVersionUID = 7916990159044177480L; @@ -208,12 +208,12 @@ public class ExtendedRequestImpl extends return false; } - if ( !( obj instanceof InternalExtendedRequest ) ) + if ( !( obj instanceof ExtendedRequest ) ) { return false; } - InternalExtendedRequest req = ( InternalExtendedRequest ) obj; + ExtendedRequest req = ( ExtendedRequest ) obj; if ( ( oid != null ) && ( req.getRequestName() == null ) ) { Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java Wed Aug 18 00:27:16 2010 @@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap import java.util.Arrays; import org.apache.directory.shared.ldap.message.internal.ExtendedResponse; -import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse; +import org.apache.directory.shared.ldap.message.internal.AbstractResultResponse; import org.apache.directory.shared.ldap.util.StringTools; @@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class ExtendedResponseImpl extends InternalAbstractResultResponse implements ExtendedResponse +public class ExtendedResponseImpl extends AbstractResultResponse implements ExtendedResponse { static final long serialVersionUID = -6646752766410531060L; Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java Wed Aug 18 00:27:16 2010 @@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap import java.util.Arrays; -import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse; +import org.apache.directory.shared.ldap.message.internal.AbstractResultResponse; import org.apache.directory.shared.ldap.message.internal.IntermediateResponse; import org.apache.directory.shared.ldap.util.StringTools; @@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class IntermediateResponseImpl extends InternalAbstractResultResponse implements IntermediateResponse +public class IntermediateResponseImpl extends AbstractResultResponse implements IntermediateResponse { static final long serialVersionUID = -6646752766410531060L; Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java Wed Aug 18 00:27:16 2010 @@ -41,8 +41,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Modification; 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.InternalReferral; +import org.apache.directory.shared.ldap.message.internal.Message; +import org.apache.directory.shared.ldap.message.internal.Referral; import org.apache.directory.shared.ldap.message.internal.LdapResult; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.util.StringTools; @@ -68,7 +68,7 @@ public class LdapProtocolEncoder extends */ public void encode( IoSession session, Object message, ProtocolEncoderOutput out ) throws Exception { - ByteBuffer buffer = encodeMessage( ( InternalMessage ) message ); + ByteBuffer buffer = encodeMessage( ( Message ) message ); IoBuffer ioBuffer = IoBuffer.wrap( buffer ); @@ -100,7 +100,7 @@ public class LdapProtocolEncoder extends * @return A ByteBuffer that contains the PDU * @throws EncoderException If anything goes wrong. */ - public ByteBuffer encodeMessage( InternalMessage message ) throws EncoderException + public ByteBuffer encodeMessage( Message message ) throws EncoderException { int length = computeMessageLength( message ); ByteBuffer buffer = ByteBuffer.allocate( length ); @@ -167,7 +167,7 @@ public class LdapProtocolEncoder extends * L1 = length(ProtocolOp) * LdapMessage length = Length(0x30) + Length(L1) + MessageId length + L1 */ - private int computeMessageLength( InternalMessage message ) + private int computeMessageLength( Message message ) { // The length of the MessageId. It's the sum of // - the tag (0x02), 1 byte @@ -324,7 +324,7 @@ public class LdapProtocolEncoder extends Value.encode( buffer, ldapResult.getErrorMessageBytes() ); // The referrals, if any - InternalReferral referral = ldapResult.getReferral(); + Referral referral = ldapResult.getReferral(); if ( referral != null ) { @@ -341,7 +341,7 @@ public class LdapProtocolEncoder extends * @param buffer The buffer where to put the PDU * @return The PDU. */ - private void encodeReferral( ByteBuffer buffer, InternalReferral referral ) throws EncoderException + private void encodeReferral( ByteBuffer buffer, Referral referral ) throws EncoderException { Collection ldapUrlsBytes = referral.getLdapUrlsBytes(); @@ -1040,7 +1040,7 @@ public class LdapProtocolEncoder extends } - private int computeReferralLength( InternalReferral referral ) + private int computeReferralLength( Referral referral ) { if ( referral != null ) { @@ -1322,7 +1322,7 @@ public class LdapProtocolEncoder extends int searchResultReferenceLength = 0; // We may have more than one reference. - InternalReferral referral = searchResultReference.getReferral(); + Referral referral = searchResultReference.getReferral(); int referralLength = computeReferralLength( referral ); @@ -2344,7 +2344,7 @@ public class LdapProtocolEncoder extends buffer.put( TLV.getBytes( searchResultReference.getSearchResultReferenceLength() ) ); // The referrals, if any - InternalReferral referral = searchResultReference.getReferral(); + Referral referral = searchResultReference.getReferral(); if ( referral != null ) { @@ -2366,7 +2366,7 @@ public class LdapProtocolEncoder extends /** * Compute the protocolOp length */ - private int computeProtocolOpLength( InternalMessage message ) + private int computeProtocolOpLength( Message message ) { switch ( message.getType() ) { @@ -2439,7 +2439,7 @@ public class LdapProtocolEncoder extends } - private void encodeProtocolOp( ByteBuffer bb, InternalMessage message ) throws EncoderException + private void encodeProtocolOp( ByteBuffer bb, Message message ) throws EncoderException { switch ( message.getType() ) { Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java Wed Aug 18 00:27:16 2010 @@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.ldap.message.internal.LdapResult; -import org.apache.directory.shared.ldap.message.internal.InternalReferral; +import org.apache.directory.shared.ldap.message.internal.Referral; import org.apache.directory.shared.ldap.name.DN; @@ -42,7 +42,7 @@ public class LdapResultImpl implements L private byte[] matchedDNBytes; /** Referral associated with this LdapResult if the errorCode is REFERRAL */ - private InternalReferral referral; + private Referral referral; /** Decriptive error message - defaults to empty string */ private String errorMessage; @@ -185,7 +185,7 @@ public class LdapResultImpl implements L * * @return the referral on REFERRAL errors, null on all others. */ - public InternalReferral getReferral() + public Referral getReferral() { return referral; } @@ -212,7 +212,7 @@ public class LdapResultImpl implements L * @param referral * optional referral on REFERRAL errors. */ - public void setReferral( InternalReferral referral ) + public void setReferral( Referral referral ) { this.referral = referral; } Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ManyReplyRequest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ManyReplyRequest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ManyReplyRequest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ManyReplyRequest.java Wed Aug 18 00:27:16 2010 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.message; import org.apache.directory.shared.ldap.codec.MessageTypeEnum; -import org.apache.directory.shared.ldap.message.internal.InternalResultResponseRequest; +import org.apache.directory.shared.ldap.message.internal.ResultResponseRequest; /** @@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public interface ManyReplyRequest extends InternalResultResponseRequest +public interface ManyReplyRequest extends ResultResponseRequest { /** * Gets the various types of messages that can be generated by this kind of Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java Wed Aug 18 00:27:16 2010 @@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.ldap.codec.MessageTypeEnum; -import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest; +import org.apache.directory.shared.ldap.message.internal.ModifyDnRequest; import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.apache.directory.shared.ldap.name.DN; @@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class ModifyDnRequestImpl extends AbstractAbandonableRequest implements InternalModifyDnRequest +public class ModifyDnRequestImpl extends AbstractAbandonableRequest implements ModifyDnRequest { static final long serialVersionUID = 1233507339633051696L; @@ -305,7 +305,7 @@ public class ModifyDnRequestImpl extends return false; } - InternalModifyDnRequest req = ( InternalModifyDnRequest ) obj; + ModifyDnRequest req = ( ModifyDnRequest ) obj; if ( name != null && req.getName() == null ) { Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponseImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponseImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponseImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponseImpl.java Wed Aug 18 00:27:16 2010 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.message; -import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse; +import org.apache.directory.shared.ldap.message.internal.AbstractResultResponse; import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse; @@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class ModifyDnResponseImpl extends InternalAbstractResultResponse implements ModifyDnResponse +public class ModifyDnResponseImpl extends AbstractResultResponse implements ModifyDnResponse { /** The encoded modifyDnResponse length */ private int modifyDnResponseLength; Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java Wed Aug 18 00:27:16 2010 @@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; -import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest; +import org.apache.directory.shared.ldap.message.internal.ModifyRequest; import org.apache.directory.shared.ldap.message.internal.ModifyResponse; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.apache.directory.shared.ldap.name.DN; @@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class ModifyRequestImpl extends AbstractAbandonableRequest implements InternalModifyRequest +public class ModifyRequestImpl extends AbstractAbandonableRequest implements ModifyRequest { static final long serialVersionUID = -505803669028990304L; @@ -526,7 +526,7 @@ public class ModifyRequestImpl extends A return false; } - InternalModifyRequest req = ( InternalModifyRequest ) obj; + ModifyRequest req = ( ModifyRequest ) obj; if ( name != null && req.getName() == null ) { Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponseImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponseImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponseImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponseImpl.java Wed Aug 18 00:27:16 2010 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.message; -import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse; +import org.apache.directory.shared.ldap.message.internal.AbstractResultResponse; import org.apache.directory.shared.ldap.message.internal.ModifyResponse; @@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap. * ModifyResponse implementation * */ -public class ModifyResponseImpl extends InternalAbstractResultResponse implements ModifyResponse +public class ModifyResponseImpl extends AbstractResultResponse implements ModifyResponse { /** The encoded modifyResponse length */ private int modifyResponseLength; Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ReferralImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ReferralImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ReferralImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ReferralImpl.java Wed Aug 18 00:27:16 2010 @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.directory.shared.ldap.message.internal.InternalReferral; +import org.apache.directory.shared.ldap.message.internal.Referral; /** @@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class ReferralImpl implements InternalReferral +public class ReferralImpl implements Referral { static final long serialVersionUID = 2638820668325359096L; @@ -160,9 +160,9 @@ public class ReferralImpl implements Int return true; } - if ( obj instanceof InternalReferral ) + if ( obj instanceof Referral ) { - Collection refs = ( ( InternalReferral ) obj ).getLdapUrls(); + Collection refs = ( ( Referral ) obj ).getLdapUrls(); // if their sizes do not match they are not equal if ( refs.size() != urls.size() ) Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java Wed Aug 18 00:27:16 2010 @@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.ldap.RuntimeMultiException; -import org.apache.directory.shared.ldap.message.internal.InternalMessage; +import org.apache.directory.shared.ldap.message.internal.Message; /** @@ -42,7 +42,7 @@ public class ResponseCarryingMessageExce private static final long serialVersionUID = 1L; /** The response with the error cause */ - private InternalMessage response; + private Message response; /** * Constructs an Exception without a message. @@ -68,7 +68,7 @@ public class ResponseCarryingMessageExce * 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; } @@ -77,7 +77,7 @@ public class ResponseCarryingMessageExce * Get the constructed response * @return The constructed response */ - public InternalMessage getResponse() + public Message getResponse() { return response; } Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java Wed Aug 18 00:27:16 2010 @@ -62,7 +62,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.filter.SearchScope; import org.apache.directory.shared.ldap.filter.SimpleNode; import org.apache.directory.shared.ldap.filter.SubstringNode; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.apache.directory.shared.ldap.message.internal.SearchResultDone; import org.apache.directory.shared.ldap.name.DN; @@ -73,7 +73,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class SearchRequestImpl extends AbstractAbandonableRequest implements InternalSearchRequest +public class SearchRequestImpl extends AbstractAbandonableRequest implements SearchRequest { static final long serialVersionUID = -5655881944020886218L; @@ -965,7 +965,7 @@ public class SearchRequestImpl extends A return false; } - InternalSearchRequest req = ( InternalSearchRequest ) obj; + SearchRequest req = ( SearchRequest ) obj; if ( !req.getBase().equals( baseDn ) ) { Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultDoneImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultDoneImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultDoneImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultDoneImpl.java Wed Aug 18 00:27:16 2010 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.message; -import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse; +import org.apache.directory.shared.ldap.message.internal.AbstractResultResponse; import org.apache.directory.shared.ldap.message.internal.LdapResult; import org.apache.directory.shared.ldap.message.internal.SearchResultDone; @@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class SearchResultDoneImpl extends InternalAbstractResultResponse implements SearchResultDone +public class SearchResultDoneImpl extends AbstractResultResponse implements SearchResultDone { /** The encoded searchResultDone length */ private int searchResultDoneLength; Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultReferenceImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultReferenceImpl.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultReferenceImpl.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultReferenceImpl.java Wed Aug 18 00:27:16 2010 @@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.message.internal.AbstractResponse; -import org.apache.directory.shared.ldap.message.internal.InternalReferral; +import org.apache.directory.shared.ldap.message.internal.Referral; import org.apache.directory.shared.ldap.message.internal.SearchResultReference; @@ -36,7 +36,7 @@ public class SearchResultReferenceImpl e static final long serialVersionUID = 7423807019951309810L; /** Referral holding the reference urls */ - private InternalReferral referral; + private Referral referral; /** The length of the referral */ private int referralLength; @@ -71,7 +71,7 @@ public class SearchResultReferenceImpl e * * @return the sequence of LdapUrls */ - public InternalReferral getReferral() + public Referral getReferral() { return this.referral; } @@ -82,7 +82,7 @@ public class SearchResultReferenceImpl e * * @param referral the sequence of LdapUrls */ - public void setReferral( InternalReferral referral ) + public void setReferral( Referral referral ) { this.referral = referral; }