Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 96357 invoked from network); 4 Feb 2011 00:40:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Feb 2011 00:40:41 -0000 Received: (qmail 34072 invoked by uid 500); 4 Feb 2011 00:40:41 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 34035 invoked by uid 500); 4 Feb 2011 00:40:41 -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 34028 invoked by uid 99); 4 Feb 2011 00:40:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Feb 2011 00:40:41 +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, 04 Feb 2011 00:40:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A82292388A36; Fri, 4 Feb 2011 00:40:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1067047 [3/4] - in /directory: apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/ apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/ apacheds/branches/m1/core-integ/src/test/java/org/ap... Date: Fri, 04 Feb 2011 00:40:06 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110204004009.A82292388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ExtendedResponseDecorator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ExtendedResponseDecorator.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ExtendedResponseDecorator.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ExtendedResponseDecorator.java Fri Feb 4 00:40:02 2011 @@ -26,7 +26,7 @@ import java.nio.ByteBuffer; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.tlv.TLV; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.codec.LdapConstants; import org.apache.directory.shared.ldap.model.message.ExtendedResponse; import org.apache.directory.shared.util.Strings; @@ -54,7 +54,7 @@ public class ExtendedResponseDecorator e * * @param decoratedMessage the decorated ExtendedResponse */ - public ExtendedResponseDecorator( ILdapCodecService codec, ExtendedResponse decoratedMessage ) + public ExtendedResponseDecorator( LdapCodecService codec, ExtendedResponse decoratedMessage ) { super( codec, decoratedMessage ); } Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/IntermediateResponseDecorator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/IntermediateResponseDecorator.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/IntermediateResponseDecorator.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/IntermediateResponseDecorator.java Fri Feb 4 00:40:02 2011 @@ -26,7 +26,7 @@ import java.nio.ByteBuffer; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.tlv.TLV; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.codec.LdapConstants; import org.apache.directory.shared.ldap.model.message.IntermediateResponse; import org.apache.directory.shared.util.Strings; @@ -52,7 +52,7 @@ public class IntermediateResponseDecorat * * @param decoratedMessage the decorated IntermediateResponse */ - public IntermediateResponseDecorator( ILdapCodecService codec, IntermediateResponse decoratedMessage ) + public IntermediateResponseDecorator( LdapCodecService codec, IntermediateResponse decoratedMessage ) { super( codec, decoratedMessage ); } Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java Fri Feb 4 00:40:02 2011 @@ -28,8 +28,8 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.tlv.UniversalTag; import org.apache.directory.shared.asn1.ber.tlv.Value; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.codec.IDecorator; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.Decorator; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.model.message.LdapResult; import org.apache.directory.shared.ldap.model.message.Referral; @@ -43,7 +43,7 @@ import org.apache.directory.shared.util. * * @author Apache Directory Project */ -public class LdapResultDecorator implements LdapResult, IDecorator +public class LdapResultDecorator implements LdapResult, Decorator { /** The decorated LdapResult */ private final LdapResult decoratedLdapResult; @@ -55,7 +55,7 @@ public class LdapResultDecorator impleme private byte[] matchedDnBytes; /** The codec responsible for encoding and decoding this object. */ - private ILdapCodecService codec; + private LdapCodecService codec; /** @@ -321,7 +321,7 @@ public class LdapResultDecorator impleme /** * {@inheritDoc} */ - public ILdapCodecService getCodecService() + public LdapCodecService getCodecService() { return codec; } Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java Fri Feb 4 00:40:02 2011 @@ -23,9 +23,9 @@ package org.apache.directory.shared.ldap import java.util.HashMap; import java.util.Map; -import org.apache.directory.shared.ldap.codec.ICodecControl; -import org.apache.directory.shared.ldap.codec.IDecorator; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.CodecControl; +import org.apache.directory.shared.ldap.codec.Decorator; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.codec.controls.ControlDecorator; import org.apache.directory.shared.ldap.model.exception.MessageException; import org.apache.directory.shared.ldap.model.message.AbandonRequest; @@ -60,7 +60,7 @@ import org.apache.directory.shared.ldap. * @TODO make this class abstract, after finishing switch and all types and make default blow an EncoderException * @author Apache Directory Project */ -public abstract class MessageDecorator implements Message, IDecorator +public abstract class MessageDecorator implements Message, Decorator { /** The decorated Control */ private final E decoratedMessage; @@ -75,13 +75,13 @@ public abstract class MessageDecorator currentControl; + private CodecControl currentControl; /** The LdapCodecService */ - private final ILdapCodecService codec; + private final LdapCodecService codec; - public static MessageDecorator getDecorator( ILdapCodecService codec, Message decoratedMessage ) + public static MessageDecorator getDecorator( LdapCodecService codec, Message decoratedMessage ) { if ( decoratedMessage instanceof MessageDecorator ) { @@ -197,7 +197,7 @@ public abstract class MessageDecorator getCurrentControl() + public CodecControl getCurrentControl() { return currentControl; } @@ -300,11 +300,11 @@ public abstract class MessageDecorator controlDecorator; + CodecControl controlDecorator; if ( control instanceof ControlDecorator ) { - controlDecorator = ( ICodecControl ) control; + controlDecorator = ( CodecControl ) control; decorated = controlDecorator.getDecorated(); } else @@ -398,7 +398,7 @@ public abstract class MessageDecoratorApache Directory Project * @version $Rev$, $Date$ */ -public class PasswordPolicyFactory implements IControlFactory +public class PasswordPolicyFactory implements ControlFactory { - private ILdapCodecService codec; + private LdapCodecService codec; /** * Creates a new instance of PasswordPolicyFactory. * */ - public PasswordPolicyFactory( ILdapCodecService codec ) + public PasswordPolicyFactory( LdapCodecService codec ) { this.codec = codec; } Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java Fri Feb 4 00:40:02 2011 @@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.asn1.ber.AbstractContainer; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.LdapCodecService; /** @@ -35,7 +35,7 @@ public class SyncDoneValueContainer exte /** syncDoneValue*/ private SyncDoneValueDecorator control; - private ILdapCodecService codec; + private LdapCodecService codec; /** @@ -43,7 +43,7 @@ public class SyncDoneValueContainer exte * Creates a new SyncDoneValueControlContainer object. * */ - public SyncDoneValueContainer( ILdapCodecService codec ) + public SyncDoneValueContainer( LdapCodecService codec ) { super(); this.codec = codec; @@ -59,7 +59,7 @@ public class SyncDoneValueContainer exte * Creates a new SyncDoneValueControlContainer object. * */ - public SyncDoneValueContainer( ILdapCodecService codec, SyncDoneValueDecorator control ) + public SyncDoneValueContainer( LdapCodecService codec, SyncDoneValueDecorator control ) { super(); this.codec = codec; @@ -91,7 +91,7 @@ public class SyncDoneValueContainer exte } - public ILdapCodecService getCodecService() + public LdapCodecService getCodecService() { return codec; } Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java Fri Feb 4 00:40:02 2011 @@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.tlv.UniversalTag; import org.apache.directory.shared.asn1.ber.tlv.Value; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.codec.controls.ControlDecorator; import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue; import org.apache.directory.shared.ldap.extras.controls.SyncDoneValueImpl; @@ -54,7 +54,7 @@ public class SyncDoneValueDecorator exte /** * Creates a new instance of SyncDoneValueControlCodec. */ - public SyncDoneValueDecorator( ILdapCodecService codec ) + public SyncDoneValueDecorator( LdapCodecService codec ) { super( codec, new SyncDoneValueImpl() ); } @@ -66,7 +66,7 @@ public class SyncDoneValueDecorator exte * @param codec The LDAP codec * @param control The control to be decorated */ - public SyncDoneValueDecorator( ILdapCodecService codec, SyncDoneValue control ) + public SyncDoneValueDecorator( LdapCodecService codec, SyncDoneValue control ) { super( codec, control ); } Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java Fri Feb 4 00:40:02 2011 @@ -20,21 +20,21 @@ package org.apache.directory.shared.ldap.extras.controls.syncrepl_impl; -import org.apache.directory.shared.ldap.codec.IControlFactory; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.ControlFactory; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue; /** - * A {@link IControlFactory} which creates {@link SyncDoneValue} controls. + * A {@link ControlFactory} which creates {@link SyncDoneValue} controls. * * @author Apache Directory Project * @version $Rev$, $Date$ */ -public class SyncDoneValueFactory implements IControlFactory +public class SyncDoneValueFactory implements ControlFactory { /** The codec for this factory */ - private ILdapCodecService codec; + private LdapCodecService codec; /** @@ -42,7 +42,7 @@ public class SyncDoneValueFactory implem * * @param codec The codec for this factory. */ - public SyncDoneValueFactory( ILdapCodecService codec ) + public SyncDoneValueFactory( LdapCodecService codec ) { this.codec = codec; } Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java Fri Feb 4 00:40:02 2011 @@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.asn1.ber.AbstractContainer; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.LdapCodecService; /** @@ -34,14 +34,14 @@ public class SyncInfoValueContainer exte /** SyncInfoValueControl */ private SyncInfoValueDecorator control; - private ILdapCodecService codec; + private LdapCodecService codec; /** * Creates a new SyncInfoValueControlContainer object. We will store one grammar, * it's enough ... */ - public SyncInfoValueContainer( ILdapCodecService codec ) + public SyncInfoValueContainer( LdapCodecService codec ) { super(); this.codec = codec; @@ -56,7 +56,7 @@ public class SyncInfoValueContainer exte * Creates a new SyncInfoValueControlContainer object. We will store one grammar, * it's enough ... */ - public SyncInfoValueContainer( ILdapCodecService codec, SyncInfoValueDecorator control ) + public SyncInfoValueContainer( LdapCodecService codec, SyncInfoValueDecorator control ) { super(); this.codec = codec; @@ -88,7 +88,7 @@ public class SyncInfoValueContainer exte } - public ILdapCodecService getCodecService() + public LdapCodecService getCodecService() { return codec; } Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java Fri Feb 4 00:40:02 2011 @@ -32,7 +32,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.tlv.UniversalTag; import org.apache.directory.shared.asn1.ber.tlv.Value; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.codec.controls.ControlDecorator; import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue; import org.apache.directory.shared.ldap.extras.controls.SyncInfoValueImpl; @@ -57,7 +57,7 @@ public class SyncInfoValueDecorator exte /** * The constructor for this codec. Dont't forget to set the type. */ - public SyncInfoValueDecorator( ILdapCodecService codec ) + public SyncInfoValueDecorator( LdapCodecService codec ) { super( codec, new SyncInfoValueImpl() ); } @@ -66,7 +66,7 @@ public class SyncInfoValueDecorator exte /** * The constructor for this codec. Dont't forget to set the type. */ - public SyncInfoValueDecorator( ILdapCodecService codec, SyncInfoValue control ) + public SyncInfoValueDecorator( LdapCodecService codec, SyncInfoValue control ) { super( codec, control ); } @@ -77,7 +77,7 @@ public class SyncInfoValueDecorator exte * @param type The kind of syncInfo we will store. Can be newCookie, * refreshPresent, refreshDelete or syncIdSet */ - public SyncInfoValueDecorator( ILdapCodecService codec, SynchronizationInfoEnum type ) + public SyncInfoValueDecorator( LdapCodecService codec, SynchronizationInfoEnum type ) { this( codec ); Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java Fri Feb 4 00:40:02 2011 @@ -20,21 +20,21 @@ package org.apache.directory.shared.ldap.extras.controls.syncrepl_impl; -import org.apache.directory.shared.ldap.codec.IControlFactory; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.ControlFactory; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue; /** - * A {@link IControlFactory} which creates {@link SyncInfoValue} controls. + * A {@link ControlFactory} which creates {@link SyncInfoValue} controls. * * @author Apache Directory Project * @version $Rev$, $Date$ */ -public class SyncInfoValueFactory implements IControlFactory +public class SyncInfoValueFactory implements ControlFactory { - private ILdapCodecService codec; + private LdapCodecService codec; /** @@ -42,7 +42,7 @@ public class SyncInfoValueFactory implem * * @param codec The codec for this factory. */ - public SyncInfoValueFactory( ILdapCodecService codec ) + public SyncInfoValueFactory( LdapCodecService codec ) { this.codec = codec; } Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnContainer.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnContainer.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnContainer.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnContainer.java Fri Feb 4 00:40:02 2011 @@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.asn1.ber.AbstractContainer; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.LdapCodecService; /** @@ -39,7 +39,7 @@ public class SyncModifyDnContainer exten * Creates a new SyncStateValueControlContainer object. We will store one grammar, * it's enough ... */ - public SyncModifyDnContainer( ILdapCodecService codec ) + public SyncModifyDnContainer( LdapCodecService codec ) { super(); this.control = new SyncModifyDnDecorator( codec ); Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnDecorator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnDecorator.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnDecorator.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnDecorator.java Fri Feb 4 00:40:02 2011 @@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.tlv.Value; import org.apache.directory.shared.asn1.util.Asn1StringUtils; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.codec.controls.ControlDecorator; import org.apache.directory.shared.ldap.extras.controls.SyncModifyDn; import org.apache.directory.shared.ldap.extras.controls.SyncModifyDnImpl; @@ -76,20 +76,20 @@ public class SyncModifyDnDecorator exten private Asn1Decoder decoder = new Asn1Decoder(); - public SyncModifyDnDecorator( ILdapCodecService codec ) + public SyncModifyDnDecorator( LdapCodecService codec ) { super( codec, new SyncModifyDnImpl() ); } - public SyncModifyDnDecorator( ILdapCodecService codec, SyncModifyDnType type ) + public SyncModifyDnDecorator( LdapCodecService codec, SyncModifyDnType type ) { this( codec ); this.modDnType = type; } - public SyncModifyDnDecorator( ILdapCodecService codec, SyncModifyDn control ) + public SyncModifyDnDecorator( LdapCodecService codec, SyncModifyDn control ) { super( codec, control ); } Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnFactory.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnFactory.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnFactory.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnFactory.java Fri Feb 4 00:40:02 2011 @@ -20,21 +20,21 @@ package org.apache.directory.shared.ldap.extras.controls.syncrepl_impl; -import org.apache.directory.shared.ldap.codec.IControlFactory; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.ControlFactory; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.extras.controls.SyncModifyDn; /** - * A {@link IControlFactory} which creates {@link SyncModifyDn} controls. + * A {@link ControlFactory} which creates {@link SyncModifyDn} controls. * * @author Apache Directory Project * @version $Rev$, $Date$ */ -public class SyncModifyDnFactory implements IControlFactory +public class SyncModifyDnFactory implements ControlFactory { - private ILdapCodecService codec; + private LdapCodecService codec; /** @@ -42,7 +42,7 @@ public class SyncModifyDnFactory impleme * * @param codec The codec for this factory. */ - public SyncModifyDnFactory( ILdapCodecService codec ) + public SyncModifyDnFactory( LdapCodecService codec ) { this.codec = codec; } Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java Fri Feb 4 00:40:02 2011 @@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.tlv.UniversalTag; import org.apache.directory.shared.asn1.ber.tlv.Value; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.codec.controls.ControlDecorator; import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue; import org.apache.directory.shared.ldap.extras.controls.SyncRequestValueImpl; @@ -52,13 +52,13 @@ public class SyncRequestValueDecorator private static final Asn1Decoder decoder = new Asn1Decoder(); - public SyncRequestValueDecorator( ILdapCodecService codec ) + public SyncRequestValueDecorator( LdapCodecService codec ) { super( codec, new SyncRequestValueImpl() ); } - public SyncRequestValueDecorator( ILdapCodecService codec, SyncRequestValue control ) + public SyncRequestValueDecorator( LdapCodecService codec, SyncRequestValue control ) { super( codec, control ); } Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java Fri Feb 4 00:40:02 2011 @@ -20,21 +20,21 @@ package org.apache.directory.shared.ldap.extras.controls.syncrepl_impl; -import org.apache.directory.shared.ldap.codec.IControlFactory; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.ControlFactory; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue; /** - * A {@link IControlFactory} which creates {@link SyncRequestValue} controls. + * A {@link ControlFactory} which creates {@link SyncRequestValue} controls. * * @author Apache Directory Project * @version $Rev$, $Date$ */ -public class SyncRequestValueFactory implements IControlFactory +public class SyncRequestValueFactory implements ControlFactory { /** The codec for this factory */ - private ILdapCodecService codec; + private LdapCodecService codec; /** @@ -42,7 +42,7 @@ public class SyncRequestValueFactory imp * * @param codec The codec for this factory. */ - public SyncRequestValueFactory( ILdapCodecService codec ) + public SyncRequestValueFactory( LdapCodecService codec ) { this.codec = codec; } Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java Fri Feb 4 00:40:02 2011 @@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.tlv.UniversalTag; import org.apache.directory.shared.asn1.ber.tlv.Value; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.codec.controls.ControlDecorator; import org.apache.directory.shared.ldap.extras.controls.SyncStateTypeEnum; import org.apache.directory.shared.ldap.extras.controls.SyncStateValue; @@ -51,13 +51,13 @@ public class SyncStateValueDecorator ext private static final Asn1Decoder decoder = new Asn1Decoder(); - public SyncStateValueDecorator( ILdapCodecService codec ) + public SyncStateValueDecorator( LdapCodecService codec ) { super( codec, new SyncStateValueImpl() ); } - public SyncStateValueDecorator( ILdapCodecService codec, SyncStateValue value ) + public SyncStateValueDecorator( LdapCodecService codec, SyncStateValue value ) { super( codec, value ); } Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java Fri Feb 4 00:40:02 2011 @@ -20,21 +20,21 @@ package org.apache.directory.shared.ldap.extras.controls.syncrepl_impl; -import org.apache.directory.shared.ldap.codec.IControlFactory; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.ControlFactory; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.extras.controls.SyncStateValue; /** - * A {@link IControlFactory} which creates {@link SyncStateValue} controls. + * A {@link ControlFactory} which creates {@link SyncStateValue} controls. * * @author Apache Directory Project * @version $Rev$, $Date$ */ -public class SyncStateValueFactory implements IControlFactory +public class SyncStateValueFactory implements ControlFactory { /** The codec for this factory */ - private ILdapCodecService codec; + private LdapCodecService codec; /** @@ -42,7 +42,7 @@ public class SyncStateValueFactory imple * * @param codec The codec for this factory. */ - public SyncStateValueFactory( ILdapCodecService codec ) + public SyncStateValueFactory( LdapCodecService codec ) { this.codec = codec; } Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/OpaqueControl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/OpaqueControl.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/OpaqueControl.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/OpaqueControl.java Fri Feb 4 00:40:02 2011 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.model.message.controls; -import org.apache.directory.shared.ldap.codec.IControlFactory; +import org.apache.directory.shared.ldap.codec.ControlFactory; import org.apache.directory.shared.ldap.model.message.Control; import org.apache.directory.shared.util.Strings; @@ -28,7 +28,7 @@ import org.apache.directory.shared.util. /** * A final {@link Control} implementation intended specifically for handling * controls who's values cannot be encoded or decoded by the codec service. - * This situation results when no {@link IControlFactory} is found to be + * This situation results when no {@link ControlFactory} is found to be * registered for this control's OID. Hence additional opaque value handling * methods are included to manage the opaque control value. * Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java Fri Feb 4 00:40:02 2011 @@ -51,7 +51,7 @@ import javax.naming.ldap.LdapName; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.model.exception.LdapAffectMultipleDsaException; import org.apache.directory.shared.ldap.model.exception.LdapAliasDereferencingException; import org.apache.directory.shared.ldap.model.exception.LdapAliasException; @@ -102,7 +102,7 @@ public final class JndiUtils // @TODO not really needed and can be moved out - public static javax.naming.ldap.Control toJndiControl( ILdapCodecService codec, Control control ) + public static javax.naming.ldap.Control toJndiControl( LdapCodecService codec, Control control ) throws EncoderException { return codec.toJndiControl( control ); @@ -110,7 +110,7 @@ public final class JndiUtils // @TODO not really needed and can be moved out - public static javax.naming.ldap.Control[] toJndiControls( ILdapCodecService codec, Control... controls ) + public static javax.naming.ldap.Control[] toJndiControls( LdapCodecService codec, Control... controls ) throws EncoderException { if ( controls != null ) @@ -133,7 +133,7 @@ public final class JndiUtils // @TODO not really needed and can be moved out - public static Control fromJndiControl( ILdapCodecService codec, javax.naming.ldap.Control jndiControl ) + public static Control fromJndiControl( LdapCodecService codec, javax.naming.ldap.Control jndiControl ) throws DecoderException { return codec.fromJndiControl( jndiControl ); @@ -141,7 +141,7 @@ public final class JndiUtils // @TODO not really needed and can be moved out - public static Control[] fromJndiControls( ILdapCodecService codec, javax.naming.ldap.Control... jndiControls ) + public static Control[] fromJndiControls( LdapCodecService codec, javax.naming.ldap.Control... jndiControls ) throws DecoderException { if ( jndiControls != null ) Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/ITestCodecControl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/ITestCodecControl.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/ITestCodecControl.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/ITestCodecControl.java Fri Feb 4 00:40:02 2011 @@ -1,6 +1,6 @@ package org.apache.directory.shared.ldap.codec; -interface ITestCodecControl extends ICodecControl, ITestControl +interface ITestCodecControl extends CodecControl, ITestControl { } \ No newline at end of file Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java Fri Feb 4 00:40:02 2011 @@ -51,7 +51,7 @@ public class LdapControlTest { /** The encoder instance */ LdapEncoder encoder = new LdapEncoder(); - ILdapCodecService codec = new DefaultLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); /** @@ -120,25 +120,25 @@ public class LdapControlTest assertEquals( 4, controls.size() ); - ICodecControl control = ( ICodecControl ) controls.get( "1.3.6.1.5.5.1" ); + CodecControl control = ( CodecControl ) controls.get( "1.3.6.1.5.5.1" ); assertEquals( "1.3.6.1.5.5.1", control.getOid() ); assertEquals( "0x61 0x62 0x63 0x64 0x65 0x66 ", Strings.dumpBytes( ( byte[] ) control.getValue() ) ); assertTrue( control.isCritical() ); internalAbandonRequest.addControl( control ); - control = ( ICodecControl ) controls.get( "1.3.6.1.5.5.2" ); + control = ( CodecControl ) controls.get( "1.3.6.1.5.5.2" ); assertEquals( "1.3.6.1.5.5.2", control.getOid() ); assertEquals( "0x67 0x68 0x69 0x6A 0x6B 0x6C ", Strings.dumpBytes((byte[]) control.getValue()) ); assertFalse( control.isCritical() ); internalAbandonRequest.addControl( control ); - control = ( ICodecControl ) controls.get( "1.3.6.1.5.5.3" ); + control = ( CodecControl ) controls.get( "1.3.6.1.5.5.3" ); assertEquals( "1.3.6.1.5.5.3", control.getOid() ); assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); assertTrue( control.isCritical() ); internalAbandonRequest.addControl( control ); - control = ( ICodecControl ) controls.get( "1.3.6.1.5.5.4" ); + control = ( CodecControl ) controls.get( "1.3.6.1.5.5.4" ); assertEquals( "1.3.6.1.5.5.4", control.getOid() ); assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); assertFalse( control.isCritical() ); Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java Fri Feb 4 00:40:02 2011 @@ -59,7 +59,7 @@ import org.junit.runner.RunWith; @Concurrent() public class LdapDecoderTest { - ILdapCodecService codec = new DefaultLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); private static class LdapProtocolDecoderOutput extends AbstractProtocolDecoderOutput { Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java Fri Feb 4 00:40:02 2011 @@ -54,7 +54,7 @@ public class LdapMessageTest /** The encoder instance */ LdapEncoder encoder = new LdapEncoder(); - ILdapCodecService codec = new DefaultLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); // ~ Methods Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java Fri Feb 4 00:40:02 2011 @@ -58,7 +58,7 @@ public class LdapResultTest /** The encoder instance */ LdapEncoder encoder = new LdapEncoder(); - ILdapCodecService codec = new DefaultLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); // ~ Methods Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java Fri Feb 4 00:40:02 2011 @@ -34,8 +34,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.ldap.codec.DefaultLdapCodecService; -import org.apache.directory.shared.ldap.codec.ICodecControl; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.CodecControl; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.decorators.AbandonRequestDecorator; @@ -61,7 +61,7 @@ public class AbandonRequestTest /** The encoder instance */ LdapEncoder encoder = new LdapEncoder(); - ILdapCodecService codec = new DefaultLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); /** @@ -132,25 +132,25 @@ public class AbandonRequestTest assertEquals( 4, controls.size() ); - ICodecControl control = ( ICodecControl ) controls.get( "1.3.6.1.5.5.1" ); + CodecControl control = ( CodecControl ) controls.get( "1.3.6.1.5.5.1" ); assertEquals( "1.3.6.1.5.5.1", control.getOid() ); assertEquals( "0x61 0x62 0x63 0x64 0x65 0x66 ", Strings.dumpBytes( ( byte[] ) control.getValue() ) ); assertTrue( control.isCritical() ); internalAbandonRequest.addControl( control ); - control = ( ICodecControl ) controls.get( "1.3.6.1.5.5.2" ); + control = ( CodecControl ) controls.get( "1.3.6.1.5.5.2" ); assertEquals( "1.3.6.1.5.5.2", control.getOid() ); assertEquals( "0x67 0x68 0x69 0x6A 0x6B 0x6C ", Strings.dumpBytes( ( byte[] ) control.getValue() ) ); assertFalse( control.isCritical() ); internalAbandonRequest.addControl( control ); - control = ( ICodecControl ) controls.get( "1.3.6.1.5.5.3" ); + control = ( CodecControl ) controls.get( "1.3.6.1.5.5.3" ); assertEquals( "1.3.6.1.5.5.3", control.getOid() ); assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); assertTrue( control.isCritical() ); internalAbandonRequest.addControl( control ); - control = ( ICodecControl ) controls.get( "1.3.6.1.5.5.4" ); + control = ( CodecControl ) controls.get( "1.3.6.1.5.5.4" ); assertEquals( "1.3.6.1.5.5.4", control.getOid() ); assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); assertFalse( control.isCritical() ); Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java Fri Feb 4 00:40:02 2011 @@ -39,8 +39,8 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.asn1.ber.Asn1Container; import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService; -import org.apache.directory.shared.ldap.codec.ICodecControl; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.CodecControl; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.ResponseCarryingException; @@ -67,7 +67,7 @@ public class AddRequestTest /** The encoder instance */ LdapEncoder encoder = new LdapEncoder(); - ILdapCodecService codec = new DefaultLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); /** * Test the decoding of a AddRequest @@ -792,7 +792,7 @@ public class AddRequestTest assertTrue( addRequest.hasControl( "2.16.840.1.113730.3.4.2" ) ); @SuppressWarnings("unchecked") - ICodecControl control = ( ICodecControl ) controls.get( "2.16.840.1.113730.3.4.2" ); + CodecControl control = ( CodecControl ) controls.get( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); assertEquals( "", Strings.dumpBytes( ( byte[] ) control.getValue() ) ); Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java Fri Feb 4 00:40:02 2011 @@ -34,8 +34,8 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.asn1.ber.Asn1Container; import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService; -import org.apache.directory.shared.ldap.codec.ICodecControl; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.CodecControl; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.decorators.AddResponseDecorator; @@ -59,7 +59,7 @@ public class AddResponseTest /** The encoder instance */ LdapEncoder encoder = new LdapEncoder(); - ILdapCodecService codec = new DefaultLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); /** @@ -234,7 +234,7 @@ public class AddResponseTest assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - ICodecControl control = ( ICodecControl ) controls.get( "2.16.840.1.113730.3.4.2" ); + CodecControl control = ( CodecControl ) controls.get( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); assertEquals( "", Strings.dumpBytes( ( byte[] ) control.getValue()) ); Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java Fri Feb 4 00:40:02 2011 @@ -33,8 +33,8 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService; -import org.apache.directory.shared.ldap.codec.ICodecControl; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.CodecControl; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.decorators.BindRequestDecorator; @@ -60,7 +60,7 @@ public class BindRequestPerfTest /** The encoder instance */ LdapEncoder encoder = new LdapEncoder(); - ILdapCodecService codec = new DefaultLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); /** * Test the decoding of a BindRequest with Simple authentication and no @@ -145,7 +145,7 @@ public class BindRequestPerfTest assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - ICodecControl control = ( ICodecControl ) controls.get( "2.16.840.1.113730.3.4.2" ); + CodecControl control = ( CodecControl ) controls.get( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); assertEquals( "", Strings.dumpBytes( ( byte[] ) control.getValue() ) ); Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java Fri Feb 4 00:40:02 2011 @@ -35,8 +35,8 @@ 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.ldap.codec.DefaultLdapCodecService; -import org.apache.directory.shared.ldap.codec.ICodecControl; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.CodecControl; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.ResponseCarryingException; @@ -62,7 +62,7 @@ public class BindRequestTest /** The encoder instance */ LdapEncoder encoder = new LdapEncoder(); - ILdapCodecService codec = new DefaultLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); /** * Test the decoding of a BindRequest with Simple authentication and no @@ -1216,7 +1216,7 @@ public class BindRequestTest assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - ICodecControl control = ( ICodecControl ) controls.get( "2.16.840.1.113730.3.4.2" ); + CodecControl control = ( CodecControl ) controls.get( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); assertEquals( "", Strings.dumpBytes( ( byte[] ) control.getValue() ) ); @@ -1296,7 +1296,7 @@ public class BindRequestTest assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - ICodecControl control = ( ICodecControl ) controls.get( "2.16.840.1.113730.3.4.2" ); + CodecControl control = ( CodecControl ) controls.get( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); assertEquals( "", Strings.dumpBytes( ( byte[] ) control.getValue() ) ); Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java?rev=1067047&r1=1067046&r2=1067047&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java Fri Feb 4 00:40:02 2011 @@ -35,8 +35,8 @@ 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.ldap.codec.DefaultLdapCodecService; -import org.apache.directory.shared.ldap.codec.ICodecControl; -import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.CodecControl; +import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; @@ -61,7 +61,7 @@ public class BindResponseTest /** The encoder instance */ LdapEncoder encoder = new LdapEncoder(); - ILdapCodecService codec = new DefaultLdapCodecService(); + LdapCodecService codec = new DefaultLdapCodecService(); /** * Test the decoding of a BindResponse @@ -368,7 +368,7 @@ public class BindResponseTest assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - ICodecControl control = ( ICodecControl ) controls.get( "2.16.840.1.113730.3.4.2" ); + CodecControl control = ( CodecControl ) controls.get( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); assertEquals( "", Strings.dumpBytes( ( byte[] ) control.getValue() ) );