You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/08/14 16:18:55 UTC
svn commit: r985495 [6/7] - in /directory:
apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/
apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/admin/
apacheds/...
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java Sat Aug 14 14:18:49 2010
@@ -34,21 +34,21 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.unbind.UnBindRequestCodec;
import org.apache.directory.shared.ldap.message.internal.InternalAbandonRequest;
import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
+import org.apache.directory.shared.ldap.message.internal.CompareResponse;
import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
+import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
import org.apache.directory.shared.ldap.message.internal.InternalIntermediateResponse;
import org.apache.directory.shared.ldap.message.internal.InternalMessage;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultDone;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultReference;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.SearchResultDone;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.SearchResultReference;
import org.apache.directory.shared.ldap.message.internal.InternalUnbindRequest;
import org.apache.directory.shared.ldap.message.spi.BinaryAttributeDetector;
@@ -184,9 +184,9 @@ public class LdapMessageContainer extend
/**
* @return Returns the AddResponse stored in the container
*/
- public InternalAddResponse getInternalAddResponse()
+ public AddResponse getInternalAddResponse()
{
- return ( InternalAddResponse ) internalMessage;
+ return ( AddResponse ) internalMessage;
}
@@ -211,9 +211,9 @@ public class LdapMessageContainer extend
/**
* @return Returns the BindResponse stored in the container
*/
- public InternalBindResponse getInternalBindResponse()
+ public BindResponse getInternalBindResponse()
{
- return ( InternalBindResponse ) internalMessage;
+ return ( BindResponse ) internalMessage;
}
@@ -238,9 +238,9 @@ public class LdapMessageContainer extend
/**
* @return Returns the CompareResponse stored in the container
*/
- public InternalCompareResponse getInternalCompareResponse()
+ public CompareResponse getInternalCompareResponse()
{
- return ( InternalCompareResponse ) internalMessage;
+ return ( CompareResponse ) internalMessage;
}
@@ -265,9 +265,9 @@ public class LdapMessageContainer extend
/**
* @return Returns the DelResponse stored in the container
*/
- public InternalDeleteResponse getInternalDelResponse()
+ public DeleteResponse getInternalDelResponse()
{
- return ( InternalDeleteResponse ) internalMessage;
+ return ( DeleteResponse ) internalMessage;
}
@@ -283,9 +283,9 @@ public class LdapMessageContainer extend
/**
* @return Returns the ExtendedResponse stored in the container
*/
- public InternalExtendedResponse getInternalExtendedResponse()
+ public ExtendedResponse getInternalExtendedResponse()
{
- return ( InternalExtendedResponse ) internalMessage;
+ return ( ExtendedResponse ) internalMessage;
}
@@ -310,9 +310,9 @@ public class LdapMessageContainer extend
/**
* @return Returns the ModifyResponse stored in the container
*/
- public InternalModifyResponse getInternalModifyResponse()
+ public ModifyResponse getInternalModifyResponse()
{
- return ( InternalModifyResponse ) internalMessage;
+ return ( ModifyResponse ) internalMessage;
}
@@ -328,9 +328,9 @@ public class LdapMessageContainer extend
/**
* @return Returns the ModifyDnResponse stored in the container
*/
- public InternalModifyDnResponse getInternalModifyDnResponse()
+ public ModifyDnResponse getInternalModifyDnResponse()
{
- return ( InternalModifyDnResponse ) internalMessage;
+ return ( ModifyDnResponse ) internalMessage;
}
@@ -346,27 +346,27 @@ public class LdapMessageContainer extend
/**
* @return Returns the SearchResultEntry stored in the container
*/
- public InternalSearchResultEntry getInternalSearchResultEntry()
+ public SearchResultEntry getInternalSearchResultEntry()
{
- return ( InternalSearchResultEntry ) internalMessage;
+ return ( SearchResultEntry ) internalMessage;
}
/**
* @return Returns the SearchResultReference stored in the container
*/
- public InternalSearchResultReference getInternalSearchResultReference()
+ public SearchResultReference getInternalSearchResultReference()
{
- return ( InternalSearchResultReference ) internalMessage;
+ return ( SearchResultReference ) internalMessage;
}
/**
* @return Returns the SearchResultDone stored in the container
*/
- public InternalSearchResultDone getInternalSearchResultDone()
+ public SearchResultDone getInternalSearchResultDone()
{
- return ( InternalSearchResultDone ) internalMessage;
+ return ( SearchResultDone ) internalMessage;
}
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Sat Aug 14 14:18:49 2010
@@ -103,24 +103,24 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.message.internal.InternalAbandonRequest;
import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
+import org.apache.directory.shared.ldap.message.internal.CompareResponse;
import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
+import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
import org.apache.directory.shared.ldap.message.internal.InternalIntermediateResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.internal.LdapResult;
import org.apache.directory.shared.ldap.message.internal.InternalMessage;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
import org.apache.directory.shared.ldap.message.internal.InternalReferral;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultDone;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultReference;
+import org.apache.directory.shared.ldap.message.internal.ResultResponse;
+import org.apache.directory.shared.ldap.message.internal.SearchResultDone;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.SearchResultReference;
import org.apache.directory.shared.ldap.message.internal.InternalUnbindRequest;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
@@ -833,7 +833,7 @@ public class LdapMessageGrammar extends
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the BindResponse Object
- InternalBindResponse bindResponse = new BindResponseImpl( ldapMessageContainer.getMessageId() );
+ BindResponse bindResponse = new BindResponseImpl( ldapMessageContainer.getMessageId() );
ldapMessageContainer.setInternalMessage( bindResponse );
}
} );
@@ -1030,7 +1030,7 @@ public class LdapMessageGrammar extends
if ( ldapMessageContainer.isInternal() )
{
InternalMessage response = ldapMessageContainer.getInternalMessage();
- InternalLdapResult ldapResult = ( ( InternalResultResponse ) response ).getLdapResult();
+ LdapResult ldapResult = ( ( ResultResponse ) response ).getLdapResult();
InternalReferral referral = new ReferralImpl();
@@ -1108,7 +1108,7 @@ public class LdapMessageGrammar extends
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the SearchResultEntry Object
- InternalSearchResultEntry searchResultEntry = new SearchResultEntryImpl( ldapMessageContainer
+ SearchResultEntry searchResultEntry = new SearchResultEntryImpl( ldapMessageContainer
.getMessageId() );
ldapMessageContainer.setInternalMessage( searchResultEntry );
}
@@ -1130,7 +1130,7 @@ public class LdapMessageGrammar extends
{
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
- InternalSearchResultEntry searchResultEntry = ldapMessageContainer.getInternalSearchResultEntry();
+ SearchResultEntry searchResultEntry = ldapMessageContainer.getInternalSearchResultEntry();
TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -1236,7 +1236,7 @@ public class LdapMessageGrammar extends
public void action( IAsn1Container container ) throws DecoderException
{
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
- InternalSearchResultEntry searchResultEntry = ldapMessageContainer.getInternalSearchResultEntry();
+ SearchResultEntry searchResultEntry = ldapMessageContainer.getInternalSearchResultEntry();
TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -1386,7 +1386,7 @@ public class LdapMessageGrammar extends
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the SearchResultDone Object
- InternalSearchResultDone searchResultDone = new SearchResultDoneImpl( ldapMessageContainer
+ SearchResultDone searchResultDone = new SearchResultDoneImpl( ldapMessageContainer
.getMessageId() );
ldapMessageContainer.setInternalMessage( searchResultDone );
@@ -1808,7 +1808,7 @@ public class LdapMessageGrammar extends
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the ModifyResponse Object
- InternalModifyResponse modifyResponse = new ModifyResponseImpl( ldapMessageContainer.getMessageId() );
+ ModifyResponse modifyResponse = new ModifyResponseImpl( ldapMessageContainer.getMessageId() );
ldapMessageContainer.setInternalMessage( modifyResponse );
log.debug( "Modify response" );
@@ -2076,7 +2076,7 @@ public class LdapMessageGrammar extends
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the AddResponse Object
- InternalAddResponse addResponse = new AddResponseImpl( ldapMessageContainer.getMessageId() );
+ AddResponse addResponse = new AddResponseImpl( ldapMessageContainer.getMessageId() );
ldapMessageContainer.setInternalMessage( addResponse );
// We will check that the request is not null
@@ -2125,7 +2125,7 @@ public class LdapMessageGrammar extends
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the DelResponse Object
- InternalDeleteResponse delResponse = new DeleteResponseImpl( ldapMessageContainer.getMessageId() );
+ DeleteResponse delResponse = new DeleteResponseImpl( ldapMessageContainer.getMessageId() );
ldapMessageContainer.setInternalMessage( delResponse );
log.debug( "Del response " );
@@ -2470,7 +2470,7 @@ public class LdapMessageGrammar extends
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the ModifyDnResponse Object
- InternalModifyDnResponse modifyDnResponse = new ModifyDnResponseImpl( ldapMessageContainer
+ ModifyDnResponse modifyDnResponse = new ModifyDnResponseImpl( ldapMessageContainer
.getMessageId() );
ldapMessageContainer.setInternalMessage( modifyDnResponse );
@@ -2727,7 +2727,7 @@ public class LdapMessageGrammar extends
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the CompareResponse Object
- InternalCompareResponse compareResponse = new CompareResponseImpl( ldapMessageContainer
+ CompareResponse compareResponse = new CompareResponseImpl( ldapMessageContainer
.getMessageId() );
ldapMessageContainer.setInternalMessage( compareResponse );
@@ -2776,7 +2776,7 @@ public class LdapMessageGrammar extends
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the SearchResultReference Object
- InternalSearchResultReference searchResultReference = new SearchResultReferenceImpl(
+ SearchResultReference searchResultReference = new SearchResultReferenceImpl(
ldapMessageContainer.getMessageId() );
ldapMessageContainer.setInternalMessage( searchResultReference );
@@ -2987,7 +2987,7 @@ public class LdapMessageGrammar extends
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the ExtendedResponse Object
- InternalExtendedResponse extendedResponse = new ExtendedResponseImpl( ldapMessageContainer
+ ExtendedResponse extendedResponse = new ExtendedResponseImpl( ldapMessageContainer
.getMessageId() );
ldapMessageContainer.setInternalMessage( extendedResponse );
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java Sat Aug 14 14:18:49 2010
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.internal.InternalMessage;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.ResultResponse;
import org.apache.directory.shared.ldap.name.DN;
@@ -63,7 +63,7 @@ public class ResponseCarryingException e
* @param message A message with meaning to a human
* @param cause The Exception which caused the error
*/
- public ResponseCarryingException(String message, InternalResultResponse response, ResultCodeEnum code,
+ public ResponseCarryingException(String message, ResultResponse response, ResultCodeEnum code,
DN matchedDn, Throwable cause)
{
super( message, cause );
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java Sat Aug 14 14:18:49 2010
@@ -27,8 +27,8 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
import org.apache.directory.shared.ldap.codec.LdapResponseCodec;
import org.apache.directory.shared.ldap.codec.LdapResultCodec;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+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.StringTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -78,8 +78,8 @@ public class ErrorMessageAction extends
if ( ldapMessageContainer.isInternal() )
{
- InternalResultResponse response = ( InternalResultResponse ) ldapMessageContainer.getInternalMessage();
- InternalLdapResult ldapResult = response.getLdapResult();
+ ResultResponse response = ( ResultResponse ) ldapMessageContainer.getInternalMessage();
+ LdapResult ldapResult = response.getLdapResult();
ldapResult.setErrorMessage( errorMessage );
}
else
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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -29,9 +29,9 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.LdapResponseCodec;
import org.apache.directory.shared.ldap.codec.LdapResultCodec;
import org.apache.directory.shared.ldap.message.ReferralImpl;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
+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.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.ResultResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -77,8 +77,8 @@ public class InitReferralsAction extends
if ( ldapMessageContainer.isInternal() )
{
- InternalResultResponse response = ( InternalResultResponse ) ldapMessageContainer.getInternalMessage();
- InternalLdapResult ldapResult = response.getLdapResult();
+ ResultResponse response = ( ResultResponse ) ldapMessageContainer.getInternalMessage();
+ LdapResult ldapResult = response.getLdapResult();
InternalReferral referral = new ReferralImpl();
ldapResult.setReferral( referral );
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java Sat Aug 14 14:18:49 2010
@@ -30,8 +30,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.LdapResultCodec;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.LdapResult;
+import org.apache.directory.shared.ldap.message.internal.ResultResponse;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
@@ -72,8 +72,8 @@ public class MatchedDNAction extends Gra
if ( ldapMessageContainer.isInternal() )
{
- InternalResultResponse response = ( InternalResultResponse ) ldapMessageContainer.getInternalMessage();
- InternalLdapResult ldapResult = response.getLdapResult();
+ ResultResponse response = ( ResultResponse ) ldapMessageContainer.getInternalMessage();
+ LdapResult ldapResult = response.getLdapResult();
resultCode = ldapResult.getResultCode();
}
else
@@ -136,8 +136,8 @@ public class MatchedDNAction extends Gra
if ( ldapMessageContainer.isInternal() )
{
- InternalResultResponse response = ( InternalResultResponse ) ldapMessageContainer.getInternalMessage();
- InternalLdapResult ldapResult = response.getLdapResult();
+ ResultResponse response = ( ResultResponse ) ldapMessageContainer.getInternalMessage();
+ LdapResult ldapResult = response.getLdapResult();
ldapResult.setMatchedDn( matchedDN );
}
else
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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -30,10 +30,10 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.LdapResultCodec;
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.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.internal.LdapResult;
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.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.ResultResponse;
import org.apache.directory.shared.ldap.util.LdapURL;
import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
@@ -72,7 +72,7 @@ public class ReferralAction extends Gram
if ( ldapMessageContainer.isInternal() )
{
InternalMessage response = ldapMessageContainer.getInternalMessage();
- InternalLdapResult ldapResult = ( ( InternalResultResponse ) response ).getLdapResult();
+ LdapResult ldapResult = ( ( ResultResponse ) response ).getLdapResult();
InternalReferral 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/ResponseAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseAction.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseAction.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseAction.java Sat Aug 14 14:18:49 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.InternalExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,7 +60,7 @@ public class ResponseAction extends Gram
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// We can allocate the ExtendedResponse Object
- InternalExtendedResponse extendedResponse = ldapMessageContainer.getInternalExtendedResponse();
+ ExtendedResponse extendedResponse = ldapMessageContainer.getInternalExtendedResponse();
// Get the Value and store it in the ExtendedResponse
TLV tlv = ldapMessageContainer.getCurrentTLV();
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java Sat Aug 14 14:18:49 2010
@@ -27,7 +27,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.primitives.OID;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,7 +61,7 @@ public class ResponseNameAction extends
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// We can allocate the ExtendedResponse Object
- InternalExtendedResponse extendedResponse = ldapMessageContainer.getInternalExtendedResponse();
+ ExtendedResponse extendedResponse = ldapMessageContainer.getInternalExtendedResponse();
// Get the Value and store it in the ExtendedResponse
TLV tlv = ldapMessageContainer.getCurrentTLV();
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java Sat Aug 14 14:18:49 2010
@@ -32,8 +32,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.LdapResponseCodec;
import org.apache.directory.shared.ldap.codec.LdapResultCodec;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+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.StringTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -144,8 +144,8 @@ public class ResultCodeAction extends Gr
if ( ldapMessageContainer.isInternal() )
{
- InternalResultResponse response = ( InternalResultResponse ) ldapMessageContainer.getInternalMessage();
- InternalLdapResult ldapResult = response.getLdapResult();
+ ResultResponse response = ( ResultResponse ) ldapMessageContainer.getInternalMessage();
+ LdapResult ldapResult = response.getLdapResult();
ldapResult.setResultCode( resultCode );
}
else
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java Sat Aug 14 14:18:49 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.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,7 +56,7 @@ public class SearchResultAttributeValueA
public void action( IAsn1Container container )
{
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
- InternalSearchResultEntry searchResultEntry = ldapMessageContainer.getInternalSearchResultEntry();
+ SearchResultEntry searchResultEntry = ldapMessageContainer.getInternalSearchResultEntry();
TLV tlv = ldapMessageContainer.getCurrentTLV();
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java Sat Aug 14 14:18:49 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.InternalBindResponse;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,7 +74,7 @@ public class ServerSASLCredsAction exten
serverSaslCreds = tlv.getValue().getData();
}
- InternalBindResponse response = ( InternalBindResponse ) ldapMessageContainer.getInternalMessage();
+ BindResponse response = ( BindResponse ) ldapMessageContainer.getInternalMessage();
response.setServerSaslCreds( serverSaslCreds );
// We can have an END transition
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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
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.InternalSearchResultReference;
+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;
import org.slf4j.Logger;
@@ -64,7 +64,7 @@ public class StoreReferenceAction extend
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
- InternalSearchResultReference searchResultReference = ldapMessageContainer.getInternalSearchResultReference();
+ SearchResultReference searchResultReference = ldapMessageContainer.getInternalSearchResultReference();
// Get the Value and store it in the BindRequest
TLV tlv = ldapMessageContainer.getCurrentTLV();
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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -27,8 +27,8 @@ 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.InternalAddRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
+import org.apache.directory.shared.ldap.message.internal.ResultResponse;
import org.apache.directory.shared.ldap.name.DN;
@@ -44,7 +44,7 @@ public class AddRequestImpl extends Abst
/** A MultiMap of the new entry's attributes and their values */
private Entry entry;
- private InternalAddResponse response;
+ private AddResponse response;
/** The current attribute being decoded */
private EntryAttribute currentAttribute;
@@ -198,7 +198,7 @@ public class AddRequestImpl extends Abst
*
* @return the result containing response for this request
*/
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
if ( response == 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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
/**
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class AddResponseImpl extends InternalAbstractResultResponse implements InternalAddResponse
+public class AddResponseImpl extends InternalAbstractResultResponse 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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -25,8 +25,8 @@ 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.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
+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;
@@ -63,7 +63,7 @@ public class BindRequestImpl extends Abs
private boolean isVersion3 = true;
/** The associated response */
- public InternalBindResponse response;
+ public BindResponse response;
// ------------------------------------------------------------------------
@@ -299,7 +299,7 @@ public class BindRequestImpl extends Abs
*
* @return the result containing response for this request
*/
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
if ( response == null )
{
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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -23,7 +23,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.InternalBindResponse;
+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 <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
*/
-public class BindResponseImpl extends InternalAbstractResultResponse implements InternalBindResponse
+public class BindResponseImpl extends InternalAbstractResultResponse implements BindResponse
{
static final long serialVersionUID = -5146809476518669755L;
@@ -138,7 +138,7 @@ public class BindResponseImpl extends In
return true;
}
- if ( ( obj == null ) || !( obj instanceof InternalBindResponse ) )
+ if ( ( obj == null ) || !( obj instanceof BindResponse ) )
{
return false;
}
@@ -148,7 +148,7 @@ public class BindResponseImpl extends In
return false;
}
- InternalBindResponse response = ( InternalBindResponse ) obj;
+ BindResponse response = ( BindResponse ) obj;
byte[] creds = response.getServerSaslCreds();
if ( serverSaslCreds == null )
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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -25,8 +25,8 @@ 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.InternalCompareRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.CompareResponse;
+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;
@@ -49,7 +49,7 @@ public class CompareRequestImpl extends
/** The value of the attribute used in the comparison */
private Value<?> attrVal;
- private InternalCompareResponse response;
+ private CompareResponse response;
// ------------------------------------------------------------------------
@@ -184,7 +184,7 @@ public class CompareRequestImpl extends
*
* @return the result containing response for this request
*/
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
if ( response == 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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
+import org.apache.directory.shared.ldap.message.internal.CompareResponse;
/**
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
*/
-public class CompareResponseImpl extends InternalAbstractResultResponse implements InternalCompareResponse
+public class CompareResponseImpl extends InternalAbstractResultResponse 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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -22,8 +22,8 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
+import org.apache.directory.shared.ldap.message.internal.ResultResponse;
import org.apache.directory.shared.ldap.name.DN;
@@ -39,7 +39,7 @@ public class DeleteRequestImpl extends A
/** The distinguished name of the entry to delete */
private DN name;
- private InternalDeleteResponse response;
+ private DeleteResponse response;
// ------------------------------------------------------------------------
@@ -109,7 +109,7 @@ public class DeleteRequestImpl extends A
*
* @return the result containing response for this request
*/
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
if ( response == 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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteResponse;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
/**
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
*/
-public class DeleteResponseImpl extends InternalAbstractResultResponse implements InternalDeleteResponse
+public class DeleteResponseImpl extends InternalAbstractResultResponse 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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -28,7 +28,7 @@ import javax.naming.ldap.ExtendedRespons
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.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.ResultResponse;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -47,7 +47,7 @@ public class ExtendedRequestImpl extends
/** Extended request's payload or <b>requestValue</b> */
protected byte[] payload;
- protected InternalResultResponse response;
+ protected ResultResponse response;
// -----------------------------------------------------------------------
@@ -142,7 +142,7 @@ public class ExtendedRequestImpl extends
*
* @return the result containing response for this request
*/
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
if ( response == 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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -23,7 +23,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.InternalExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
*/
-public class ExtendedResponseImpl extends InternalAbstractResultResponse implements InternalExtendedResponse
+public class ExtendedResponseImpl extends InternalAbstractResultResponse implements ExtendedResponse
{
static final long serialVersionUID = -6646752766410531060L;
@@ -176,12 +176,12 @@ public class ExtendedResponseImpl extend
return false;
}
- if ( !( obj instanceof InternalExtendedResponse ) )
+ if ( !( obj instanceof ExtendedResponse ) )
{
return false;
}
- InternalExtendedResponse resp = ( InternalExtendedResponse ) obj;
+ ExtendedResponse resp = ( ExtendedResponse ) obj;
if ( ( responseName != null ) && ( resp.getResponseName() == null ) )
{
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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -41,20 +41,20 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
+import org.apache.directory.shared.ldap.message.internal.CompareResponse;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
+import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
import org.apache.directory.shared.ldap.message.internal.InternalIntermediateResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.internal.LdapResult;
import org.apache.directory.shared.ldap.message.internal.InternalMessage;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
import org.apache.directory.shared.ldap.message.internal.InternalReferral;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultDone;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultReference;
+import org.apache.directory.shared.ldap.message.internal.SearchResultDone;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.SearchResultReference;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.mina.core.buffer.IoBuffer;
@@ -116,12 +116,12 @@ public class LdapProtocolEncoder extends
int length = computeMessageLength( message );
ByteBuffer buffer = ByteBuffer.allocate( length );
- if ( ( message instanceof InternalBindResponse ) || ( message instanceof InternalDeleteResponse )
- || ( message instanceof InternalAddResponse ) || ( message instanceof InternalCompareResponse )
- || ( message instanceof InternalExtendedResponse ) || ( message instanceof InternalModifyResponse )
- || ( message instanceof InternalModifyDnResponse ) || ( message instanceof InternalIntermediateResponse )
- || ( message instanceof InternalSearchResultDone ) || ( message instanceof InternalSearchResultEntry )
- || ( message instanceof InternalSearchResultReference ) )
+ if ( ( message instanceof BindResponse ) || ( message instanceof DeleteResponse )
+ || ( message instanceof AddResponse ) || ( message instanceof CompareResponse )
+ || ( message instanceof ExtendedResponse ) || ( message instanceof ModifyResponse )
+ || ( message instanceof ModifyDnResponse ) || ( message instanceof InternalIntermediateResponse )
+ || ( message instanceof SearchResultDone ) || ( message instanceof SearchResultEntry )
+ || ( message instanceof SearchResultReference ) )
{
try
{
@@ -277,7 +277,7 @@ public class LdapProtocolEncoder extends
* Length(0x01) + 1 + Length(0x04) + Length(L1) + L1 + Length(0x04) +
* Length(L2) + L2 + Length(0x83) + Length(L3) + L3
*/
- private int computeLdapResultLength( InternalLdapResult internalLdapResult )
+ private int computeLdapResultLength( LdapResult internalLdapResult )
{
LdapResultImpl ldapResult = ( LdapResultImpl ) internalLdapResult;
int ldapResultLength = 0;
@@ -321,7 +321,7 @@ public class LdapProtocolEncoder extends
* @param buffer The buffer where to put the PDU
* @return The PDU.
*/
- private ByteBuffer encodeLdapResult( ByteBuffer buffer, InternalLdapResult internalLdapResult )
+ private ByteBuffer encodeLdapResult( ByteBuffer buffer, LdapResult internalLdapResult )
throws EncoderException
{
LdapResultImpl ldapResult = ( LdapResultImpl ) internalLdapResult;
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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -21,7 +21,7 @@
package org.apache.directory.shared.ldap.message;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.internal.LdapResult;
import org.apache.directory.shared.ldap.message.internal.InternalReferral;
import org.apache.directory.shared.ldap.name.DN;
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class LdapResultImpl implements InternalLdapResult
+public class LdapResultImpl implements LdapResult
{
static final long serialVersionUID = -1446626887394613213L;
@@ -256,13 +256,13 @@ public class LdapResultImpl implements I
}
// return false if object does not implement interface
- if ( !( obj instanceof InternalLdapResult ) )
+ if ( !( obj instanceof LdapResult ) )
{
return false;
}
// compare all the like elements of the two LdapResult objects
- InternalLdapResult result = ( InternalLdapResult ) obj;
+ LdapResult result = ( LdapResult ) obj;
if ( referral == null && result.getReferral() != null )
{
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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -22,8 +22,8 @@ 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.InternalModifyDnResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+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;
import org.apache.directory.shared.ldap.name.RDN;
@@ -49,7 +49,7 @@ public class ModifyDnRequestImpl extends
/** PDU's <b>deleteOldRdn</b> flag */
private boolean deleteOldRdn = false;
- private InternalModifyDnResponse response;
+ private ModifyDnResponse response;
// -----------------------------------------------------------------------
@@ -220,7 +220,7 @@ public class ModifyDnRequestImpl extends
*
* @return the result containing response for this request
*/
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
if ( response == 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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
/**
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
*/
-public class ModifyDnResponseImpl extends InternalAbstractResultResponse implements InternalModifyDnResponse
+public class ModifyDnResponseImpl extends InternalAbstractResultResponse 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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -30,8 +30,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.DefaultModification;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+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;
@@ -50,7 +50,7 @@ public class ModifyRequestImpl extends A
/** Sequence of modifications or PDU's <b>modification</b> seqence field */
private List<Modification> mods = new ArrayList<Modification>();
- private InternalModifyResponse response;
+ private ModifyResponse response;
// ------------------------------------------------------------------------
@@ -155,7 +155,7 @@ public class ModifyRequestImpl extends A
*
* @return the result containing response for this request
*/
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
if ( response == 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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -21,14 +21,14 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
/**
* ModifyResponse implementation
*
*/
-public class ModifyResponseImpl extends InternalAbstractResultResponse implements InternalModifyResponse
+public class ModifyResponseImpl extends InternalAbstractResultResponse 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/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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -30,9 +30,9 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.filter.BranchNormalizedVisitor;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.ResultResponse;
import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultDone;
+import org.apache.directory.shared.ldap.message.internal.SearchResultDone;
import org.apache.directory.shared.ldap.name.DN;
@@ -70,7 +70,7 @@ public class SearchRequestImpl extends A
private List<String> attributes = new ArrayList<String>();
/** The final result containing SearchResponseDone response */
- private InternalSearchResultDone response;
+ private SearchResultDone response;
// ------------------------------------------------------------------------
@@ -341,7 +341,7 @@ public class SearchRequestImpl extends A
*
* @return the result containing response for this request
*/
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
if ( response == null )
{
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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -21,8 +21,8 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultDone;
+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 <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
*/
-public class SearchResultDoneImpl extends InternalAbstractResultResponse implements InternalSearchResultDone
+public class SearchResultDoneImpl extends InternalAbstractResultResponse implements SearchResultDone
{
/** The encoded searchResultDone length */
private int searchResultDoneLength;
@@ -90,7 +90,7 @@ public class SearchResultDoneImpl extend
return false;
}
- InternalLdapResult result = ( ( InternalSearchResultDone ) obj ).getLdapResult();
+ LdapResult result = ( ( SearchResultDone ) obj ).getLdapResult();
if ( !getLdapResult().equals( result ) )
{
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntryImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntryImpl.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntryImpl.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntryImpl.java Sat Aug 14 14:18:49 2010
@@ -28,8 +28,8 @@ 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.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalAbstractResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.AbstractResponse;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class SearchResultEntryImpl extends InternalAbstractResponse implements InternalSearchResultEntry
+public class SearchResultEntryImpl extends AbstractResponse implements SearchResultEntry
{
static final long serialVersionUID = -8357316233060886637L;
@@ -229,12 +229,12 @@ public class SearchResultEntryImpl exten
return false;
}
- if ( !( obj instanceof InternalSearchResultEntry ) )
+ if ( !( obj instanceof SearchResultEntry ) )
{
return false;
}
- InternalSearchResultEntry resp = ( InternalSearchResultEntry ) obj;
+ SearchResultEntry resp = ( SearchResultEntry ) obj;
return entry.equals( resp.getEntry() );
}
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=985495&r1=985494&r2=985495&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 Sat Aug 14 14:18:49 2010
@@ -21,9 +21,9 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalAbstractResponse;
+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.InternalSearchResultReference;
+import org.apache.directory.shared.ldap.message.internal.SearchResultReference;
/**
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class SearchResultReferenceImpl extends InternalAbstractResponse implements InternalSearchResultReference
+public class SearchResultReferenceImpl extends AbstractResponse implements SearchResultReference
{
static final long serialVersionUID = 7423807019951309810L;
@@ -143,7 +143,7 @@ public class SearchResultReferenceImpl e
return false;
}
- InternalSearchResultReference resp = ( InternalSearchResultReference ) obj;
+ SearchResultReference resp = ( SearchResultReference ) obj;
if ( this.referral != null && resp.getReferral() == null )
{
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java Sat Aug 14 14:18:49 2010
@@ -29,7 +29,7 @@ import org.apache.directory.shared.i18n.
import org.apache.directory.shared.ldap.codec.extended.operations.cancel.Cancel;
import org.apache.directory.shared.ldap.codec.extended.operations.cancel.CancelDecoder;
import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.ResultResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -160,7 +160,7 @@ public class CancelRequest extends Exten
}
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
if ( response == null )
{
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java Sat Aug 14 14:18:49 2010
@@ -29,7 +29,7 @@ import org.apache.directory.shared.i18n.
import org.apache.directory.shared.ldap.codec.extended.operations.certGeneration.CertGenerationDecoder;
import org.apache.directory.shared.ldap.codec.extended.operations.certGeneration.CertGenerationObject;
import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.ResultResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -145,7 +145,7 @@ public class CertGenerationRequest exten
}
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
if ( response == null )
{
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java Sat Aug 14 14:18:49 2010
@@ -29,7 +29,7 @@ import org.apache.directory.shared.i18n.
import org.apache.directory.shared.ldap.codec.extended.operations.gracefulShutdown.GracefulShutdown;
import org.apache.directory.shared.ldap.codec.extended.operations.gracefulShutdown.GracefulShutdownDecoder;
import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.ResultResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -146,7 +146,7 @@ public class GracefulShutdownRequest ext
}
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
if ( response == null )
{
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java Sat Aug 14 14:18:49 2010
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedureDecoder;
import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedure.StoredProcedureParameter;
import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.ResultResponse;
import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -130,7 +130,7 @@ public class StoredProcedureRequest exte
}
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
if ( response == null )
{
Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/AbstractResponse.java (from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/AbstractResponse.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/AbstractResponse.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractResponse.java&r1=985491&r2=985495&rev=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractResponse.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/AbstractResponse.java Sat Aug 14 14:18:49 2010
@@ -27,7 +27,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
*/
-public abstract class InternalAbstractResponse extends InternalAbstractMessage implements InternalResponse
+public abstract class AbstractResponse extends InternalAbstractMessage implements Response
{
// ------------------------------------------------------------------------
// Response Interface Method Implementations
@@ -42,7 +42,7 @@ public abstract class InternalAbstractRe
* @param type
* the message type of the response
*/
- protected InternalAbstractResponse(final int id, final MessageTypeEnum type)
+ protected AbstractResponse(final int id, final MessageTypeEnum type)
{
super( id, type );
}