Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BE95E964B for ; Thu, 20 Dec 2012 00:41:14 +0000 (UTC) Received: (qmail 7677 invoked by uid 500); 20 Dec 2012 00:41:14 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 7593 invoked by uid 500); 20 Dec 2012 00:41:14 -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 7529 invoked by uid 99); 20 Dec 2012 00:41:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Dec 2012 00:41:14 +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; Thu, 20 Dec 2012 00:41:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E996D2388A91; Thu, 20 Dec 2012 00:40:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1424248 [7/8] - in /directory/shared/branches/shared-refact: dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ dsml/parser/src/main/java/org/apache/directory... Date: Thu, 20 Dec 2012 00:40:10 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121220004025.E996D2388A91@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapDecoderTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapDecoderTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapDecoderTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapDecoderTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec; +package org.apache.directory.api.ldap.codec; import static org.junit.Assert.assertEquals; @@ -32,16 +32,16 @@ import org.apache.directory.api.asn1.Dec import org.apache.directory.api.asn1.ber.Asn1Container; import org.apache.directory.api.asn1.ber.Asn1Decoder; import org.apache.directory.api.asn1.ber.tlv.TLVStateEnum; +import org.apache.directory.api.ldap.codec.api.LdapDecoder; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.api.MessageDecorator; +import org.apache.directory.api.ldap.codec.api.ResponseCarryingException; +import org.apache.directory.api.ldap.codec.decorators.BindRequestDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.exception.ResponseCarryingMessageException; import org.apache.directory.api.ldap.model.message.BindRequest; import org.apache.directory.api.ldap.model.message.Message; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.LdapDecoder; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.api.MessageDecorator; -import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException; -import org.apache.directory.shared.ldap.codec.decorators.BindRequestDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.mina.core.session.DummySession; import org.apache.mina.core.session.IoSession; import org.junit.BeforeClass; Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapMessageTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapMessageTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapMessageTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapMessageTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec; +package org.apache.directory.api.ldap.codec; import static org.junit.Assert.assertEquals; @@ -30,14 +30,14 @@ import org.apache.directory.api.asn1.Dec import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Container; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.api.MessageDecorator; +import org.apache.directory.api.ldap.codec.decorators.UnbindRequestDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.Message; import org.apache.directory.api.ldap.model.message.UnbindRequest; import org.apache.directory.api.ldap.model.message.UnbindRequestImpl; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.api.MessageDecorator; -import org.apache.directory.shared.ldap.codec.decorators.UnbindRequestDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapResultTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapResultTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapResultTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapResultTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec; +package org.apache.directory.api.ldap.codec; import static org.junit.Assert.assertEquals; @@ -32,15 +32,15 @@ import org.apache.directory.api.asn1.Dec import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Container; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.api.MessageDecorator; +import org.apache.directory.api.ldap.codec.decorators.AddResponseDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.AddResponse; import org.apache.directory.api.ldap.model.message.Message; import org.apache.directory.api.ldap.model.message.Referral; import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.api.MessageDecorator; -import org.apache.directory.shared.ldap.codec.decorators.AddResponseDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/abandon/AbandonRequestTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/abandon/AbandonRequestTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/abandon/AbandonRequestTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/abandon/AbandonRequestTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.abandon; +package org.apache.directory.api.ldap.codec.abandon; import static org.junit.Assert.assertEquals; @@ -31,16 +31,16 @@ import java.util.Map; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.api.MessageDecorator; +import org.apache.directory.api.ldap.codec.decorators.AbandonRequestDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.AbandonRequest; import org.apache.directory.api.ldap.model.message.AbandonRequestImpl; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.Message; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.api.MessageDecorator; -import org.apache.directory.shared.ldap.codec.decorators.AbandonRequestDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -208,26 +208,26 @@ public class AbandonRequestTest extends assertEquals( 4, controls.size() ); - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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 = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls.get( "1.3.6.1.5.5.2" ); + control = ( org.apache.directory.api.ldap.codec.api.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 = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls.get( "1.3.6.1.5.5.3" ); + control = ( org.apache.directory.api.ldap.codec.api.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 = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls.get( "1.3.6.1.5.5.4" ); + control = ( org.apache.directory.api.ldap.codec.api.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() ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddRequestTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddRequestTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddRequestTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddRequestTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.add; +package org.apache.directory.api.ldap.codec.add; import static org.junit.Assert.assertEquals; @@ -36,6 +36,12 @@ import org.apache.directory.api.asn1.Dec import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Container; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.api.MessageDecorator; +import org.apache.directory.api.ldap.codec.api.ResponseCarryingException; +import org.apache.directory.api.ldap.codec.decorators.AddRequestDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.entry.Attribute; import org.apache.directory.api.ldap.model.entry.Entry; import org.apache.directory.api.ldap.model.entry.Value; @@ -45,12 +51,6 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.message.Message; import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.api.MessageDecorator; -import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException; -import org.apache.directory.shared.ldap.codec.decorators.AddRequestDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -1234,7 +1234,7 @@ public class AddRequestTest extends Abst assertTrue( addRequest.hasControl( "2.16.840.1.113730.3.4.2" ) ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddResponseTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddResponseTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddResponseTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddResponseTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.add; +package org.apache.directory.api.ldap.codec.add; import static org.junit.Assert.assertEquals; @@ -31,16 +31,16 @@ import org.apache.directory.api.asn1.Dec import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Container; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.api.MessageDecorator; +import org.apache.directory.api.ldap.codec.decorators.AddResponseDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.AddResponse; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.Message; import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.api.MessageDecorator; -import org.apache.directory.shared.ldap.codec.decorators.AddResponseDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -262,7 +262,7 @@ public class AddResponseTest extends Abs assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindRequestPerfTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindRequestPerfTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindRequestPerfTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindRequestPerfTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.bind; +package org.apache.directory.api.ldap.codec.bind; import static org.junit.Assert.assertEquals; @@ -30,16 +30,16 @@ import java.util.Map; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.decorators.BindRequestDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.BindRequest; import org.apache.directory.api.ldap.model.message.BindRequestImpl; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.controls.OpaqueControl; import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.decorators.BindRequestDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -201,7 +201,7 @@ public class BindRequestPerfTest extends assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindRequestTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindRequestTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindRequestTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindRequestTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.bind; +package org.apache.directory.api.ldap.codec.bind; import static org.junit.Assert.assertEquals; @@ -35,18 +35,18 @@ import org.apache.directory.api.asn1.Dec import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Container; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.api.MessageDecorator; +import org.apache.directory.api.ldap.codec.api.ResponseCarryingException; +import org.apache.directory.api.ldap.codec.decorators.BindRequestDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.BindRequest; import org.apache.directory.api.ldap.model.message.BindResponseImpl; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.Message; import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.api.MessageDecorator; -import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException; -import org.apache.directory.shared.ldap.codec.decorators.BindRequestDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -1548,7 +1548,7 @@ public class BindRequestTest extends Abs assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); @@ -1662,7 +1662,7 @@ public class BindRequestTest extends Abs assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindResponseTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindResponseTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindResponseTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindResponseTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.bind; +package org.apache.directory.api.ldap.codec.bind; import static org.junit.Assert.assertEquals; @@ -32,17 +32,17 @@ import org.apache.directory.api.asn1.Dec import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Container; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.api.MessageDecorator; +import org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; +import org.apache.directory.api.ldap.codec.decorators.BindResponseDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.BindResponse; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.Message; import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.api.MessageDecorator; -import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; -import org.apache.directory.shared.ldap.codec.decorators.BindResponseDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -450,7 +450,7 @@ public class BindResponseTest extends Ab assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/compare/CompareRequestTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/compare/CompareRequestTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/compare/CompareRequestTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/compare/CompareRequestTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.compare; +package org.apache.directory.api.ldap.codec.compare; import static org.junit.Assert.assertEquals; @@ -33,17 +33,17 @@ import com.mycila.junit.concurrent.Concu import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.api.ResponseCarryingException; +import org.apache.directory.api.ldap.codec.decorators.CompareRequestDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.CompareRequest; import org.apache.directory.api.ldap.model.message.CompareResponseImpl; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.Message; import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException; -import org.apache.directory.shared.ldap.codec.decorators.CompareRequestDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -767,7 +767,7 @@ public class CompareRequestTest extends assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/compare/CompareResponseTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/compare/CompareResponseTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/compare/CompareResponseTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/compare/CompareResponseTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.compare; +package org.apache.directory.api.ldap.codec.compare; import static org.junit.Assert.assertEquals; @@ -30,14 +30,14 @@ import java.util.Map; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.decorators.CompareResponseDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.CompareResponse; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.decorators.CompareResponseDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -227,7 +227,7 @@ public class CompareResponseTest extends assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/del/DelRequestTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/del/DelRequestTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/del/DelRequestTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/del/DelRequestTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.del; +package org.apache.directory.api.ldap.codec.del; import static org.junit.Assert.assertEquals; @@ -30,6 +30,11 @@ import java.util.Map; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.api.ResponseCarryingException; +import org.apache.directory.api.ldap.codec.decorators.DeleteRequestDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.DeleteRequest; import org.apache.directory.api.ldap.model.message.DeleteRequestImpl; @@ -37,11 +42,6 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.message.Message; import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException; -import org.apache.directory.shared.ldap.codec.decorators.DeleteRequestDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -391,7 +391,7 @@ public class DelRequestTest extends Abst assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/del/DelResponseTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/del/DelResponseTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/del/DelResponseTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/del/DelResponseTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.del; +package org.apache.directory.api.ldap.codec.del; import static org.junit.Assert.assertEquals; @@ -30,14 +30,14 @@ import java.util.Map; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.decorators.DeleteResponseDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.DeleteResponse; import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.decorators.DeleteResponseDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -332,7 +332,7 @@ public class DelResponseTest extends Abs assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedRequestTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedRequestTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedRequestTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedRequestTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.extended; +package org.apache.directory.api.ldap.codec.extended; import static org.junit.Assert.assertEquals; @@ -33,12 +33,12 @@ import com.mycila.junit.concurrent.Concu import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.ExtendedRequestDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -245,7 +245,7 @@ public class ExtendedRequestTest extends assertTrue( extendedRequest.hasControl( "2.16.840.1.113730.3.4.2" ) ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) extendedRequest + CodecControl control = ( org.apache.directory.api.ldap.codec.api.CodecControl ) extendedRequest .getControl( "2.16.840.1.113730.3.4.2" ); assertEquals( "", Strings.dumpBytes( ( byte[] ) control.getValue() ) ); @@ -369,7 +369,7 @@ public class ExtendedRequestTest extends assertTrue( extendedRequest.hasControl( "2.16.840.1.113730.3.4.2" ) ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) extendedRequest + CodecControl control = ( org.apache.directory.api.ldap.codec.api.CodecControl ) extendedRequest .getControl( "2.16.840.1.113730.3.4.2" ); assertEquals( "", Strings.dumpBytes( ( byte[] ) control.getValue() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedResponseTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedResponseTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedResponseTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedResponseTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.extended; +package org.apache.directory.api.ldap.codec.extended; import static org.junit.Assert.assertEquals; @@ -30,14 +30,14 @@ import java.util.Map; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.ExtendedResponse; import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.ExtendedResponseDecorator; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -278,7 +278,7 @@ public class ExtendedResponseTest extend assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); @@ -475,7 +475,7 @@ public class ExtendedResponseTest extend assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); @@ -854,7 +854,7 @@ public class ExtendedResponseTest extend assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); @@ -1092,7 +1092,7 @@ public class ExtendedResponseTest extend assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/intermediate/IntermediateResponseTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/intermediate/IntermediateResponseTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/intermediate/IntermediateResponseTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/intermediate/IntermediateResponseTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.intermediate; +package org.apache.directory.api.ldap.codec.intermediate; import static org.junit.Assert.assertEquals; @@ -33,13 +33,13 @@ import com.mycila.junit.concurrent.Concu import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.decorators.IntermediateResponseDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.IntermediateResponse; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.decorators.IntermediateResponseDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -245,7 +245,7 @@ public class IntermediateResponseTest ex assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); @@ -368,7 +368,7 @@ public class IntermediateResponseTest ex assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modify/ModifyRequestTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modify/ModifyRequestTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modify/ModifyRequestTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modify/ModifyRequestTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.modify; +package org.apache.directory.api.ldap.codec.modify; import static org.junit.Assert.assertEquals; @@ -31,6 +31,11 @@ import java.util.Map; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.api.ResponseCarryingException; +import org.apache.directory.api.ldap.codec.decorators.ModifyRequestDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.entry.Attribute; import org.apache.directory.api.ldap.model.entry.Modification; import org.apache.directory.api.ldap.model.exception.LdapException; @@ -40,11 +45,6 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.message.ModifyResponseImpl; import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException; -import org.apache.directory.shared.ldap.codec.decorators.ModifyRequestDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -2117,7 +2117,7 @@ public class ModifyRequestTest extends A assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) modifyRequest + CodecControl control = ( org.apache.directory.api.ldap.codec.api.CodecControl ) modifyRequest .getControl( "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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modify/ModifyResponseTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modify/ModifyResponseTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modify/ModifyResponseTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modify/ModifyResponseTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.modify; +package org.apache.directory.api.ldap.codec.modify; import static org.junit.Assert.assertEquals; @@ -30,14 +30,14 @@ import java.util.Map; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.decorators.ModifyResponseDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.ModifyResponse; import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.decorators.ModifyResponseDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -225,7 +225,7 @@ public class ModifyResponseTest extends assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modifyDn/ModifyDNRequestTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modifyDn/ModifyDNRequestTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modifyDn/ModifyDNRequestTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modifyDn/ModifyDNRequestTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.modifyDn; +package org.apache.directory.api.ldap.codec.modifyDn; import static org.junit.Assert.assertEquals; @@ -33,17 +33,17 @@ import com.mycila.junit.concurrent.Concu import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.api.ResponseCarryingException; +import org.apache.directory.api.ldap.codec.decorators.ModifyDnRequestDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.Message; import org.apache.directory.api.ldap.model.message.ModifyDnRequest; import org.apache.directory.api.ldap.model.message.ModifyDnResponseImpl; import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException; -import org.apache.directory.shared.ldap.codec.decorators.ModifyDnRequestDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -684,7 +684,7 @@ public class ModifyDNRequestTest extends assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) modifyDnRequest + CodecControl control = ( org.apache.directory.api.ldap.codec.api.CodecControl ) modifyDnRequest .getControl( "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() ) ); @@ -972,7 +972,7 @@ public class ModifyDNRequestTest extends assertTrue( modifyDnRequest.hasControl( "2.16.840.1.113730.3.4.2" ) ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) modifyDnRequest + CodecControl control = ( org.apache.directory.api.ldap.codec.api.CodecControl ) modifyDnRequest .getControl( "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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modifyDn/ModifyDNResponseTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modifyDn/ModifyDNResponseTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modifyDn/ModifyDNResponseTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modifyDn/ModifyDNResponseTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.modifyDn; +package org.apache.directory.api.ldap.codec.modifyDn; import static org.junit.Assert.assertEquals; @@ -30,14 +30,14 @@ import java.util.Map; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.decorators.ModifyDnResponseDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.ModifyDnResponse; import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.decorators.ModifyDnResponseDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -227,7 +227,7 @@ public class ModifyDNResponseTest extend assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/osgi/AbstractCodecServiceTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/osgi/AbstractCodecServiceTest.java?rev=1424248&r1=1423884&r2=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/osgi/AbstractCodecServiceTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/osgi/AbstractCodecServiceTest.java Thu Dec 20 00:40:02 2012 @@ -17,11 +17,12 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.osgi; +package org.apache.directory.api.ldap.codec.osgi; -import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory; -import org.apache.directory.shared.ldap.codec.api.LdapEncoder; +import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory; +import org.apache.directory.api.ldap.codec.api.LdapEncoder; +import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService; import org.apache.mina.core.session.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFactory; import org.apache.mina.filter.codec.ProtocolDecoder; Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.search; +package org.apache.directory.api.ldap.codec.search; import static org.junit.Assert.assertEquals; @@ -38,6 +38,9 @@ import com.mycila.junit.concurrent.Concu import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.decorators.SearchRequestDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.constants.SchemaConstants; import org.apache.directory.api.ldap.model.filter.ExprNode; import org.apache.directory.api.ldap.model.filter.ExtensibleNode; @@ -47,9 +50,6 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer; import org.apache.directory.api.ldap.model.schema.normalizers.OidNormalizer; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.decorators.SearchRequestDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestSubstringTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestSubstringTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestSubstringTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestSubstringTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.search; +package org.apache.directory.api.ldap.codec.search; import static org.junit.Assert.assertEquals; @@ -36,6 +36,10 @@ import com.mycila.junit.concurrent.Concu import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.decorators.SearchRequestDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.constants.SchemaConstants; import org.apache.directory.api.ldap.model.filter.ExprNode; import org.apache.directory.api.ldap.model.filter.SubstringNode; @@ -46,10 +50,6 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer; import org.apache.directory.api.ldap.model.schema.normalizers.OidNormalizer; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.decorators.SearchRequestDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -506,7 +506,7 @@ public class SearchRequestSubstringTest assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) searchRequest + CodecControl control = ( org.apache.directory.api.ldap.codec.api.CodecControl ) searchRequest .getControl( "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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.search; +package org.apache.directory.api.ldap.codec.search; import static org.junit.Assert.assertEquals; @@ -36,6 +36,11 @@ import org.apache.directory.api.asn1.Dec import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; import org.apache.directory.api.asn1.ber.tlv.TLVStateEnum; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.api.ResponseCarryingException; +import org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesDecorator; +import org.apache.directory.api.ldap.codec.decorators.SearchRequestDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.constants.SchemaConstants; import org.apache.directory.api.ldap.model.filter.AndNode; import org.apache.directory.api.ldap.model.filter.ApproximateNode; @@ -57,11 +62,6 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer; import org.apache.directory.api.ldap.model.schema.normalizers.OidNormalizer; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException; -import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator; -import org.apache.directory.shared.ldap.codec.decorators.SearchRequestDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultDoneTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultDoneTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultDoneTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultDoneTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.search; +package org.apache.directory.api.ldap.codec.search; import static org.junit.Assert.assertEquals; @@ -30,14 +30,14 @@ import java.util.Map; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.decorators.SearchResultDoneDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.ldap.model.message.SearchResultDone; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.decorators.SearchResultDoneDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -223,7 +223,7 @@ public class SearchResultDoneTest extend assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultEntryTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultEntryTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultEntryTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultEntryTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.search; +package org.apache.directory.api.ldap.codec.search; import static org.junit.Assert.assertEquals; @@ -32,15 +32,15 @@ import javax.naming.NamingException; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.decorators.SearchResultEntryDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.entry.Attribute; import org.apache.directory.api.ldap.model.entry.Entry; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.SearchResultEntry; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.decorators.SearchResultEntryDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -1667,7 +1667,7 @@ public class SearchResultEntryTest exten assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); @@ -1973,7 +1973,7 @@ public class SearchResultEntryTest exten assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) ); Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultReferenceTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultReferenceTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultReferenceTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultReferenceTest.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.search; +package org.apache.directory.api.ldap.codec.search; import static org.junit.Assert.assertEquals; @@ -36,14 +36,14 @@ import com.mycila.junit.concurrent.Concu import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Decoder; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.decorators.SearchResultReferenceDecorator; +import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.Referral; import org.apache.directory.api.ldap.model.message.SearchResultReference; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.decorators.SearchResultReferenceDecorator; -import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -326,7 +326,7 @@ public class SearchResultReferenceTest e assertEquals( 1, controls.size() ); @SuppressWarnings("unchecked") - CodecControl control = ( org.apache.directory.shared.ldap.codec.api.CodecControl ) controls + CodecControl control = ( org.apache.directory.api.ldap.codec.api.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() ) );