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 14:25:40 UTC
svn commit: r985476 - in /directory:
apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/
shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/
shared/branches/shar...
Author: elecharny
Date: Sat Aug 14 12:25:39 2010
New Revision: 985476
URL: http://svn.apache.org/viewvc?rev=985476&view=rev
Log:
o Moved the LdapProtocolEncoder close to the message
o Removed the 'public' qualifier from the messages' method dedicated to the encoder
o Some renaming to get close to the RFC
Added:
directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java
- copied, changed from r985467, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProtocolEncoder.java
Removed:
directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProtocolEncoder.java
Modified:
directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java
directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java
directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProvider.java
directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlEnum.java
directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java
directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java
directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java
directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java
directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java
directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java
directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAddResponse.java
directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalBindResponse.java
directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalCompareResponse.java
directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalDeleteResponse.java
directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalIntermediateResponse.java
directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java
directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java
directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java
directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java
directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java
directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java
directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java
directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java
directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java
directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java
directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java
directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java?rev=985476&r1=985475&r2=985476&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java Sat Aug 14 12:25:39 2010
@@ -22,7 +22,7 @@ package org.apache.directory.server.ldap
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.shared.asn1.codec.Asn1CodecDecoder;
-import org.apache.directory.shared.ldap.codec.LdapProtocolEncoder;
+import org.apache.directory.shared.ldap.message.LdapProtocolEncoder;
import org.apache.directory.shared.ldap.message.MessageDecoder;
import org.apache.directory.shared.ldap.message.spi.BinaryAttributeDetector;
import org.apache.directory.shared.ldap.schema.AttributeType;
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java?rev=985476&r1=985475&r2=985476&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java Sat Aug 14 12:25:39 2010
@@ -27,7 +27,6 @@ import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.WritableByteChannel;
import java.util.Collection;
-import java.util.Map;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
@@ -35,10 +34,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.asn1.codec.stateful.EncoderCallback;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
-import org.apache.directory.shared.ldap.message.BindResponseImpl;
-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.InternalLdapResult;
import org.apache.directory.shared.ldap.message.internal.InternalMessage;
import org.apache.directory.shared.ldap.message.internal.InternalReferral;
@@ -224,15 +219,8 @@ public class LdapEncoder implements Prov
InternalMessage message = ( InternalMessage ) request;
ByteBuffer encoded = null;
- if ( message instanceof InternalBindResponse )
- {
- encoded = encodeMessage( message );
- }
- else
- {
- LdapMessageCodec ldapRequest = ( LdapMessageCodec ) LdapTransformer.transform( ( InternalMessage ) request );
- encoded = ldapRequest.encode();
- }
+ LdapMessageCodec ldapRequest = ( LdapMessageCodec ) LdapTransformer.transform( ( InternalMessage ) request );
+ encoded = ldapRequest.encode();
encoded.flip();
@@ -288,7 +276,7 @@ public class LdapEncoder implements Prov
* @param message The message to encode
* @return A ByteBuffer that contains the PDU
* @throws EncoderException If anything goes wrong.
- */
+ *
private ByteBuffer encodeMessage( InternalMessage message ) throws EncoderException
{
int length = computeMessageLength( message );
@@ -354,7 +342,7 @@ public class LdapEncoder implements Prov
* MessageId length = Length(0x02) + length(MessageId) + MessageId.length
* L1 = length(ProtocolOp)
* LdapMessage length = Length(0x30) + Length(L1) + MessageId length + L1
- */
+ *
private int computeMessageLength( InternalMessage message )
{
// The length of the MessageId. It's the sum of
@@ -546,7 +534,6 @@ public class LdapEncoder implements Prov
return buffer;
}
-
/**
* Compute the BindResponse length
*
@@ -560,7 +547,7 @@ public class LdapEncoder implements Prov
* L1 = Length(LdapResult) [ + Length(serverSaslCreds) ]
* Length(BindResponse) = Length(0x61) + Length(L1) + L1
* </pre>
- */
+ *
private int computeBindResponseLength( BindResponseImpl bindResponse )
{
int ldapResultLength = computeLdapResultLength( bindResponse.getLdapResult() );
@@ -591,7 +578,7 @@ public class LdapEncoder implements Prov
*
* @param buffer The buffer where to put the PDU
* @return The PDU.
- */
+ *
private void encodeBindResponse( ByteBuffer bb, BindResponseImpl bindResponse ) throws EncoderException
{
try
@@ -641,7 +628,7 @@ public class LdapEncoder implements Prov
* Length(BindRequest) = Length(0x60) + Length(L1) + L1 + Length(0x02) + 1 + 1 +
* Length(0x04) + Length(L2) + L2 + Length(authentication)
* </pre>
- */
+ *
private int computeProtocolOpLength( InternalMessage message )
{
switch ( message.getType() )
@@ -653,8 +640,9 @@ public class LdapEncoder implements Prov
return 0;
}
}
+ */
-
+ /*
private void encodeProtocolOp( ByteBuffer bb, InternalMessage message ) throws EncoderException
{
switch ( message.getType() )
@@ -663,4 +651,5 @@ public class LdapEncoder implements Prov
encodeBindResponse( bb, ( BindResponseImpl ) message );
}
}
+ */
}
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProvider.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProvider.java?rev=985476&r1=985475&r2=985476&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProvider.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProvider.java Sat Aug 14 12:25:39 2010
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.codec;
+
import org.apache.directory.shared.ldap.message.spi.BinaryAttributeDetector;
import org.apache.directory.shared.ldap.message.spi.Provider;
import org.apache.directory.shared.ldap.message.spi.ProviderDecoder;
@@ -83,7 +84,8 @@ public class LdapProvider extends Provid
* @throws org.apache.directory.shared.ldap.message.spi.ProviderException
* if the provider or its decoder cannot be found
*/
- public ProviderDecoder getDecoder( BinaryAttributeDetector binaryAttributeDetector, int maxPDUSize ) throws ProviderException
+ public ProviderDecoder getDecoder( BinaryAttributeDetector binaryAttributeDetector, int maxPDUSize )
+ throws ProviderException
{
return new LdapDecoder( this, binaryAttributeDetector, maxPDUSize );
}
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlEnum.java?rev=985476&r1=985475&r2=985476&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlEnum.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlEnum.java Sat Aug 14 12:25:39 2010
@@ -113,7 +113,7 @@ public enum ControlEnum
/**
* Create a new instance of the control identified by its oid
- * @param oid The Control's oid
+ * @param responseName The Control's oid
*/
private ControlEnum( Control control )
{
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -53,18 +53,19 @@ public class AddResponseImpl extends Int
/**
- * {@inheritDoc}
+ * Stores the encoded length for the AddResponse
+ * @param addResponseLength The encoded length
*/
- public void setAddResponseLength( int addResponseLength )
+ /* No qualifier*/void setAddResponseLength( int addResponseLength )
{
this.addResponseLength = addResponseLength;
}
/**
- * {@inheritDoc}
+ * @return The encoded AddResponse's length
*/
- public int getAddResponseLength()
+ /* No qualifier */int getAddResponseLength()
{
return addResponseLength;
}
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -168,18 +168,19 @@ public class BindResponseImpl extends In
/**
- * {@inheritDoc}
+ * Stores the encoded length for the BindResponse
+ * @param bindResponseLength The encoded length
*/
- public void setBindResponseLength( int bindResponseLength )
+ /* No qualifier*/void setBindResponseLength( int bindResponseLength )
{
this.bindResponseLength = bindResponseLength;
}
/**
- * {@inheritDoc}
+ * @return The encoded BindResponse's length
*/
- public int getBindResponseLength()
+ /* No qualifier */int getBindResponseLength()
{
return bindResponseLength;
}
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -56,7 +56,7 @@ public class CompareResponseImpl extends
* Stores the encoded length for the CompareResponse
* @param compareResponseLength The encoded length
*/
- public void setCompareResponseLength( int compareResponseLength )
+ /* No qualifier*/void setCompareResponseLength( int compareResponseLength )
{
this.compareResponseLength = compareResponseLength;
}
@@ -65,7 +65,7 @@ public class CompareResponseImpl extends
/**
* @return The encoded CompareResponse's length
*/
- public int getCompareResponseLength()
+ /* No qualifier*/int getCompareResponseLength()
{
return compareResponseLength;
}
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -53,18 +53,19 @@ public class DeleteResponseImpl extends
/**
- * {@inheritDoc}
+ * Stores the encoded length for the DeleteResponse
+ * @param deleteResponseLength The encoded length
*/
- public void setDeleteResponseLength( int deleteResponseLength )
+ /* No qualifier*/void setDeleteResponseLength( int deleteResponseLength )
{
this.deleteResponseLength = deleteResponseLength;
}
/**
- * {@inheritDoc}
+ * @return The encoded DeleteResponse's length
*/
- public int getDeleteResponseLength()
+ /* No qualifier*/int getDeleteResponseLength()
{
return deleteResponseLength;
}
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -104,7 +104,7 @@ public class ExtendedResponseImpl extend
*
* @return the responseName bytes of the extended response type.
*/
- public byte[] getResponseNameBytes()
+ /* No qualifier*/byte[] getResponseNameBytes()
{
return responseNameBytes;
}
@@ -127,7 +127,7 @@ public class ExtendedResponseImpl extend
*
* @param oidBytes the OID bytes of the extended response type.
*/
- public void setResponseNameBytes( byte[] responseNameBytes )
+ /* No qualifier*/void setResponseNameBytes( byte[] responseNameBytes )
{
this.responseNameBytes = responseNameBytes;
}
@@ -270,18 +270,20 @@ public class ExtendedResponseImpl extend
/**
- * {@inheritDoc}
+ * Stores the encoded length for the ExtendedResponse
+ *
+ * @param extendedResponseLength The encoded length
*/
- public void setExtendedResponseLength( int extendedResponseLength )
+ /* No qualifier*/void setExtendedResponseLength( int extendedResponseLength )
{
this.extendedResponseLength = extendedResponseLength;
}
/**
- * {@inheritDoc}
+ * @return The encoded ExtendedResponse's length
*/
- public int getExtendedResponseLength()
+ /* No qualifier*/int getExtendedResponseLength()
{
return extendedResponseLength;
}
Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java?rev=985476&r1=985475&r2=985476&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java Sat Aug 14 12:25:39 2010
@@ -36,13 +36,13 @@ public class IntermediateResponseImpl ex
static final long serialVersionUID = -6646752766410531060L;
/** ResponseName for the intermediate response */
- protected String oid;
+ protected String responseName;
/** The response name as a byte[] */
- private byte[] oidBytes;
+ private byte[] responseNameBytes;
/** Response Value for the intermediate response */
- protected byte[] value;
+ protected byte[] responseValue;
/** The encoded intermediateResponse length */
private int intermediateResponseLength;
@@ -68,13 +68,13 @@ public class IntermediateResponseImpl ex
*/
public byte[] getResponseValue()
{
- if ( value == null )
+ if ( responseValue == null )
{
return null;
}
- final byte[] copy = new byte[value.length];
- System.arraycopy( value, 0, copy, 0, value.length );
+ final byte[] copy = new byte[responseValue.length];
+ System.arraycopy( responseValue, 0, copy, 0, responseValue.length );
return copy;
}
@@ -88,12 +88,12 @@ public class IntermediateResponseImpl ex
{
if ( value != null )
{
- this.value = new byte[value.length];
- System.arraycopy( value, 0, this.value, 0, value.length );
+ this.responseValue = new byte[value.length];
+ System.arraycopy( value, 0, this.responseValue, 0, value.length );
}
else
{
- this.value = null;
+ this.responseValue = null;
}
}
@@ -106,18 +106,18 @@ public class IntermediateResponseImpl ex
*/
public String getResponseName()
{
- return ( ( oid == null ) ? "" : oid );
+ return ( ( responseName == null ) ? "" : responseName );
}
/**
- * Gets the OID bytes
+ * Gets the ResponseName bytes
*
- * @return the OID bytes of the Intermediate response type.
+ * @return the ResponseName bytes of the Intermediate response type.
*/
- public byte[] getOidBytes()
+ /* No qualifier */byte[] getResponseNameBytes()
{
- return oidBytes;
+ return responseNameBytes;
}
@@ -129,16 +129,18 @@ public class IntermediateResponseImpl ex
*/
public void setResponseName( String oid )
{
- this.oid = oid;
+ this.responseName = oid;
}
/**
- * {@inheritDoc}
+ * Sets the ResponseName bytes
+ *
+ * @param oid the ResponseName bytes of the Intermediate response type.
*/
- public void setOidBytes( byte[] oidBytes )
+ /* No qualifier */void setResponseNameBytes( byte[] responseNameBytes )
{
- this.oidBytes = oidBytes;
+ this.responseNameBytes = responseNameBytes;
}
@@ -149,13 +151,13 @@ public class IntermediateResponseImpl ex
public int hashCode()
{
int hash = 37;
- if ( oid != null )
+ if ( responseName != null )
{
- hash = hash * 17 + oid.hashCode();
+ hash = hash * 17 + responseName.hashCode();
}
- if ( value != null )
+ if ( responseValue != null )
{
- hash = hash * 17 + Arrays.hashCode( value );
+ hash = hash * 17 + Arrays.hashCode( responseValue );
}
hash = hash * 17 + super.hashCode();
@@ -188,33 +190,34 @@ public class IntermediateResponseImpl ex
InternalIntermediateResponse resp = ( InternalIntermediateResponse ) obj;
- if ( ( oid != null ) && ( resp.getResponseName() == null ) )
+ if ( ( responseName != null ) && ( resp.getResponseName() == null ) )
{
return false;
}
- if ( ( oid == null ) && ( resp.getResponseName() != null ) )
+ if ( ( responseName == null ) && ( resp.getResponseName() != null ) )
{
return false;
}
- if ( ( oid != null ) && ( resp.getResponseName() != null ) && !oid.equals( resp.getResponseName() ) )
+ if ( ( responseName != null ) && ( resp.getResponseName() != null )
+ && !responseName.equals( resp.getResponseName() ) )
{
return false;
}
- if ( ( value != null ) && ( resp.getResponseValue() == null ) )
+ if ( ( responseValue != null ) && ( resp.getResponseValue() == null ) )
{
return false;
}
- if ( ( value == null ) && ( resp.getResponseValue() != null ) )
+ if ( ( responseValue == null ) && ( resp.getResponseValue() != null ) )
{
return false;
}
- if ( ( value != null ) && ( resp.getResponseValue() != null )
- && !Arrays.equals( value, resp.getResponseValue() ) )
+ if ( ( responseValue != null ) && ( resp.getResponseValue() != null )
+ && !Arrays.equals( responseValue, resp.getResponseValue() ) )
{
return false;
}
@@ -224,18 +227,20 @@ public class IntermediateResponseImpl ex
/**
- * {@inheritDoc}
+ * Stores the encoded length for the IntermediateResponse
+ *
+ * @param intermediateResponseLength The encoded length
*/
- public void setIntermediateResponseLength( int intermediateResponseLength )
+ /* No qualifier*/void setIntermediateResponseLength( int intermediateResponseLength )
{
this.intermediateResponseLength = intermediateResponseLength;
}
/**
- * {@inheritDoc}
+ * @return The encoded IntermediateResponse's length
*/
- public int getIntermediateResponseLength()
+ /* No qualifier*/int getIntermediateResponseLength()
{
return intermediateResponseLength;
}
Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java (from r985467, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/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?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProtocolEncoder.java&r1=985467&r2=985476&rev=985476&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProtocolEncoder.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java Sat Aug 14 12:25:39 2010
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.codec;
+package org.apache.directory.shared.ldap.message;
import java.nio.BufferOverflowException;
@@ -33,20 +33,13 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.asn1.util.Asn1StringUtils;
import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.codec.LdapConstants;
+import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
+import org.apache.directory.shared.ldap.codec.LdapTransformer;
+import org.apache.directory.shared.ldap.codec.MessageEncoderException;
import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.message.AddResponseImpl;
-import org.apache.directory.shared.ldap.message.BindResponseImpl;
-import org.apache.directory.shared.ldap.message.CompareResponseImpl;
-import org.apache.directory.shared.ldap.message.DeleteResponseImpl;
-import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;
-import org.apache.directory.shared.ldap.message.IntermediateResponseImpl;
-import org.apache.directory.shared.ldap.message.ModifyDnResponseImpl;
-import org.apache.directory.shared.ldap.message.ModifyResponseImpl;
-import org.apache.directory.shared.ldap.message.SearchResultDoneImpl;
-import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
-import org.apache.directory.shared.ldap.message.SearchResultReferenceImpl;
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;
@@ -512,9 +505,8 @@ public class LdapProtocolEncoder extends
*
* @return The ExtendedResponse length
*/
- private int computeExtendedResponseLength( InternalExtendedResponse internalExtendedResponse )
+ private int computeExtendedResponseLength( ExtendedResponseImpl extendedResponse )
{
- ExtendedResponseImpl extendedResponse = ( ExtendedResponseImpl ) internalExtendedResponse;
int ldapResultLength = computeLdapResultLength( extendedResponse.getLdapResult() );
int extendedResponseLength = ldapResultLength;
@@ -559,7 +551,7 @@ public class LdapProtocolEncoder extends
*
* @return The IntermediateResponse length
*/
- private int computeIntermediateResponseLength( InternalIntermediateResponse intermediateResponse )
+ private int computeIntermediateResponseLength( IntermediateResponseImpl intermediateResponse )
{
int intermediateResponseLength = 0;
@@ -569,7 +561,7 @@ public class LdapProtocolEncoder extends
int responseNameLength = responseNameBytes.length;
intermediateResponseLength += 1 + TLV.getNbBytes( responseNameLength ) + responseNameLength;
- intermediateResponse.setOidBytes( responseNameBytes );
+ intermediateResponse.setResponseNameBytes( responseNameBytes );
}
byte[] encodedValue = intermediateResponse.getResponseValue();
@@ -728,7 +720,7 @@ public class LdapProtocolEncoder extends
* +--> 0x04 L7-m-n value
* </pre>
*/
- private int computeSearchResultEntryLength( InternalSearchResultEntry searchResultEntry )
+ private int computeSearchResultEntryLength( SearchResultEntryImpl searchResultEntry )
{
DN dn = searchResultEntry.getObjectName();
@@ -834,7 +826,7 @@ public class LdapProtocolEncoder extends
* Length(SearchResultReference) = Length(0x73 + Length(L1) + L1
* </pre>
*/
- private int computeSearchResultReferenceLength( InternalSearchResultReference searchResultReference )
+ private int computeSearchResultReferenceLength( SearchResultReferenceImpl searchResultReference )
{
int searchResultReferenceLength = 0;
@@ -1049,7 +1041,7 @@ public class LdapProtocolEncoder extends
buffer.put( TLV.getBytes( intermediateResponse.getIntermediateResponseLength() ) );
// The responseName, if any
- byte[] responseNameBytes = intermediateResponse.getOidBytes();
+ byte[] responseNameBytes = intermediateResponse.getResponseNameBytes();
if ( ( responseNameBytes != null ) && ( responseNameBytes.length != 0 ) )
{
Modified: 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/InternalAddResponse.java?rev=985476&r1=985475&r2=985476&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/InternalAddResponse.java Sat Aug 14 12:25:39 2010
@@ -34,17 +34,4 @@ public interface InternalAddResponse ext
{
/** Add response message type enumeration value */
MessageTypeEnum TYPE = MessageTypeEnum.ADD_RESPONSE;
-
-
- /**
- * Stores the encoded length for the AddResponse
- * @param addResponseLength The encoded length
- */
- void setAddResponseLength( int addResponseLength );
-
-
- /**
- * @return The encoded AddResponse's length
- */
- int getAddResponseLength();
}
Modified: 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/InternalBindResponse.java?rev=985476&r1=985475&r2=985476&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/InternalBindResponse.java Sat Aug 14 12:25:39 2010
@@ -51,21 +51,7 @@ public interface InternalBindResponse ex
* that are SASL mechanism specific. Leave null if authentication mode is
* simple.
*
- * @param a_serverSaslCreds
- * the sasl auth. mech. specific credentials
+ * @param serverSaslCreds the sasl auth. mech. specific credentials
*/
- void setServerSaslCreds( byte[] a_serverSaslCreds );
-
-
- /**
- * Stores the encoded length for the BindResponse
- * @param bindResponseLength The encoded length
- */
- void setBindResponseLength( int bindResponseLength );
-
-
- /**
- * @return The encoded BindResponse's length
- */
- int getBindResponseLength();
+ void setServerSaslCreds( byte[] serverSaslCreds );
}
Modified: 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/InternalCompareResponse.java?rev=985476&r1=985475&r2=985476&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/InternalCompareResponse.java Sat Aug 14 12:25:39 2010
@@ -36,19 +36,6 @@ public interface InternalCompareResponse
/**
- * Stores the encoded length for the CompareResponse
- * @param compareResponseLength The encoded length
- */
- void setCompareResponseLength( int compareResponseLength );
-
-
- /**
- * @return The encoded CompareResponse's length
- */
- int getCompareResponseLength();
-
-
- /**
* @return True if the compared response is a success
* @return
*/
Modified: 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/InternalDeleteResponse.java?rev=985476&r1=985475&r2=985476&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/InternalDeleteResponse.java Sat Aug 14 12:25:39 2010
@@ -33,17 +33,4 @@ public interface InternalDeleteResponse
{
/** Delete response message type enumeration value */
MessageTypeEnum TYPE = MessageTypeEnum.DEL_RESPONSE;
-
-
- /**
- * Stores the encoded length for the DeleteResponse
- * @param deleteResponseLength The encoded length
- */
- void setDeleteResponseLength( int deleteResponseLength );
-
-
- /**
- * @return The encoded DeleteResponse's length
- */
- int getDeleteResponseLength();
}
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -66,25 +66,4 @@ public interface InternalIntermediateRes
* @param value The responseValue
*/
void setResponseValue( byte[] value );
-
-
- /**
- * Sets the OID bytes
- *
- * @param oid the OID bytes of the Intermediate response type.
- */
- void setOidBytes( byte[] oidBytes );
-
-
- /**
- * Stores the encoded length for the IntermediateResponse
- * @param intermediateResponseLength The encoded length
- */
- void setIntermediateResponseLength( int intermediateResponseLength );
-
-
- /**
- * @return The encoded IntermediateResponse's length
- */
- int getIntermediateResponseLength();
}
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -34,6 +34,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.codec.DecoderException;
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.InternalReferral;
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -34,7 +34,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.LdapProtocolEncoder;
+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;
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -35,8 +35,8 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.LdapProtocolEncoder;
import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControl;
+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;
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -34,7 +34,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.LdapProtocolEncoder;
+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;
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -34,7 +34,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.LdapProtocolEncoder;
+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;
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -34,7 +34,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.LdapProtocolEncoder;
+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;
Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java?rev=985476&r1=985475&r2=985476&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java Sat Aug 14 12:25:39 2010
@@ -34,7 +34,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.LdapProtocolEncoder;
+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.InternalIntermediateResponse;
import org.apache.directory.shared.ldap.util.StringTools;
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -34,7 +34,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.LdapProtocolEncoder;
+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;
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -34,7 +34,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.LdapProtocolEncoder;
+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;
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -34,7 +34,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.LdapProtocolEncoder;
+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;
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -36,9 +36,9 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.LdapProtocolEncoder;
import org.apache.directory.shared.ldap.entry.Entry;
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.util.StringTools;
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=985476&r1=985475&r2=985476&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 12:25:39 2010
@@ -37,7 +37,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.LdapProtocolEncoder;
+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;