Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 70726 invoked from network); 11 Feb 2011 18:21:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Feb 2011 18:21:22 -0000 Received: (qmail 9239 invoked by uid 500); 11 Feb 2011 18:21:22 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 9180 invoked by uid 500); 11 Feb 2011 18:21:21 -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 9171 invoked by uid 99); 11 Feb 2011 18:21:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Feb 2011 18:21:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 11 Feb 2011 18:21:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CED912388A41; Fri, 11 Feb 2011 18:20:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1069913 [2/2] - in /directory: apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/bind/ shared/branches/m1/ shared/branc... Date: Fri, 11 Feb 2011 18:20:50 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110211182051.CED912388A41@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java (original) +++ directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java Fri Feb 11 18:20:47 2011 @@ -31,7 +31,6 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.tlv.Value; import org.apache.directory.shared.i18n.I18n; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapConstants; import org.apache.directory.shared.ldap.codec.api.MessageEncoderException; @@ -50,9 +49,14 @@ import org.apache.directory.shared.util. public class LdapEncoder { /** The LdapCodecService */ - private LdapCodecService codec = new StandaloneLdapCodecService(); + private LdapCodecService codec; + public LdapEncoder( LdapCodecService codec ) + { + this.codec = codec; + } + private int computeControlLength( Control control ) { Modified: directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java (original) +++ directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java Fri Feb 11 18:20:47 2011 @@ -187,7 +187,7 @@ public class DefaultLdapCodecService imp { if ( client ) { - return new LdapProtocolCodecFactory(); + return new LdapProtocolCodecFactory( this ); } else { Modified: directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecFactory.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecFactory.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecFactory.java (original) +++ directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecFactory.java Fri Feb 11 18:20:47 2011 @@ -20,6 +20,7 @@ package org.apache.directory.shared.ldap.codec.protocol.mina; +import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.mina.core.session.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFactory; import org.apache.mina.filter.codec.ProtocolDecoder; @@ -39,13 +40,19 @@ public class LdapProtocolCodecFactory im /** The LdapEncoder key */ public static final String LDAP_ENCODER = "LDAP_ENCODER"; + + private LdapCodecService codec; + /** * Creates a new instance of LdapProtocolCodecFactory. It * creates the encoded an decoder instances. + * + * @param codec The codec associated with this protocol codec factory */ - public LdapProtocolCodecFactory() + public LdapProtocolCodecFactory( LdapCodecService codec ) { + this.codec = codec; } @@ -69,6 +76,6 @@ public class LdapProtocolCodecFactory im */ public ProtocolEncoder getEncoder( IoSession session ) { - return new LdapProtocolEncoder(); + return new LdapProtocolEncoder( codec ); } } Modified: directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java (original) +++ directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java Fri Feb 11 18:20:47 2011 @@ -23,6 +23,7 @@ package org.apache.directory.shared.ldap import java.nio.ByteBuffer; import org.apache.directory.shared.ldap.codec.LdapEncoder; +import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.model.message.Message; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.session.IoSession; @@ -38,7 +39,18 @@ import org.apache.mina.filter.codec.Prot public class LdapProtocolEncoder implements ProtocolEncoder { /** The stateful encoder */ - private static final LdapEncoder ENCODER = new LdapEncoder(); + private LdapEncoder encoder; + + + /** + * Creates a new instance of LdapProtocolEncoder. + * + * @param codec The LDAP codec service associated with this encoder. + */ + public LdapProtocolEncoder( LdapCodecService codec ) + { + this.encoder = new LdapEncoder( codec ); + } /** @@ -46,7 +58,7 @@ public class LdapProtocolEncoder impleme */ public void encode( IoSession session, Object message, ProtocolEncoderOutput out ) throws Exception { - ByteBuffer buffer = ENCODER.encodeMessage( ( Message ) message ); + ByteBuffer buffer = encoder.encodeMessage( ( Message ) message ); IoBuffer ioBuffer = IoBuffer.wrap( buffer ); Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/AbstractCodecServiceTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/AbstractCodecServiceTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/AbstractCodecServiceTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/AbstractCodecServiceTest.java Fri Feb 11 18:20:47 2011 @@ -19,10 +19,12 @@ */ package org.apache.directory.shared.ldap.codec; + import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.junit.AfterClass; import org.junit.BeforeClass; + /** * Initialize the Codec service. This can later be removed. * @@ -30,10 +32,11 @@ import org.junit.BeforeClass; */ public abstract class AbstractCodecServiceTest { + protected static DefaultLdapCodecService codec; + /** The encoder instance */ - protected static LdapEncoder encoder = new LdapEncoder(); + protected static LdapEncoder encoder; - protected static DefaultLdapCodecService codec; /** * Initialize the codec service @@ -42,6 +45,7 @@ public abstract class AbstractCodecServi public static void setupLdapCodecService() { codec = new DefaultLdapCodecService(); + encoder = new LdapEncoder( codec ); } @@ -52,5 +56,6 @@ public abstract class AbstractCodecServi public static void tearDownLdapCodecService() { codec = null; + encoder = null; } } Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java Fri Feb 11 18:20:47 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.AbandonRequestDecorator; import org.apache.directory.shared.ldap.codec.decorators.MessageDecorator; @@ -52,11 +52,12 @@ import org.junit.runner.RunWith; @Concurrency() public class LdapControlTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); - LdapCodecService codec = new StandaloneLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a Request with controls */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java Fri Feb 11 18:20:47 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.Asn1Container; import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.asn1.ber.tlv.TLVStateEnum; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.BindRequestDecorator; import org.apache.directory.shared.ldap.codec.decorators.MessageDecorator; @@ -61,7 +61,8 @@ import org.junit.runner.RunWith; @Concurrency() public class LdapDecoderTest { - LdapCodecService codec = new StandaloneLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); + private static class LdapProtocolDecoderOutput extends AbstractProtocolDecoderOutput { Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java Fri Feb 11 18:20:47 2011 @@ -32,7 +32,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.Asn1Container; import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.asn1.EncoderException; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.MessageDecorator; import org.apache.directory.shared.ldap.codec.decorators.UnbindRequestDecorator; @@ -53,12 +53,12 @@ import org.junit.runner.RunWith; @Concurrency() public class LdapMessageTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); - - LdapCodecService codec = new StandaloneLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + // ~ Methods // ------------------------------------------------------------------------------------ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java Fri Feb 11 18:20:47 2011 @@ -35,7 +35,8 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.asn1.ber.Asn1Container; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.AddResponseDecorator; import org.apache.directory.shared.ldap.codec.decorators.MessageDecorator; import org.apache.directory.shared.ldap.model.message.AddResponse; @@ -59,24 +60,25 @@ import org.junit.runner.RunWith; @Concurrency() public class LdapResultTest { + static LdapCodecService codec; + /** The encoder instance */ - private static LdapEncoder encoder = new LdapEncoder(); - - private static StandaloneLdapCodecService codec = new StandaloneLdapCodecService(); - + static LdapEncoder encoder; + @BeforeClass public static void setupLdapCodecService() { - codec = new StandaloneLdapCodecService(); + codec = new DefaultLdapCodecService(); + encoder = new LdapEncoder( codec ); } @AfterClass public static void tearDownLdapCodecService() { - codec.shutdown(); codec = null; + encoder = null; } Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java Fri Feb 11 18:20:47 2011 @@ -36,7 +36,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.AbandonRequestDecorator; import org.apache.directory.shared.ldap.codec.decorators.MessageDecorator; @@ -58,12 +58,12 @@ import org.junit.runner.RunWith; @Concurrency() public class AbandonRequestTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); - - LdapCodecService codec = new StandaloneLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a AbandonRequest with controls */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java Fri Feb 11 18:20:47 2011 @@ -41,7 +41,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException; import org.apache.directory.shared.ldap.codec.decorators.AddRequestDecorator; @@ -64,11 +64,12 @@ import org.junit.runner.RunWith; @Concurrency() public class AddRequestTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); + LdapCodecService codec = new DefaultLdapCodecService(); - LdapCodecService codec = new StandaloneLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a AddRequest */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java Fri Feb 11 18:20:47 2011 @@ -36,7 +36,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.AddResponseDecorator; import org.apache.directory.shared.ldap.codec.decorators.MessageDecorator; @@ -56,12 +56,12 @@ import org.junit.runner.RunWith; @Concurrency() public class AddResponseTest { + LdapCodecService codec = new DefaultLdapCodecService(); + /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); + LdapEncoder encoder = new LdapEncoder( codec ); - LdapCodecService codec = new StandaloneLdapCodecService(); - /** * Test the decoding of a AddResponse */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java Fri Feb 11 18:20:47 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.BindRequestDecorator; import org.apache.directory.shared.ldap.model.message.BindRequest; @@ -54,13 +54,15 @@ import org.junit.runner.RunWith; */ @RunWith(ConcurrentJunitRunner.class) @Concurrency() +@Ignore( "Ignore performance tests: should not be with integration tests" ) public class BindRequestPerfTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); + LdapCodecService codec = new DefaultLdapCodecService(); - LdapCodecService codec = new StandaloneLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a BindRequest with Simple authentication and no * controls Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java Fri Feb 11 18:20:47 2011 @@ -37,7 +37,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException; import org.apache.directory.shared.ldap.codec.decorators.BindRequestDecorator; @@ -59,11 +59,12 @@ import org.junit.runner.RunWith; @Concurrency() public class BindRequestTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); + LdapCodecService codec = new DefaultLdapCodecService(); - LdapCodecService codec = new StandaloneLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a BindRequest with Simple authentication and no * controls Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java Fri Feb 11 18:20:47 2011 @@ -37,7 +37,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; import org.apache.directory.shared.ldap.codec.decorators.BindResponseDecorator; @@ -58,11 +58,12 @@ import org.junit.runner.RunWith; @Concurrency() public class BindResponseTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); + LdapCodecService codec = new DefaultLdapCodecService(); - LdapCodecService codec = new StandaloneLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a BindResponse */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java Fri Feb 11 18:20:47 2011 @@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.message.CompareResponseImpl; import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException; import org.apache.directory.shared.ldap.codec.decorators.CompareRequestDecorator; @@ -58,12 +58,12 @@ import org.junit.runner.RunWith; @Concurrency() public class CompareRequestTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); - - LdapCodecService codec = new StandaloneLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a full CompareRequest */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java Fri Feb 11 18:20:47 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.CompareResponseDecorator; import org.apache.directory.shared.ldap.model.message.CompareResponse; @@ -55,11 +55,12 @@ import org.junit.runner.RunWith; @Concurrency() public class CompareResponseTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); + LdapCodecService codec = new DefaultLdapCodecService(); - LdapCodecService codec = new StandaloneLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a CompareResponse */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java Fri Feb 11 18:20:47 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException; import org.apache.directory.shared.ldap.codec.decorators.DeleteRequestDecorator; @@ -54,12 +54,12 @@ import org.junit.runner.RunWith; @Concurrency() public class DelRequestTest { + LdapCodecService codec = new DefaultLdapCodecService(); + /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); + LdapEncoder encoder = new LdapEncoder( codec ); - LdapCodecService codec = new StandaloneLdapCodecService(); - /** * Test the decoding of a full DelRequest */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java Fri Feb 11 18:20:47 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.DeleteResponseDecorator; import org.apache.directory.shared.ldap.model.message.Control; @@ -55,11 +55,12 @@ import org.junit.runner.RunWith; @Concurrency() public class DelResponseTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); + LdapCodecService codec = new DefaultLdapCodecService(); - LdapCodecService codec = new StandaloneLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a DelResponse */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java Fri Feb 11 18:20:47 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.ExtendedRequestDecorator; import org.apache.directory.shared.ldap.model.message.Control; @@ -54,12 +54,12 @@ import org.junit.runner.RunWith; @Concurrency() public class ExtendedRequestTest { + LdapCodecService codec = new DefaultLdapCodecService(); + /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); + LdapEncoder encoder = new LdapEncoder( codec ); - LdapCodecService codec = new StandaloneLdapCodecService(); - /** * Test the decoding of a full ExtendedRequest */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java Fri Feb 11 18:20:47 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.ExtendedResponseDecorator; import org.apache.directory.shared.ldap.model.message.Control; @@ -55,12 +55,12 @@ import org.junit.runner.RunWith; @Concurrency() public class ExtendedResponseTest { + LdapCodecService codec = new DefaultLdapCodecService(); + /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); + LdapEncoder encoder = new LdapEncoder( codec ); - LdapCodecService codec = new StandaloneLdapCodecService(); - /** * Test the decoding of a full ExtendedResponse */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java Fri Feb 11 18:20:47 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.IntermediateResponseDecorator; import org.apache.directory.shared.ldap.model.message.Control; @@ -54,13 +54,12 @@ import org.junit.runner.RunWith; @Concurrency() public class IntermediateResponseTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); - - /** The codec service */ - LdapCodecService codec = new StandaloneLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a full IntermediateResponse */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java Fri Feb 11 18:20:47 2011 @@ -36,7 +36,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException; import org.apache.directory.shared.ldap.codec.decorators.ModifyRequestDecorator; @@ -62,13 +62,12 @@ import org.junit.runner.RunWith; @Concurrency() public class ModifyRequestTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); - - /** The codec service */ - LdapCodecService codec = new StandaloneLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a ModifyRequest */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java Fri Feb 11 18:20:47 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.ModifyResponseDecorator; import org.apache.directory.shared.ldap.model.message.Control; @@ -55,13 +55,12 @@ import org.junit.runner.RunWith; @Concurrency() public class ModifyResponseTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); - - /** The codec service */ - LdapCodecService codec = new StandaloneLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a ModifyResponse */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java Fri Feb 11 18:20:47 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException; import org.apache.directory.shared.ldap.codec.decorators.ModifyDnRequestDecorator; @@ -58,13 +58,12 @@ import org.junit.runner.RunWith; @Concurrency() public class ModifyDNRequestTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); - - /** The codec service */ - LdapCodecService codec = new StandaloneLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a full ModifyDNRequest */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java Fri Feb 11 18:20:47 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.ModifyDnResponseDecorator; import org.apache.directory.shared.ldap.model.message.Control; @@ -55,13 +55,12 @@ import org.junit.runner.RunWith; @Concurrency() public class ModifyDNResponseTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); - - /** The codec service */ - LdapCodecService codec = new StandaloneLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a ModifyDNResponse */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java Fri Feb 11 18:20:47 2011 @@ -39,7 +39,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.SearchRequestDecorator; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; @@ -65,12 +65,12 @@ import org.junit.runner.RunWith; @Concurrency() public class SearchRequestMatchingRuleAssertionTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); + LdapCodecService codec = new DefaultLdapCodecService(); - /** The codec service */ - LdapCodecService codec = new StandaloneLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** An oid normalizer map */ static Map oids = new HashMap(); Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java Fri Feb 11 18:20:47 2011 @@ -38,7 +38,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.SearchRequestDecorator; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; @@ -65,11 +65,11 @@ import org.junit.runner.RunWith; @Concurrency() public class SearchRequestSubstringTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); - /** The codec service */ - LdapCodecService codec = new StandaloneLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); + + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); /** An oid normalizer map */ static Map oids = new HashMap(); Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java Fri Feb 11 18:20:47 2011 @@ -40,7 +40,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.tlv.TLVStateEnum; import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException; import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator; @@ -81,12 +81,13 @@ import org.junit.runner.RunWith; @Concurrency() public class SearchRequestTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); - /** The codec service */ - LdapCodecService codec = new StandaloneLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); + + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** An oid normalizer map */ static Map oids = new HashMap(); Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java Fri Feb 11 18:20:47 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.SearchResultDoneDecorator; import org.apache.directory.shared.ldap.model.message.Control; @@ -55,13 +55,13 @@ import org.junit.runner.RunWith; @Concurrency() public class SearchResultDoneTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); - /** The codec service */ - LdapCodecService codec = new StandaloneLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a SearchResultDone */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java Fri Feb 11 18:20:47 2011 @@ -37,7 +37,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.SearchResultEntryDecorator; import org.apache.directory.shared.ldap.model.entry.Entry; @@ -58,13 +58,13 @@ import org.junit.runner.RunWith; @Concurrency() public class SearchResultEntryTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); - /** The codec service */ - LdapCodecService codec = new StandaloneLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a SearchResultEntry */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java Fri Feb 11 18:20:47 2011 @@ -38,7 +38,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.SearchResultReferenceDecorator; import org.apache.directory.shared.ldap.model.message.Control; @@ -58,13 +58,13 @@ import org.junit.runner.RunWith; @Concurrency() public class SearchResultReferenceTest { - /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); - /** The codec service */ - LdapCodecService codec = new StandaloneLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a SearchResultReference */ Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java Fri Feb 11 18:20:47 2011 @@ -28,7 +28,7 @@ import java.nio.ByteBuffer; import com.mycila.junit.concurrent.Concurrency; import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeDecorator; import org.apache.directory.shared.ldap.model.message.controls.ChangeType; @@ -48,7 +48,7 @@ import org.junit.runner.RunWith; @Concurrency() public class EntryChangeControlTest { - private LdapCodecService codec = new StandaloneLdapCodecService(); + private LdapCodecService codec = new DefaultLdapCodecService(); /** * Test the decoding of a EntryChangeControl Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java Fri Feb 11 18:20:47 2011 @@ -28,7 +28,7 @@ import java.nio.ByteBuffer; import com.mycila.junit.concurrent.Concurrency; import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchDecorator; import org.apache.directory.shared.ldap.model.message.controls.ChangeType; @@ -47,7 +47,7 @@ import org.junit.runner.RunWith; @Concurrency() public class PSearchControlTest { - private LdapCodecService codec = new StandaloneLdapCodecService(); + private LdapCodecService codec = new DefaultLdapCodecService(); /** * Test encoding of a PSearchControl. Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java Fri Feb 11 18:20:47 2011 @@ -30,7 +30,7 @@ import java.util.Arrays; import com.mycila.junit.concurrent.Concurrency; import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; import org.apache.directory.shared.ldap.model.message.controls.PagedResults; @@ -48,7 +48,7 @@ import org.junit.runner.RunWith; @Concurrency() public class PagedSearchControlTest { - private LdapCodecService codec = new StandaloneLdapCodecService(); + private LdapCodecService codec = new DefaultLdapCodecService(); /** * Test encoding of a PagedSearchControl. Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java Fri Feb 11 18:20:47 2011 @@ -31,7 +31,7 @@ import com.mycila.junit.concurrent.Concu import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator; import org.apache.directory.shared.ldap.model.message.controls.Subentries; @@ -49,7 +49,7 @@ import org.junit.runner.RunWith; @Concurrency() public class SubEntryControlTest { - private LdapCodecService codec = new StandaloneLdapCodecService(); + private LdapCodecService codec = new DefaultLdapCodecService(); /** * Test the decoding of a SubEntryControl with a true visibility Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java (original) +++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java Fri Feb 11 18:20:47 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.codec.decorators.UnbindRequestDecorator; import org.apache.directory.shared.ldap.model.message.Control; @@ -53,12 +53,13 @@ import org.junit.runner.RunWith; @Concurrency() public class UnBindRequestTest { - /** The encoder instance */ - private LdapEncoder encoder = new LdapEncoder(); - /** The codec service */ - private LdapCodecService codec = new StandaloneLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); + + /** The encoder instance */ + LdapEncoder encoder = new LdapEncoder( codec ); + /** * Test the decoding of a UnBindRequest with no controls */ Modified: directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyTest.java (original) +++ directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyTest.java Fri Feb 11 18:20:47 2011 @@ -27,10 +27,12 @@ import static org.junit.Assert.assertTru import java.nio.ByteBuffer; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.extras.controls.PasswordPolicy; import org.apache.directory.shared.util.Strings; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; @@ -41,7 +43,23 @@ import org.junit.Test; */ public class PasswordPolicyTest { - LdapCodecService codec = new StandaloneLdapCodecService(); + /** the codec for all tests */ + private static LdapCodecService codec; + + + @BeforeClass + public static void setup() + { + codec = new DefaultLdapCodecService(); + } + + + @AfterClass + public static void tearDown() + { + codec = null; + } + @Test public void testDecodeRespWithExpiryWarningAndError() throws Exception Modified: directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java (original) +++ directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java Fri Feb 11 18:20:47 2011 @@ -29,7 +29,7 @@ import static org.junit.Assert.fail; import java.nio.ByteBuffer; import org.apache.directory.shared.asn1.EncoderException; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue; import org.apache.directory.shared.util.Strings; @@ -50,7 +50,8 @@ import com.mycila.junit.concurrent.Concu @Concurrency() public class SyncDoneValueControlTest { - private LdapCodecService codec = new StandaloneLdapCodecService(); + /** the codec service used for tests */ + private LdapCodecService codec = new DefaultLdapCodecService(); @Test Modified: directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueControlTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueControlTest.java (original) +++ directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueControlTest.java Fri Feb 11 18:20:47 2011 @@ -29,7 +29,7 @@ import java.nio.ByteBuffer; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue; import org.apache.directory.shared.ldap.extras.controls.SynchronizationInfoEnum; @@ -50,8 +50,10 @@ import com.mycila.junit.concurrent.Concu @Concurrency() public class SyncInfoValueControlTest { - private LdapCodecService codec = new StandaloneLdapCodecService(); + /** the codec service used for tests */ + private LdapCodecService codec = new DefaultLdapCodecService(); + //-------------------------------------------------------------------------------- // NewCookie choice tests //-------------------------------------------------------------------------------- Modified: directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnControlTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnControlTest.java (original) +++ directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnControlTest.java Fri Feb 11 18:20:47 2011 @@ -29,7 +29,7 @@ import java.nio.ByteBuffer; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.extras.controls.SyncModifyDn; import org.apache.directory.shared.util.Strings; @@ -49,7 +49,8 @@ import com.mycila.junit.concurrent.Concu @Concurrency() public class SyncModifyDnControlTest { - private LdapCodecService codec = new StandaloneLdapCodecService(); + /** the codec service used for tests */ + private LdapCodecService codec = new DefaultLdapCodecService(); @Test Modified: directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java (original) +++ directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java Fri Feb 11 18:20:47 2011 @@ -29,7 +29,7 @@ import java.nio.ByteBuffer; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue; import org.apache.directory.shared.ldap.extras.controls.SynchronizationModeEnum; @@ -50,7 +50,8 @@ import com.mycila.junit.concurrent.Concu @Concurrency() public class SyncRequestValueControlTest { - private LdapCodecService codec = new StandaloneLdapCodecService(); + /** the codec service used for tests */ + private LdapCodecService codec = new DefaultLdapCodecService(); /** Modified: directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java (original) +++ directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java Fri Feb 11 18:20:47 2011 @@ -28,7 +28,7 @@ import java.nio.ByteBuffer; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.directory.shared.ldap.extras.controls.SyncStateTypeEnum; import org.apache.directory.shared.ldap.extras.controls.SyncStateValue; @@ -49,7 +49,9 @@ import com.mycila.junit.concurrent.Concu @Concurrency() public class SyncStateValueControlTest { - private LdapCodecService codec = new StandaloneLdapCodecService(); + /** the codec service used for tests */ + private LdapCodecService codec = new DefaultLdapCodecService(); + /** * Test the decoding of a SyncStateValue control with a refreshOnly mode Modified: directory/shared/branches/m1/ldap/pom.xml URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/pom.xml?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/pom.xml (original) +++ directory/shared/branches/m1/ldap/pom.xml Fri Feb 11 18:20:47 2011 @@ -70,7 +70,7 @@ ${project.groupId} - shared-ldap-codec + shared-ldap-codec-standalone Modified: directory/shared/branches/m1/pom.xml URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/pom.xml?rev=1069913&r1=1069912&r2=1069913&view=diff ============================================================================== --- directory/shared/branches/m1/pom.xml (original) +++ directory/shared/branches/m1/pom.xml Fri Feb 11 18:20:47 2011 @@ -84,6 +84,7 @@ ldap ldap-extras ldap-codec + ldap-codec-standalone ldap-model ldap-schema ldap-schema-converter @@ -368,6 +369,12 @@ ${project.groupId} + shared-ldap-codec-standalone + ${project.version} + + + + ${project.groupId} shared-ldap-extras-codec ${project.version}