Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 22388 invoked from network); 14 Sep 2010 00:10:28 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 Sep 2010 00:10:28 -0000 Received: (qmail 26513 invoked by uid 500); 14 Sep 2010 00:10:28 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 26449 invoked by uid 500); 14 Sep 2010 00:10:28 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 26442 invoked by uid 99); 14 Sep 2010 00:10:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Sep 2010 00:10:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Sep 2010 00:10:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 40257238890B; Tue, 14 Sep 2010 00:10:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r996725 - in /directory: apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/ apacheds/trunk/server-tools/src/main/java/org/apach... Date: Tue, 14 Sep 2010 00:10:04 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100914001005.40257238890B@eris.apache.org> Author: elecharny Date: Tue Sep 14 00:10:03 2010 New Revision: 996725 URL: http://svn.apache.org/viewvc?rev=996725&view=rev Log: o Removed reference to MINA in shared-ldap o Renamed the LdapProtocolEncoder class in shared to LdapEncoder, making it just encode a message without using any MINA related things o Added a LdapProtocolEncoder class into the client-api module Added: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolEncoder.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java - copied, changed from r996576, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java Removed: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolCodecFactory.java directory/shared/trunk/ldap/pom.xml directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/ProviderEncoder.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java Tue Sep 14 00:10:03 2010 @@ -20,9 +20,9 @@ package org.apache.directory.server.ldap; +import org.apache.directory.ldap.client.api.protocol.LdapProtocolEncoder; import org.apache.directory.server.core.DirectoryService; import org.apache.directory.shared.asn1.codec.Asn1CodecDecoder; -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/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java (original) +++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java Tue Sep 14 00:10:03 2010 @@ -59,7 +59,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.BindRequest; import org.apache.directory.shared.ldap.message.BindRequestImpl; import org.apache.directory.shared.ldap.message.BindResponse; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.MessageDecoder; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.spi.BinaryAttributeDetector; @@ -436,7 +436,7 @@ public class SaslBindIT extends Abstract } ); // Send encoded request to server - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); ByteBuffer bb = encoder.encodeMessage( request ); bb.flip(); @@ -479,7 +479,7 @@ public class SaslBindIT extends Abstract } ); // Send encoded request to server - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); ByteBuffer bb = encoder.encodeMessage( request ); bb.flip(); Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java (original) +++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java Tue Sep 14 00:10:03 2010 @@ -38,7 +38,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.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.UnbindRequest; import org.apache.directory.shared.ldap.message.UnbindRequestImpl; @@ -216,7 +216,7 @@ public class ImportCommand extends ToolC addRequest.setMessageId( messageId ); // Encode and send the addRequest message - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); ByteBuffer bb = encoder.encodeMessage( addRequest ); bb.flip(); @@ -259,7 +259,7 @@ public class ImportCommand extends ToolC private int deleteEntry( LdifEntry entry, int messageId ) throws IOException, DecoderException, LdapInvalidDnException, EncoderException { - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); DeleteRequest delRequest = new DeleteRequestImpl( messageId ); String dn = entry.getDn().getName(); @@ -334,7 +334,7 @@ public class ImportCommand extends ToolC modifyDNRequest.setMessageId( messageId ); // Encode and send the modifyDn request - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); ByteBuffer bb = encoder.encodeMessage( modifyDNRequest ); bb.flip(); @@ -394,7 +394,7 @@ public class ImportCommand extends ToolC modifyRequest.setMessageId( messageId ); // Encode and send the delete request - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); ByteBuffer bb = encoder.encodeMessage( modifyRequest ); bb.flip(); @@ -477,7 +477,7 @@ public class ImportCommand extends ToolC bindRequest.setName( new DN( user ) ); // Encode and send the bind request - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); ByteBuffer bb = encoder.encodeMessage( bindRequest ); bb.flip(); @@ -519,7 +519,7 @@ public class ImportCommand extends ToolC private void unbind( int messageId ) throws EncoderException, DecoderException, IOException { UnbindRequest unbindRequest = new UnbindRequestImpl( messageId ); - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); ByteBuffer bb = encoder.encodeMessage( unbindRequest ); bb.flip(); Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolCodecFactory.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolCodecFactory.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolCodecFactory.java (original) +++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolCodecFactory.java Tue Sep 14 00:10:03 2010 @@ -20,7 +20,6 @@ package org.apache.directory.ldap.client.api.protocol; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; import org.apache.mina.core.session.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFactory; import org.apache.mina.filter.codec.ProtocolDecoder; Added: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolEncoder.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolEncoder.java?rev=996725&view=auto ============================================================================== --- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolEncoder.java (added) +++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolEncoder.java Tue Sep 14 00:10:03 2010 @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.directory.ldap.client.api.protocol; + + +import java.nio.ByteBuffer; + +import org.apache.directory.shared.ldap.message.LdapEncoder; +import org.apache.directory.shared.ldap.message.Message; +import org.apache.mina.core.buffer.IoBuffer; +import org.apache.mina.core.session.IoSession; +import org.apache.mina.filter.codec.ProtocolEncoder; +import org.apache.mina.filter.codec.ProtocolEncoderOutput; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * + * A LDAP message decoder. It is based on shared-ldap decoder. + * + * @author Apache Directory Project + */ +public class LdapProtocolEncoder implements ProtocolEncoder +{ + /** The logger */ + private static final Logger LOG = LoggerFactory.getLogger( LdapProtocolEncoder.class ); + + /** A speedup for logger */ + private static final boolean IS_DEBUG = LOG.isDebugEnabled(); + + /** The stateful encoder */ + private static final LdapEncoder encoder = new LdapEncoder(); + + + public void encode( IoSession session, Object message, ProtocolEncoderOutput out ) throws Exception + { + ByteBuffer buffer = encoder.encodeMessage( ( Message ) message ); + + IoBuffer ioBuffer = IoBuffer.wrap( buffer ); + + out.write( ioBuffer ); + } + + + public void dispose( IoSession session ) throws Exception + { + // Nothing to do + } +} Modified: directory/shared/trunk/ldap/pom.xml URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/pom.xml?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/pom.xml (original) +++ directory/shared/trunk/ldap/pom.xml Tue Sep 14 00:10:03 2010 @@ -66,11 +66,6 @@ commons-collections commons-collections - - - org.apache.mina - mina-core - Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java (from r996576, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java&r1=996576&r2=996725&rev=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java Tue Sep 14 00:10:03 2010 @@ -43,10 +43,6 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.util.StringTools; -import org.apache.mina.core.buffer.IoBuffer; -import org.apache.mina.core.session.IoSession; -import org.apache.mina.filter.codec.ProtocolEncoderAdapter; -import org.apache.mina.filter.codec.ProtocolEncoderOutput; /** @@ -54,7 +50,7 @@ import org.apache.mina.filter.codec.Prot * * @author Apache Directory Project */ -public class LdapProtocolEncoder extends ProtocolEncoderAdapter +public class LdapEncoder { /** * Encode a Ldap request and write it to the remote server. @@ -63,13 +59,11 @@ public class LdapProtocolEncoder extends * @param message The LDAP message we have to encode to a Byte stream * @param out The callback we have to invoke when the message has been encoded */ - public void encode( IoSession session, Object message, ProtocolEncoderOutput out ) throws Exception + public ByteBuffer encode( Message message ) throws Exception { ByteBuffer buffer = encodeMessage( ( Message ) message ); - IoBuffer ioBuffer = IoBuffer.wrap( buffer ); - - out.write( ioBuffer ); + return buffer; } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/ProviderEncoder.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/ProviderEncoder.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/ProviderEncoder.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/ProviderEncoder.java Tue Sep 14 00:10:03 2010 @@ -39,19 +39,14 @@ public interface ProviderEncoder extends * Encodes a compiler stub specific ASN.1 message envelope containment tree * onto an output stream. * - * @param lock - * lock object used to exclusively write to the output stream - * @param out - * the OutputStream to encode the message envelope onto. - * @param obj - * the top-level message envelope stub instance, i.e. for the - * Snacc4J service provider this would be an instance of the - * LDAPMessage compiler generated stub class. - * @throws ProviderException - * to indicate an error while attempting to encode the message - * envelope onto the output stream. Provider specific exceptions - * encountered while encoding can be held within this subclass - * of MultiException. + * @param lock lock object used to exclusively write to the output stream + * @param out the OutputStream to encode the message envelope onto. + * @param obj the top-level message envelope stub instance, i.e. for the + * Snacc4J service provider this would be an instance of the + * LDAPMessage compiler generated stub class. + * @throws ProviderException to indicate an error while attempting to encode the message + * envelope onto the output stream. Provider specific exceptions + * encountered while encoding can be held within this subclass of MultiException. */ void encodeBlocking( Object lock, OutputStream out, Object obj ) throws ProviderException; @@ -60,16 +55,13 @@ public interface ProviderEncoder extends * Encodes a compiler stub specific ASN.1 message envelope containment tree * into byte array. * - * @param obj - * the top-level message envelope stub instance, i.e. for the - * Snacc4J service provider this would be an instance of the - * LDAPMessage compiler generated stub class. + * @param obj the top-level message envelope stub instance, i.e. for the + * Snacc4J service provider this would be an instance of the + * LDAPMessage compiler generated stub class. * @return the encoded object in a byte buffer - * @throws ProviderException - * to indicate an error while attempting to encode the message - * envelope into a byte buffer. Provider specific exceptions - * encountered while encoding can be held within this subclass - * of MultiException. + * @throws ProviderException to indicate an error while attempting to encode the message + * envelope into a byte buffer. Provider specific exceptions + * encountered while encoding can be held within this subclass of MultiException. */ ByteBuffer encodeBlocking( Object obj ) throws ProviderException; } Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java Tue Sep 14 00:10:03 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.AbandonRequest; import org.apache.directory.shared.ldap.message.AbandonRequestImpl; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.Test; @@ -48,7 +48,7 @@ import org.junit.runner.RunWith; public class LdapControlTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java Tue Sep 14 00:10:03 2010 @@ -32,7 +32,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.Asn1Decoder; 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.LdapEncoder; import org.apache.directory.shared.ldap.message.Message; import org.apache.directory.shared.ldap.message.UnbindRequest; import org.apache.directory.shared.ldap.message.UnbindRequestImpl; @@ -51,7 +51,7 @@ import org.junit.runner.RunWith; public class LdapMessageTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); // ~ Methods Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java Tue Sep 14 00:10:03 2010 @@ -35,7 +35,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.message.AddResponse; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.Referral; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.util.StringTools; @@ -54,7 +54,7 @@ import org.junit.runner.RunWith; public class LdapResultTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); // ~ Methods Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java Tue Sep 14 00:10:03 2010 @@ -37,7 +37,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.message.AbandonRequest; import org.apache.directory.shared.ldap.message.AbandonRequestImpl; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.Test; @@ -54,7 +54,7 @@ import org.junit.runner.RunWith; public class AbandonRequestTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java Tue Sep 14 00:10:03 2010 @@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.message.AddRequest; import org.apache.directory.shared.ldap.message.AddResponseImpl; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.Message; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; @@ -64,7 +64,7 @@ import org.junit.runner.RunWith; public class AddRequestTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java Tue Sep 14 00:10:03 2010 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.codec.EncoderException; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.message.AddResponse; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.util.StringTools; @@ -51,7 +51,7 @@ import org.junit.runner.RunWith; public class AddResponseTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java Tue Sep 14 00:10:03 2010 @@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.controls.ControlImpl; import org.apache.directory.shared.ldap.message.BindRequest; import org.apache.directory.shared.ldap.message.BindRequestImpl; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.util.StringTools; @@ -54,7 +54,7 @@ import org.junit.runner.RunWith; public class BindRequestPerfTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java Tue Sep 14 00:10:03 2010 @@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.ResponseCarryingException; import org.apache.directory.shared.ldap.message.BindRequest; import org.apache.directory.shared.ldap.message.BindResponseImpl; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.Message; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; @@ -55,7 +55,7 @@ import org.junit.runner.RunWith; public class BindRequestTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java Tue Sep 14 00:10:03 2010 @@ -37,7 +37,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControl; import org.apache.directory.shared.ldap.message.BindResponse; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.util.StringTools; @@ -53,7 +53,7 @@ import org.junit.runner.RunWith; public class BindResponseTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java Tue Sep 14 00:10:03 2010 @@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.ResponseCarryingException; import org.apache.directory.shared.ldap.message.CompareRequest; import org.apache.directory.shared.ldap.message.CompareResponseImpl; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.Message; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; @@ -56,7 +56,7 @@ import org.junit.runner.RunWith; public class CompareRequestTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java Tue Sep 14 00:10:03 2010 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.codec.EncoderException; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.message.CompareResponse; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.util.StringTools; @@ -53,7 +53,7 @@ import org.junit.runner.RunWith; public class CompareResponseTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java Tue Sep 14 00:10:03 2010 @@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.DeleteRequest; import org.apache.directory.shared.ldap.message.DeleteRequestImpl; import org.apache.directory.shared.ldap.message.DeleteResponseImpl; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.Message; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; @@ -57,7 +57,7 @@ import org.junit.runner.RunWith; public class DelRequestTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java Tue Sep 14 00:10:03 2010 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.codec.EncoderException; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.message.DeleteResponse; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.util.StringTools; @@ -53,7 +53,7 @@ import org.junit.runner.RunWith; public class DelResponseTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java Tue Sep 14 00:10:03 2010 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.codec.EncoderException; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.message.ExtendedRequest; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.Test; @@ -52,7 +52,7 @@ import org.junit.runner.RunWith; public class ExtendedRequestTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java Tue Sep 14 00:10:03 2010 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.codec.EncoderException; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.message.ExtendedResponse; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.util.StringTools; @@ -53,7 +53,7 @@ import org.junit.runner.RunWith; public class ExtendedResponseTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java Tue Sep 14 00:10:03 2010 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.codec.EncoderException; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.message.IntermediateResponse; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.Test; @@ -52,7 +52,7 @@ import org.junit.runner.RunWith; public class IntermediateResponseTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java Tue Sep 14 00:10:03 2010 @@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.Message; import org.apache.directory.shared.ldap.message.ModifyRequest; import org.apache.directory.shared.ldap.message.ModifyResponseImpl; @@ -60,7 +60,7 @@ import org.junit.runner.RunWith; public class ModifyRequestTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java Tue Sep 14 00:10:03 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.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.ModifyResponse; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; @@ -53,7 +53,7 @@ import org.junit.runner.RunWith; public class ModifyResponseTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java Tue Sep 14 00:10:03 2010 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.codec.EncoderException; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.ResponseCarryingException; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.Message; import org.apache.directory.shared.ldap.message.ModifyDnRequest; import org.apache.directory.shared.ldap.message.ModifyDnResponseImpl; @@ -56,7 +56,7 @@ import org.junit.runner.RunWith; public class ModifyDNRequestTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java Tue Sep 14 00:10:03 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.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.ModifyDnResponse; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; @@ -53,7 +53,7 @@ import org.junit.runner.RunWith; public class ModifyDNResponseTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java Tue Sep 14 00:10:03 2010 @@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.filter.SearchScope; import org.apache.directory.shared.ldap.message.AliasDerefMode; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.SearchRequest; import org.apache.directory.shared.ldap.message.SearchRequestImpl; import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer; @@ -63,7 +63,7 @@ import org.junit.runner.RunWith; public class SearchRequestMatchingRuleAssertionTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); static Map oids = new HashMap(); Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java Tue Sep 14 00:10:03 2010 @@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.filter.SearchScope; import org.apache.directory.shared.ldap.message.AliasDerefMode; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.SearchRequest; import org.apache.directory.shared.ldap.message.SearchRequestImpl; import org.apache.directory.shared.ldap.message.control.Control; @@ -62,7 +62,7 @@ import org.junit.runner.RunWith; public class SearchRequestSubstringTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); static Map oids = new HashMap(); Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java Tue Sep 14 00:10:03 2010 @@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.filter.SearchScope; import org.apache.directory.shared.ldap.message.AliasDerefMode; -import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.Message; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.SearchRequest; @@ -72,7 +72,7 @@ import org.junit.runner.RunWith; public class SearchRequestTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); static Map oids = new HashMap(); Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java Tue Sep 14 00:10:03 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.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.SearchResultDone; import org.apache.directory.shared.ldap.message.control.Control; @@ -53,7 +53,7 @@ import org.junit.runner.RunWith; public class SearchResultDoneTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java Tue Sep 14 00:10:03 2010 @@ -38,7 +38,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapMessageContainer; 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.LdapEncoder; import org.apache.directory.shared.ldap.message.SearchResultEntry; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.util.StringTools; @@ -56,7 +56,7 @@ import org.junit.runner.RunWith; public class SearchResultEntryTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java Tue Sep 14 00:10:03 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.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.Referral; import org.apache.directory.shared.ldap.message.SearchResultReference; import org.apache.directory.shared.ldap.message.control.Control; @@ -56,7 +56,7 @@ import org.junit.runner.RunWith; public class SearchResultReferenceTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java?rev=996725&r1=996724&r2=996725&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java Tue Sep 14 00:10:03 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.message.LdapProtocolEncoder; +import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.UnbindRequest; import org.apache.directory.shared.ldap.message.UnbindRequestImpl; import org.apache.directory.shared.ldap.message.control.Control; @@ -51,7 +51,7 @@ import org.junit.runner.RunWith; public class UnBindRequestTest { /** The encoder instance */ - LdapProtocolEncoder encoder = new LdapProtocolEncoder(); + LdapEncoder encoder = new LdapEncoder(); /**