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 [7/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/...
Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/AddResponse.java (from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAddResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/AddResponse.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/AddResponse.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAddResponse.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/InternalAddResponse.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/AddResponse.java Sat Aug 14 14:18:49 2010
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface InternalAddResponse extends InternalResultResponse
+public interface AddResponse extends ResultResponse
{
/** Add response message type enumeration value */
MessageTypeEnum TYPE = MessageTypeEnum.ADD_RESPONSE;
Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/BindResponse.java (from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalBindResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/BindResponse.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/BindResponse.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalBindResponse.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/InternalBindResponse.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/BindResponse.java Sat Aug 14 14:18:49 2010
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface InternalBindResponse extends InternalResultResponse
+public interface BindResponse extends ResultResponse
{
/** Bind response message type enumeration value */
MessageTypeEnum TYPE = MessageTypeEnum.BIND_RESPONSE;
Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/CompareResponse.java (from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalCompareResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/CompareResponse.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/CompareResponse.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalCompareResponse.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/InternalCompareResponse.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/CompareResponse.java Sat Aug 14 14:18:49 2010
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface InternalCompareResponse extends InternalResultResponse
+public interface CompareResponse extends ResultResponse
{
/** Compare response message type enumeration value */
MessageTypeEnum TYPE = MessageTypeEnum.COMPARE_RESPONSE;
Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/DeleteResponse.java (from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalDeleteResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/DeleteResponse.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/DeleteResponse.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalDeleteResponse.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/InternalDeleteResponse.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/DeleteResponse.java Sat Aug 14 14:18:49 2010
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface InternalDeleteResponse extends InternalResultResponse
+public interface DeleteResponse extends ResultResponse
{
/** Delete response message type enumeration value */
MessageTypeEnum TYPE = MessageTypeEnum.DEL_RESPONSE;
Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ExtendedResponse.java (from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalExtendedResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ExtendedResponse.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ExtendedResponse.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalExtendedResponse.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/InternalExtendedResponse.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ExtendedResponse.java Sat Aug 14 14:18:49 2010
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface InternalExtendedResponse extends InternalResultResponse, javax.naming.ldap.ExtendedResponse
+public interface ExtendedResponse extends ResultResponse, javax.naming.ldap.ExtendedResponse
{
/** Extended response message type enumeration value */
MessageTypeEnum TYPE = MessageTypeEnum.EXTENDED_RESPONSE;
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractResultResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractResultResponse.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/internal/InternalAbstractResultResponse.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractResultResponse.java Sat Aug 14 14:18:49 2010
@@ -30,10 +30,10 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class InternalAbstractResultResponse extends InternalAbstractResponse implements InternalResultResponse
+public abstract class InternalAbstractResultResponse extends AbstractResponse implements ResultResponse
{
/** Response result components */
- protected InternalLdapResult ldapResult = new LdapResultImpl();
+ protected LdapResult ldapResult = new LdapResultImpl();
// ------------------------------------------------------------------------
@@ -61,7 +61,7 @@ public abstract class InternalAbstractRe
*
* @return the LdapResult for this Response.
*/
- public InternalLdapResult getLdapResult()
+ public LdapResult getLdapResult()
{
return ldapResult;
}
@@ -109,12 +109,12 @@ public abstract class InternalAbstractRe
return false;
}
- if ( !( obj instanceof InternalResultResponse ) )
+ if ( !( obj instanceof ResultResponse ) )
{
return false;
}
- InternalResultResponse resp = ( InternalResultResponse ) obj;
+ ResultResponse resp = ( ResultResponse ) obj;
if ( ldapResult != null && resp.getLdapResult() == null )
{
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAddRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAddRequest.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/internal/InternalAddRequest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAddRequest.java Sat Aug 14 14:18:49 2010
@@ -39,7 +39,7 @@ public interface InternalAddRequest exte
MessageTypeEnum TYPE = MessageTypeEnum.ADD_REQUEST;
/** LDAPv3 add response type enum code */
- MessageTypeEnum RESP_TYPE = InternalAddResponse.TYPE;
+ MessageTypeEnum RESP_TYPE = AddResponse.TYPE;
/**
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalBindRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalBindRequest.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/internal/InternalBindRequest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalBindRequest.java Sat Aug 14 14:18:49 2010
@@ -36,7 +36,7 @@ public interface InternalBindRequest ext
MessageTypeEnum TYPE = MessageTypeEnum.BIND_REQUEST;
/** Bind response message type enumeration value */
- MessageTypeEnum RESP_TYPE = InternalBindResponse.TYPE;
+ MessageTypeEnum RESP_TYPE = BindResponse.TYPE;
/**
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalCompareRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalCompareRequest.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/internal/InternalCompareRequest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalCompareRequest.java Sat Aug 14 14:18:49 2010
@@ -37,7 +37,7 @@ public interface InternalCompareRequest
MessageTypeEnum TYPE = MessageTypeEnum.COMPARE_REQUEST;
/** Compare response message type enum code */
- MessageTypeEnum RESP_TYPE = InternalCompareResponse.TYPE;
+ MessageTypeEnum RESP_TYPE = CompareResponse.TYPE;
/**
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalDeleteRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalDeleteRequest.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/internal/InternalDeleteRequest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalDeleteRequest.java Sat Aug 14 14:18:49 2010
@@ -36,7 +36,7 @@ public interface InternalDeleteRequest e
MessageTypeEnum TYPE = MessageTypeEnum.DEL_REQUEST;
/** Delete response message type enumeration value */
- MessageTypeEnum RESP_TYPE = InternalDeleteResponse.TYPE;
+ MessageTypeEnum RESP_TYPE = DeleteResponse.TYPE;
/**
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalExtendedRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalExtendedRequest.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/internal/InternalExtendedRequest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalExtendedRequest.java Sat Aug 14 14:18:49 2010
@@ -62,7 +62,7 @@ public interface InternalExtendedRequest
MessageTypeEnum TYPE = MessageTypeEnum.EXTENDED_REQUEST;
/** Extended response message type enumeration value */
- MessageTypeEnum RESP_TYPE = InternalExtendedResponse.TYPE;
+ MessageTypeEnum RESP_TYPE = ExtendedResponse.TYPE;
/**
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalIntermediateResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalIntermediateResponse.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/internal/InternalIntermediateResponse.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalIntermediateResponse.java Sat Aug 14 14:18:49 2010
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface InternalIntermediateResponse extends InternalResponse
+public interface InternalIntermediateResponse extends Response
{
/** Intermediate response message type enumeration value */
MessageTypeEnum TYPE = MessageTypeEnum.INTERMEDIATE_RESPONSE;
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyDnRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyDnRequest.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/internal/InternalModifyDnRequest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyDnRequest.java Sat Aug 14 14:18:49 2010
@@ -72,7 +72,7 @@ public interface InternalModifyDnRequest
MessageTypeEnum TYPE = MessageTypeEnum.MODIFYDN_REQUEST;
/** Modify DN response message type enumeration value */
- MessageTypeEnum RESP_TYPE = InternalModifyDnResponse.TYPE;
+ MessageTypeEnum RESP_TYPE = ModifyDnResponse.TYPE;
/**
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyRequest.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/internal/InternalModifyRequest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyRequest.java Sat Aug 14 14:18:49 2010
@@ -102,7 +102,7 @@ public interface InternalModifyRequest e
MessageTypeEnum TYPE = MessageTypeEnum.MODIFY_REQUEST;
/** Modify response message type enumeration value */
- MessageTypeEnum RESP_TYPE = InternalModifyResponse.TYPE;
+ MessageTypeEnum RESP_TYPE = ModifyResponse.TYPE;
/**
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalResultResponseRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalResultResponseRequest.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/internal/InternalResultResponseRequest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalResultResponseRequest.java Sat Aug 14 14:18:49 2010
@@ -34,5 +34,5 @@ public interface InternalResultResponseR
* @return a result containing response with defaults and the messageId set
* in response to this specific request
*/
- InternalResultResponse getResultResponse();
+ ResultResponse getResultResponse();
}
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.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/internal/InternalSearchRequest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java Sat Aug 14 14:18:49 2010
@@ -48,10 +48,10 @@ public interface InternalSearchRequest e
*/
MessageTypeEnum[] RESPONSE_TYPES =
{
- InternalSearchResultDone.TYPE,
- InternalSearchResultEntry.TYPE,
- InternalSearchResultReference.TYPE,
- InternalExtendedResponse.TYPE
+ SearchResultDone.TYPE,
+ SearchResultEntry.TYPE,
+ SearchResultReference.TYPE,
+ ExtendedResponse.TYPE
};
Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/LdapResult.java (from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalLdapResult.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/LdapResult.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/LdapResult.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalLdapResult.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/InternalLdapResult.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/LdapResult.java Sat Aug 14 14:18:49 2010
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface InternalLdapResult
+public interface LdapResult
{
/**
* Gets the result code enumeration associated with the response.
Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ModifyDnResponse.java (from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyDnResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ModifyDnResponse.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ModifyDnResponse.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyDnResponse.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/InternalModifyDnResponse.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ModifyDnResponse.java Sat Aug 14 14:18:49 2010
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface InternalModifyDnResponse extends InternalResultResponse
+public interface ModifyDnResponse extends ResultResponse
{
/** Modify DN response message type enumeration value */
MessageTypeEnum TYPE = MessageTypeEnum.MODIFYDN_RESPONSE;
Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ModifyResponse.java (from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ModifyResponse.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ModifyResponse.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyResponse.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/InternalModifyResponse.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ModifyResponse.java Sat Aug 14 14:18:49 2010
@@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap.
* request message.
*
*/
-public interface InternalModifyResponse extends InternalResultResponse
+public interface ModifyResponse extends ResultResponse
{
/** Modify response message type enumeration value */
MessageTypeEnum TYPE = MessageTypeEnum.MODIFY_RESPONSE;
Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/Response.java (from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/Response.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/Response.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalResponse.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/InternalResponse.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/Response.java Sat Aug 14 14:18:49 2010
@@ -37,6 +37,6 @@ package org.apache.directory.shared.ldap
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface InternalResponse extends InternalMessage
+public interface Response extends InternalMessage
{
}
Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ResultResponse.java (from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalResultResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ResultResponse.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ResultResponse.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalResultResponse.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/InternalResultResponse.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ResultResponse.java Sat Aug 14 14:18:49 2010
@@ -25,12 +25,12 @@ package org.apache.directory.shared.ldap
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface InternalResultResponse extends InternalResponse
+public interface ResultResponse extends Response
{
/**
* Gets the LdapResult components of this Response.
*
* @return the LdapResult for this Response.
*/
- InternalLdapResult getLdapResult();
+ LdapResult getLdapResult();
}
Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/SearchResultDone.java (from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultDone.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/SearchResultDone.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/SearchResultDone.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultDone.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/InternalSearchResultDone.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/SearchResultDone.java Sat Aug 14 14:18:49 2010
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
* $Rev: 910150 $
*/
-public interface InternalSearchResultDone extends InternalResultResponse
+public interface SearchResultDone extends ResultResponse
{
/** Search done response message type enumeration value */
MessageTypeEnum TYPE = MessageTypeEnum.SEARCH_RESULT_DONE;
Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/SearchResultEntry.java (from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultEntry.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/SearchResultEntry.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/SearchResultEntry.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultEntry.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/InternalSearchResultEntry.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/SearchResultEntry.java Sat Aug 14 14:18:49 2010
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface InternalSearchResultEntry extends InternalResponse
+public interface SearchResultEntry extends Response
{
/** Search entry response message type enumeration value */
MessageTypeEnum TYPE = MessageTypeEnum.SEARCH_RESULT_ENTRY;
Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/SearchResultReference.java (from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultReference.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/SearchResultReference.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/SearchResultReference.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultReference.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/InternalSearchResultReference.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/SearchResultReference.java Sat Aug 14 14:18:49 2010
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface InternalSearchResultReference extends InternalResponse
+public interface SearchResultReference extends Response
{
/** Search reference response message type enumeration value */
MessageTypeEnum TYPE = MessageTypeEnum.SEARCH_RESULT_REFERENCE;
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java Sat Aug 14 14:18:49 2010
@@ -36,7 +36,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.message.LdapProtocolEncoder;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-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.InternalReferral;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
@@ -291,7 +291,7 @@ public class LdapResultTest
}
// Check the decoded AddResponse
- InternalAddResponse addResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalAddResponse();
+ AddResponse addResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalAddResponse();
assertEquals( 1, addResponse.getMessageId() );
assertEquals( ResultCodeEnum.SUCCESS, addResponse.getLdapResult().getResultCode() );
@@ -354,7 +354,7 @@ public class LdapResultTest
}
// Check the decoded AddResponse
- InternalAddResponse addResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalAddResponse();
+ AddResponse addResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalAddResponse();
assertEquals( 1, addResponse.getMessageId() );
assertEquals( ResultCodeEnum.REFERRAL, addResponse.getLdapResult().getResultCode() );
@@ -432,7 +432,7 @@ public class LdapResultTest
}
// Check the decoded AddResponse
- InternalAddResponse addResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalAddResponse();
+ AddResponse addResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalAddResponse();
assertEquals( 1, addResponse.getMessageId() );
assertEquals( ResultCodeEnum.REFERRAL, addResponse.getLdapResult().getResultCode() );
@@ -509,7 +509,7 @@ public class LdapResultTest
}
// Check the decoded AddResponse
- InternalAddResponse addResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalAddResponse();
+ AddResponse addResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalAddResponse();
assertEquals( 1, addResponse.getMessageId() );
assertEquals( ResultCodeEnum.REFERRAL, addResponse.getLdapResult().getResultCode() );
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java Sat Aug 14 14:18:49 2010
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.LdapProtocolEncoder;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
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.AddResponse;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -97,7 +97,7 @@ public class AddResponseTest
}
// Check the decoded AddResponse
- InternalAddResponse addResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalAddResponse();
+ AddResponse addResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalAddResponse();
assertEquals( 1, addResponse.getMessageId() );
assertEquals( ResultCodeEnum.SUCCESS, addResponse.getLdapResult().getResultCode() );
@@ -212,7 +212,7 @@ public class AddResponseTest
}
// Check the decoded AddResponse
- InternalAddResponse addResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalAddResponse();
+ AddResponse addResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalAddResponse();
assertEquals( 1, addResponse.getMessageId() );
assertEquals( ResultCodeEnum.SUCCESS, addResponse.getLdapResult().getResultCode() );
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java Sat Aug 14 14:18:49 2010
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.LdapProtocolEncoder;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.control.Control;
-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.junit.Test;
import org.junit.runner.RunWith;
@@ -100,7 +100,7 @@ public class BindResponseTest
}
// Check the decoded BindResponse
- InternalBindResponse bindResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindResponse();
+ BindResponse bindResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindResponse();
assertEquals( 1, bindResponse.getMessageId() );
assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() );
@@ -189,7 +189,7 @@ public class BindResponseTest
}
// Check the decoded BindResponse
- InternalBindResponse bindResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindResponse();
+ BindResponse bindResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindResponse();
assertEquals( 1, bindResponse.getMessageId() );
assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() );
@@ -275,7 +275,7 @@ public class BindResponseTest
}
// Check the decoded BindResponse
- InternalBindResponse bindResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindResponse();
+ BindResponse bindResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindResponse();
assertEquals( 1, bindResponse.getMessageId() );
assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() );
@@ -361,7 +361,7 @@ public class BindResponseTest
}
// Check the decoded BindResponse
- InternalBindResponse bindResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindResponse();
+ BindResponse bindResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindResponse();
assertEquals( 1, bindResponse.getMessageId() );
assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() );
@@ -443,7 +443,7 @@ public class BindResponseTest
}
// Check the decoded BindResponse
- InternalBindResponse bindResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindResponse();
+ BindResponse bindResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindResponse();
assertEquals( 1, bindResponse.getMessageId() );
assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() );
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java Sat Aug 14 14:18:49 2010
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.LdapProtocolEncoder;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
+import org.apache.directory.shared.ldap.message.internal.CompareResponse;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -100,7 +100,7 @@ public class CompareResponseTest
}
// Check the decoded CompareResponse PDU
- InternalCompareResponse compareResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+ CompareResponse compareResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalCompareResponse();
assertEquals( 1, compareResponse.getMessageId() );
@@ -183,7 +183,7 @@ public class CompareResponseTest
}
// Check the decoded CompareResponse PDU
- InternalCompareResponse compareResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+ CompareResponse compareResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalCompareResponse();
assertEquals( 1, compareResponse.getMessageId() );
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java Sat Aug 14 14:18:49 2010
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.LdapProtocolEncoder;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteResponse;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -107,7 +107,7 @@ public class DelResponseTest
}
// Check the decoded DelResponse PDU
- InternalDeleteResponse delResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalDelResponse();
+ DeleteResponse delResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalDelResponse();
assertEquals( 1, delResponse.getMessageId() );
assertEquals( ResultCodeEnum.ALIAS_PROBLEM, delResponse.getLdapResult().getResultCode() );
@@ -231,7 +231,7 @@ public class DelResponseTest
}
// Check the decoded DelResponse PDU
- InternalDeleteResponse delResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalDelResponse();
+ DeleteResponse delResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalDelResponse();
assertEquals( 1, delResponse.getMessageId() );
assertEquals( ResultCodeEnum.ALIAS_PROBLEM, delResponse.getLdapResult().getResultCode() );
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java Sat Aug 14 14:18:49 2010
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.LdapProtocolEncoder;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.control.Control;
-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.junit.Test;
import org.junit.runner.RunWith;
@@ -102,7 +102,7 @@ public class ExtendedResponseTest
}
// Check the decoded ExtendedResponse PDU
- InternalExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+ ExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalExtendedResponse();
assertEquals( 1, extendedResponse.getMessageId() );
@@ -194,7 +194,7 @@ public class ExtendedResponseTest
}
// Check the decoded ExtendedResponse PDU
- InternalExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+ ExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalExtendedResponse();
assertEquals( 1, extendedResponse.getMessageId() );
@@ -277,7 +277,7 @@ public class ExtendedResponseTest
}
// Check the decoded ExtendedResponse PDU
- InternalExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+ ExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalExtendedResponse();
assertEquals( 1, extendedResponse.getMessageId() );
@@ -360,7 +360,7 @@ public class ExtendedResponseTest
}
// Check the decoded ExtendedResponse PDU
- InternalExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+ ExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalExtendedResponse();
assertEquals( 1, extendedResponse.getMessageId() );
@@ -564,7 +564,7 @@ public class ExtendedResponseTest
}
// Check the decoded ExtendedResponse PDU
- InternalExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+ ExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalExtendedResponse();
assertEquals( 1, extendedResponse.getMessageId() );
@@ -651,7 +651,7 @@ public class ExtendedResponseTest
}
// Check the decoded ExtendedResponse PDU
- InternalExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+ ExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalExtendedResponse();
assertEquals( 1, extendedResponse.getMessageId() );
@@ -743,7 +743,7 @@ public class ExtendedResponseTest
}
// Check the decoded ExtendedResponse PDU
- InternalExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+ ExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalExtendedResponse();
assertEquals( 1, extendedResponse.getMessageId() );
@@ -831,7 +831,7 @@ public class ExtendedResponseTest
}
// Check the decoded ExtendedResponse PDU
- InternalExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+ ExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalExtendedResponse();
assertEquals( 1, extendedResponse.getMessageId() );
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java Sat Aug 14 14:18:49 2010
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.LdapProtocolEncoder;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -99,7 +99,7 @@ public class ModifyResponseTest
}
// Check the decoded ModifyResponse PDU
- InternalModifyResponse modifyResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+ ModifyResponse modifyResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalModifyResponse();
assertEquals( 1, modifyResponse.getMessageId() );
@@ -180,7 +180,7 @@ public class ModifyResponseTest
}
// Check the decoded ModifyResponse PDU
- InternalModifyResponse modifyResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+ ModifyResponse modifyResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalModifyResponse();
assertEquals( 1, modifyResponse.getMessageId() );
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java Sat Aug 14 14:18:49 2010
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.LdapProtocolEncoder;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -100,7 +100,7 @@ public class ModifyDNResponseTest
}
// Check the decoded ModifyDNResponse PDU
- InternalModifyDnResponse modifyDnResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+ ModifyDnResponse modifyDnResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalModifyDnResponse();
assertEquals( 1, modifyDnResponse.getMessageId() );
@@ -183,7 +183,7 @@ public class ModifyDNResponseTest
}
// Check the decoded ModifyDNResponse PDU
- InternalModifyDnResponse modifyDnResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+ ModifyDnResponse modifyDnResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalModifyDnResponse();
assertEquals( 1, modifyDnResponse.getMessageId() );
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java Sat Aug 14 14:18:49 2010
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.LdapProtocolEncoder;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultDone;
+import org.apache.directory.shared.ldap.message.internal.SearchResultDone;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -97,7 +97,7 @@ public class SearchResultDoneTest
fail( de.getMessage() );
}
- InternalSearchResultDone searchResultDone = ( ( LdapMessageContainer ) ldapMessageContainer )
+ SearchResultDone searchResultDone = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalSearchResultDone();
assertEquals( 1, searchResultDone.getMessageId() );
@@ -178,7 +178,7 @@ public class SearchResultDoneTest
fail( de.getMessage() );
}
- InternalSearchResultDone searchResultDone = ( ( LdapMessageContainer ) ldapMessageContainer )
+ SearchResultDone searchResultDone = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalSearchResultDone();
assertEquals( 1, searchResultDone.getMessageId() );
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java Sat Aug 14 14:18:49 2010
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.message.LdapProtocolEncoder;
import org.apache.directory.shared.ldap.message.control.Control;
-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.junit.Test;
import org.junit.runner.RunWith;
@@ -112,7 +112,7 @@ public class SearchResultEntryTest
fail( de.getMessage() );
}
- InternalSearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
+ SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalSearchResultEntry();
assertEquals( 1, searchResultEntry.getMessageId() );
@@ -213,7 +213,7 @@ public class SearchResultEntryTest
fail( de.getMessage() );
}
- InternalSearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
+ SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalSearchResultEntry();
assertEquals( 1, searchResultEntry.getMessageId() );
@@ -324,7 +324,7 @@ public class SearchResultEntryTest
fail( de.getMessage() );
}
- InternalSearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
+ SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalSearchResultEntry();
assertEquals( 2, searchResultEntry.getMessageId() );
@@ -543,7 +543,7 @@ public class SearchResultEntryTest
fail( de.getMessage() );
}
- InternalSearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
+ SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalSearchResultEntry();
assertEquals( 1, searchResultEntry.getMessageId() );
@@ -818,7 +818,7 @@ public class SearchResultEntryTest
fail( de.getMessage() );
}
- InternalSearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
+ SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalSearchResultEntry();
assertEquals( 1, searchResultEntry.getMessageId() );
@@ -905,7 +905,7 @@ public class SearchResultEntryTest
fail( de.getMessage() );
}
- InternalSearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
+ SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalSearchResultEntry();
assertEquals( 1, searchResultEntry.getMessageId() );
@@ -995,7 +995,7 @@ public class SearchResultEntryTest
fail( de.getMessage() );
}
- InternalSearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
+ SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalSearchResultEntry();
assertEquals( 1, searchResultEntry.getMessageId() );
@@ -1092,7 +1092,7 @@ public class SearchResultEntryTest
fail( de.getMessage() );
}
- InternalSearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
+ SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalSearchResultEntry();
assertEquals( 1, searchResultEntry.getMessageId() );
@@ -1186,7 +1186,7 @@ public class SearchResultEntryTest
fail( de.getMessage() );
}
- InternalSearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
+ SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalSearchResultEntry();
assertEquals( 1, searchResultEntry.getMessageId() );
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java Sat Aug 14 14:18:49 2010
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.LdapProtocolEncoder;
import org.apache.directory.shared.ldap.message.control.Control;
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.StringTools;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -126,7 +126,7 @@ public class SearchResultReferenceTest
fail( de.getMessage() );
}
- InternalSearchResultReference searchResultReference = ( ( LdapMessageContainer ) ldapMessageContainer )
+ SearchResultReference searchResultReference = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalSearchResultReference();
assertEquals( 1, searchResultReference.getMessageId() );
@@ -257,7 +257,7 @@ public class SearchResultReferenceTest
stream.flip();
- InternalSearchResultReference searchResultReference = ( ( LdapMessageContainer ) ldapMessageContainer )
+ SearchResultReference searchResultReference = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalSearchResultReference();
assertEquals( 1, searchResultReference.getMessageId() );
@@ -398,7 +398,7 @@ public class SearchResultReferenceTest
fail( de.getMessage() );
}
- InternalSearchResultReference searchResultReference = ( ( LdapMessageContainer ) ldapMessageContainer )
+ SearchResultReference searchResultReference = ( ( LdapMessageContainer ) ldapMessageContainer )
.getInternalSearchResultReference();
assertEquals( 1, searchResultReference.getMessageId() );
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.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.controls.ControlImpl;
import org.apache.directory.shared.ldap.exception.LdapException;
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.LdapResult;
import org.apache.directory.shared.ldap.message.internal.InternalReferral;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
@@ -74,8 +74,8 @@ public class AbstractResultResponseTest
{
private static final long serialVersionUID = 1L;
};
- InternalLdapResult r0 = msg0.getLdapResult();
- InternalLdapResult r1 = msg1.getLdapResult();
+ LdapResult r0 = msg0.getLdapResult();
+ LdapResult r1 = msg1.getLdapResult();
r0.setErrorMessage( "blah blah blah" );
r1.setErrorMessage( "blah blah blah" );
@@ -113,8 +113,8 @@ public class AbstractResultResponseTest
{
private static final long serialVersionUID = 1L;
};
- InternalLdapResult r0 = msg0.getLdapResult();
- InternalLdapResult r1 = msg1.getLdapResult();
+ LdapResult r0 = msg0.getLdapResult();
+ LdapResult r1 = msg1.getLdapResult();
r0.setErrorMessage( "blah blah blah" );
r1.setErrorMessage( "blah blah blah" );
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java Sat Aug 14 14:18:49 2010
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
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.InternalAddRequest;
-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;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -290,7 +290,7 @@ public class AddRequestImplTest
}
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
return null;
}
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java Sat Aug 14 14:18:49 2010
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
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.InternalBindRequest;
-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;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -321,7 +321,7 @@ public class BindRequestImplTest
}
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
return null;
}
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java Sat Aug 14 14:18:49 2010
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
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.InternalCompareRequest;
-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;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -291,7 +291,7 @@ public class CompareRequestImplTest
}
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
return null;
}
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java Sat Aug 14 14:18:49 2010
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
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.InternalDeleteRequest;
-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;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -224,7 +224,7 @@ public class DeleteRequestImplTest
}
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
return null;
}
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java Sat Aug 14 14:18:49 2010
@@ -34,7 +34,7 @@ import org.apache.directory.junit.tools.
import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.ResultResponse;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -248,7 +248,7 @@ public class ExtendedRequestImplTest
}
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
return null;
}
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java Sat Aug 14 14:18:49 2010
@@ -31,8 +31,8 @@ import org.apache.directory.junit.tools.
import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
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.InternalExtendedResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.LdapResult;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -61,7 +61,7 @@ public class ExtendedResponseImplTest
ExtendedResponseImpl response = new ExtendedResponseImpl( 45 );
response.setResponseValue( "Hello World!".getBytes() );
response.setResponseName( "1.1.1.1" );
- InternalLdapResult result = response.getLdapResult();
+ LdapResult result = response.getLdapResult();
try
{
@@ -113,7 +113,7 @@ public class ExtendedResponseImplTest
public void testEqualsDiffImpl()
{
ExtendedResponseImpl resp0 = createStub();
- InternalExtendedResponse resp1 = new InternalExtendedResponse()
+ ExtendedResponse resp1 = new ExtendedResponse()
{
private static final long serialVersionUID = 5297000474419901408L;
@@ -162,7 +162,7 @@ public class ExtendedResponseImplTest
}
- public InternalLdapResult getLdapResult()
+ public LdapResult getLdapResult()
{
LdapResultImpl result = new LdapResultImpl();
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java Sat Aug 14 14:18:49 2010
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertTru
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.exception.LdapException;
-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;
import org.junit.Test;
@@ -91,7 +91,7 @@ public class LdapResultImplTest
{
LdapResultImpl r0 = new LdapResultImpl();
- InternalLdapResult r1 = new InternalLdapResult()
+ LdapResult r1 = new LdapResult()
{
public ResultCodeEnum getResultCode()
{
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java Sat Aug 14 14:18:49 2010
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
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.InternalModifyDnRequest;
-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;
import org.apache.directory.shared.ldap.name.RDN;
import org.junit.Test;
@@ -383,7 +383,7 @@ public class ModifyDnRequestImplTest
}
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
return null;
}
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java Sat Aug 14 14:18:49 2010
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
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.InternalModifyRequest;
-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;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -412,7 +412,7 @@ public class ModifyRequestImplTest
}
- public InternalResultResponse getResultResponse()
+ public ResultResponse getResultResponse()
{
return null;
}
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java Sat Aug 14 14:18:49 2010
@@ -31,8 +31,8 @@ import org.apache.directory.junit.tools.
import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
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.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;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -60,7 +60,7 @@ public class SearchResponseDoneImplTest
{
// Construct the Search response to test with results and referrals
SearchResultDoneImpl response = new SearchResultDoneImpl( 45 );
- InternalLdapResult result = response.getLdapResult();
+ LdapResult result = response.getLdapResult();
try
{
@@ -112,9 +112,9 @@ public class SearchResponseDoneImplTest
public void testEqualsDiffImpl()
{
SearchResultDoneImpl resp0 = createStub();
- InternalSearchResultDone resp1 = new InternalSearchResultDone()
+ SearchResultDone resp1 = new SearchResultDone()
{
- public InternalLdapResult getLdapResult()
+ public LdapResult getLdapResult()
{
LdapResultImpl result = new LdapResultImpl();
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java Sat Aug 14 14:18:49 2010
@@ -31,7 +31,7 @@ import org.apache.directory.junit.tools.
import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
import org.apache.directory.shared.ldap.message.control.Control;
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.junit.Test;
import org.junit.runner.RunWith;
@@ -56,7 +56,7 @@ public class SearchResponseReferenceImpl
* the parent lockable
* @return the newly created referral for testing
*/
- private InternalReferral getReferral( InternalSearchResultReference resp )
+ private InternalReferral getReferral( SearchResultReference resp )
{
ReferralImpl ref = new ReferralImpl();
resp.setReferral( ref );
@@ -101,7 +101,7 @@ public class SearchResponseReferenceImpl
@Test
public void testEqualsDiffImpl()
{
- InternalSearchResultReference resp0 = new InternalSearchResultReference()
+ SearchResultReference resp0 = new SearchResultReference()
{
public InternalReferral getReferral()
{