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 BAE91964A for ; Thu, 20 Dec 2012 00:41:14 +0000 (UTC) Received: (qmail 7631 invoked by uid 500); 20 Dec 2012 00:41:14 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 7577 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 7528 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 E5C9C2388A68; 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 [6/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.E5C9C2388A68@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.controls.search.subentries; +package org.apache.directory.api.ldap.codec.controls.search.subentries; import java.nio.ByteBuffer; @@ -28,10 +28,10 @@ import org.apache.directory.api.asn1.Enc import org.apache.directory.api.asn1.ber.Asn1Decoder; import org.apache.directory.api.asn1.ber.tlv.BerValue; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.ControlDecorator; +import org.apache.directory.api.ldap.codec.api.LdapApiService; import org.apache.directory.api.ldap.model.message.controls.Subentries; import org.apache.directory.api.ldap.model.message.controls.SubentriesImpl; -import org.apache.directory.shared.ldap.codec.api.ControlDecorator; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesFactory.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesFactory.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesFactory.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesFactory.java Thu Dec 20 00:40:02 2012 @@ -17,12 +17,12 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.controls.search.subentries; +package org.apache.directory.api.ldap.codec.controls.search.subentries; +import org.apache.directory.api.ldap.codec.api.ControlFactory; +import org.apache.directory.api.ldap.codec.api.LdapApiService; import org.apache.directory.api.ldap.model.message.controls.Subentries; -import org.apache.directory.shared.ldap.codec.api.ControlFactory; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; /** Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesGrammar.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesGrammar.java?rev=1424248&r1=1423884&r2=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesGrammar.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesGrammar.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.controls.search.subentries; +package org.apache.directory.api.ldap.codec.controls.search.subentries; import org.apache.directory.api.asn1.DecoderException; Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesStates.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesStates.java?rev=1424248&r1=1423884&r2=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesStates.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesStates.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.controls.search.subentries; +package org.apache.directory.api.ldap.codec.controls.search.subentries; import org.apache.directory.api.asn1.ber.grammar.Grammar; Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -26,11 +26,11 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.tlv.BerValue; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.ldap.model.exception.MessageException; import org.apache.directory.api.ldap.model.message.AbandonRequest; import org.apache.directory.api.ldap.model.message.Control; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableRequestDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableRequestDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableRequestDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableRequestDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableRequestDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableRequestDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableRequestDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,13 +17,13 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; +import org.apache.directory.api.ldap.codec.api.LdapApiService; import org.apache.directory.api.ldap.model.message.AbandonListener; import org.apache.directory.api.ldap.model.message.AbandonableRequest; import org.apache.directory.api.ldap.model.message.ResultResponse; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequest.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequest.java Thu Dec 20 00:40:02 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import org.apache.directory.api.ldap.model.message.AbandonableRequest; Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,12 +17,12 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; +import org.apache.directory.api.ldap.codec.api.LdapApiService; import org.apache.directory.api.ldap.model.message.ResultResponse; import org.apache.directory.api.ldap.model.message.ResultResponseRequest; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -30,6 +30,8 @@ import org.apache.directory.api.asn1.ber import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.asn1.ber.tlv.UniversalTag; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.ldap.model.entry.Attribute; import org.apache.directory.api.ldap.model.entry.DefaultAttribute; import org.apache.directory.api.ldap.model.entry.Entry; @@ -41,8 +43,6 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddResponseDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddResponseDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddResponseDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddResponseDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddResponseDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddResponseDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddResponseDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -26,9 +26,9 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.ldap.model.message.AddResponse; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -27,14 +27,14 @@ import org.apache.directory.api.asn1.Enc import org.apache.directory.api.asn1.ber.tlv.BerValue; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.ldap.model.exception.MessageException; import org.apache.directory.api.ldap.model.message.BindRequest; 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.name.Dn; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindResponseDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindResponseDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindResponseDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindResponseDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindResponseDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindResponseDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindResponseDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -26,9 +26,9 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.ldap.model.message.BindResponse; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -28,6 +28,8 @@ import org.apache.directory.api.asn1.ber import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.asn1.ber.tlv.UniversalTag; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.ldap.model.entry.BinaryValue; import org.apache.directory.api.ldap.model.entry.Value; import org.apache.directory.api.ldap.model.exception.MessageException; @@ -36,8 +38,6 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareResponseDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareResponseDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareResponseDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareResponseDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareResponseDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareResponseDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareResponseDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -26,9 +26,9 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.ldap.model.message.CompareResponse; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteRequestDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteRequestDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteRequestDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -26,14 +26,14 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.ldap.model.exception.MessageException; 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.DeleteResponse; import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteResponseDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteResponseDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteResponseDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteResponseDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteResponseDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteResponseDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteResponseDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -26,9 +26,9 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.ldap.model.message.DeleteResponse; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/IntermediateResponseDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/IntermediateResponseDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/IntermediateResponseDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/IntermediateResponseDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/IntermediateResponseDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/IntermediateResponseDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/IntermediateResponseDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -26,11 +26,11 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; +import org.apache.directory.api.ldap.codec.api.MessageDecorator; import org.apache.directory.api.ldap.model.message.IntermediateResponse; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; -import org.apache.directory.shared.ldap.codec.api.MessageDecorator; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/LdapResultDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/LdapResultDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/LdapResultDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/LdapResultDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -27,14 +27,14 @@ import org.apache.directory.api.asn1.Enc import org.apache.directory.api.asn1.ber.tlv.BerValue; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.Decorator; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapEncoder; import org.apache.directory.api.ldap.model.message.LdapResult; import org.apache.directory.api.ldap.model.message.Referral; import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.Decorator; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapEncoder; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -27,6 +27,8 @@ import org.apache.directory.api.asn1.Enc import org.apache.directory.api.asn1.ber.tlv.BerValue; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.ldap.model.exception.MessageException; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.ModifyDnRequest; @@ -34,8 +36,6 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.api.ldap.model.name.Rdn; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnResponseDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnResponseDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnResponseDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnResponseDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnResponseDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnResponseDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnResponseDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -26,9 +26,9 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.ldap.model.message.ModifyDnResponse; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -31,6 +31,8 @@ import org.apache.directory.api.asn1.ber import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.asn1.ber.tlv.UniversalTag; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.ldap.model.entry.Attribute; import org.apache.directory.api.ldap.model.entry.DefaultAttribute; import org.apache.directory.api.ldap.model.entry.DefaultModification; @@ -42,8 +44,6 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.message.ModifyRequest; import org.apache.directory.api.ldap.model.message.ModifyResponse; import org.apache.directory.api.ldap.model.name.Dn; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyResponseDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyResponseDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyResponseDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyResponseDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyResponseDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyResponseDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyResponseDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -26,9 +26,9 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.ldap.model.message.ModifyResponse; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/RequestDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/RequestDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/RequestDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/RequestDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/RequestDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/RequestDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/RequestDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,12 +17,12 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.MessageDecorator; import org.apache.directory.api.ldap.model.message.Request; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.MessageDecorator; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResponseDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResponseDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResponseDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResponseDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,13 +17,13 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.MessageDecorator; import org.apache.directory.api.ldap.model.message.LdapResult; import org.apache.directory.api.ldap.model.message.ResultResponse; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.MessageDecorator; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResultResponseRequestDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResultResponseRequestDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResultResponseRequestDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResultResponseRequestDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,12 +17,12 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; +import org.apache.directory.api.ldap.codec.api.LdapApiService; import org.apache.directory.api.ldap.model.message.ResultResponse; import org.apache.directory.api.ldap.model.message.ResultResponseRequest; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchRequestDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchRequestDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchRequestDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchRequestDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -32,6 +32,20 @@ import org.apache.directory.api.asn1.ber import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.asn1.ber.tlv.UniversalTag; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.AttributeValueAssertion; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; +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.search.AndFilter; +import org.apache.directory.api.ldap.codec.search.AttributeValueAssertionFilter; +import org.apache.directory.api.ldap.codec.search.ConnectorFilter; +import org.apache.directory.api.ldap.codec.search.ExtensibleMatchFilter; +import org.apache.directory.api.ldap.codec.search.Filter; +import org.apache.directory.api.ldap.codec.search.NotFilter; +import org.apache.directory.api.ldap.codec.search.OrFilter; +import org.apache.directory.api.ldap.codec.search.PresentFilter; +import org.apache.directory.api.ldap.codec.search.SubstringFilter; import org.apache.directory.api.ldap.model.entry.Value; import org.apache.directory.api.ldap.model.exception.LdapException; import org.apache.directory.api.ldap.model.exception.MessageException; @@ -60,20 +74,6 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.message.SearchScope; import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.AttributeValueAssertion; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; -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.search.AndFilter; -import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter; -import org.apache.directory.shared.ldap.codec.search.ConnectorFilter; -import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter; -import org.apache.directory.shared.ldap.codec.search.Filter; -import org.apache.directory.shared.ldap.codec.search.NotFilter; -import org.apache.directory.shared.ldap.codec.search.OrFilter; -import org.apache.directory.shared.ldap.codec.search.PresentFilter; -import org.apache.directory.shared.ldap.codec.search.SubstringFilter; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultDoneDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultDoneDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultDoneDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultDoneDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultDoneDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultDoneDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultDoneDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -26,9 +26,9 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.ldap.model.message.SearchResultDone; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultEntryDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultEntryDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultEntryDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultEntryDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -30,6 +30,9 @@ import org.apache.directory.api.asn1.ber import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.asn1.ber.tlv.UniversalTag; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; +import org.apache.directory.api.ldap.codec.api.MessageDecorator; import org.apache.directory.api.ldap.model.entry.Attribute; import org.apache.directory.api.ldap.model.entry.DefaultAttribute; import org.apache.directory.api.ldap.model.entry.Entry; @@ -38,9 +41,6 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.message.SearchResultEntry; import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; -import org.apache.directory.shared.ldap.codec.api.MessageDecorator; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultReferenceDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultReferenceDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultReferenceDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultReferenceDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -27,12 +27,12 @@ import org.apache.directory.api.asn1.Enc import org.apache.directory.api.asn1.ber.tlv.BerValue; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; +import org.apache.directory.api.ldap.codec.api.LdapEncoder; +import org.apache.directory.api.ldap.codec.api.MessageDecorator; import org.apache.directory.api.ldap.model.message.Referral; import org.apache.directory.api.ldap.model.message.SearchResultReference; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; -import org.apache.directory.shared.ldap.codec.api.LdapEncoder; -import org.apache.directory.shared.ldap.codec.api.MessageDecorator; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SingleReplyRequestDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SingleReplyRequestDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SingleReplyRequestDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SingleReplyRequestDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,15 +17,15 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; +import org.apache.directory.api.ldap.codec.api.LdapApiService; import org.apache.directory.api.ldap.model.message.AbandonListener; import org.apache.directory.api.ldap.model.message.AbandonableRequest; import org.apache.directory.api.ldap.model.message.MessageTypeEnum; import org.apache.directory.api.ldap.model.message.ResultResponse; import org.apache.directory.api.ldap.model.message.SingleReplyRequest; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/UnbindRequestDecorator.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/UnbindRequestDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/UnbindRequestDecorator.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/UnbindRequestDecorator.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/UnbindRequestDecorator.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/UnbindRequestDecorator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/UnbindRequestDecorator.java Thu Dec 20 00:40:02 2012 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.decorators; +package org.apache.directory.api.ldap.codec.decorators; import java.nio.BufferOverflowException; @@ -25,11 +25,11 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.ldap.model.exception.MessageException; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.UnbindRequest; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultActivator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultActivator.java?rev=1424248&r1=1423884&r2=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultActivator.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultActivator.java Thu Dec 20 00:40:02 2012 @@ -17,11 +17,11 @@ * 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.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java Thu Dec 20 00:40:02 2012 @@ -17,12 +17,28 @@ * under the License. * */ -package org.apache.directory.shared.ldap.codec.osgi; +package org.apache.directory.api.ldap.codec.osgi; import org.apache.directory.api.asn1.DecoderException; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.Asn1Container; +import org.apache.directory.api.ldap.codec.BasicControlDecorator; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.ControlFactory; +import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator; +import org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory; +import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +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.UnsolicitedResponseFactory; +import org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory; +import org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory; +import org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory; +import org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory; +import org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory; +import org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.ExtendedRequest; import org.apache.directory.api.ldap.model.message.ExtendedRequestImpl; @@ -32,22 +48,6 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.message.controls.OpaqueControl; import org.apache.directory.api.util.Strings; import org.apache.directory.api.util.exception.NotImplementedException; -import org.apache.directory.shared.ldap.codec.BasicControlDecorator; -import org.apache.directory.shared.ldap.codec.api.ExtendedRequestDecorator; -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.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.ControlFactory; -import org.apache.directory.shared.ldap.codec.api.ExtendedRequestFactory; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.MessageDecorator; -import org.apache.directory.shared.ldap.codec.api.UnsolicitedResponseFactory; -import org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory; -import org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITFactory; -import org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeFactory; -import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsFactory; -import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory; -import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory; import org.apache.mina.filter.codec.ProtocolCodecFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,10 +72,10 @@ public class DefaultLdapCodecService imp /** A logger */ private static final Logger LOG = LoggerFactory.getLogger( DefaultLdapCodecService.class ); - /** The map of registered {@link org.apache.directory.shared.ldap.codec.api.ControlFactory}'s */ + /** The map of registered {@link org.apache.directory.api.ldap.codec.api.ControlFactory}'s */ private Map> controlFactories = new HashMap>(); - /** The map of registered {@link org.apache.directory.shared.ldap.codec.api.ExtendedRequestFactory}'s by request OID */ + /** The map of registered {@link org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory}'s by request OID */ private Map> extReqFactories = new HashMap>(); /** The map of registered {@link UnsolicitedResponseFactory}'s by request OID */ Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AndFilter.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AndFilter.java?rev=1424248&r1=1423884&r2=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AndFilter.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AndFilter.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 java.nio.BufferOverflowException; @@ -27,7 +27,7 @@ import java.util.List; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; +import org.apache.directory.api.ldap.codec.api.LdapConstants; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AttributeValueAssertionFilter.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AttributeValueAssertionFilter.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AttributeValueAssertionFilter.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AttributeValueAssertionFilter.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 java.nio.BufferOverflowException; @@ -27,8 +27,8 @@ import org.apache.directory.api.asn1.Enc import org.apache.directory.api.asn1.ber.tlv.BerValue; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; -import org.apache.directory.shared.ldap.codec.AttributeValueAssertion; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; +import org.apache.directory.api.ldap.codec.AttributeValueAssertion; +import org.apache.directory.api.ldap.codec.api.LdapConstants; /** Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/ConnectorFilter.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/ConnectorFilter.java?rev=1424248&r1=1423884&r2=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/ConnectorFilter.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/ConnectorFilter.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 java.nio.ByteBuffer; Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/ExtensibleMatchFilter.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/search/ExtensibleMatchFilter.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/ExtensibleMatchFilter.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/ExtensibleMatchFilter.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/search/ExtensibleMatchFilter.java&r1=1423968&r2=1424248&rev=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/search/ExtensibleMatchFilter.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/ExtensibleMatchFilter.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 java.nio.BufferOverflowException; @@ -27,8 +27,8 @@ import org.apache.directory.api.asn1.Enc import org.apache.directory.api.asn1.ber.tlv.BerValue; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/Filter.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/Filter.java?rev=1424248&r1=1423884&r2=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/Filter.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/Filter.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 java.nio.ByteBuffer; Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/NotFilter.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/NotFilter.java?rev=1424248&r1=1423884&r2=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/NotFilter.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/NotFilter.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 java.nio.BufferOverflowException; @@ -27,7 +27,7 @@ import org.apache.directory.api.asn1.Dec import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; +import org.apache.directory.api.ldap.codec.api.LdapConstants; /** Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/OrFilter.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/OrFilter.java?rev=1424248&r1=1423884&r2=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/OrFilter.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/OrFilter.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 java.nio.BufferOverflowException; @@ -27,7 +27,7 @@ import java.util.List; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; +import org.apache.directory.api.ldap.codec.api.LdapConstants; /** Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/PresentFilter.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/PresentFilter.java?rev=1424248&r1=1423884&r2=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/PresentFilter.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/PresentFilter.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 java.nio.BufferOverflowException; @@ -26,8 +26,8 @@ import java.nio.ByteBuffer; import org.apache.directory.api.asn1.EncoderException; import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/SubstringFilter.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/SubstringFilter.java?rev=1424248&r1=1423884&r2=1424248&view=diff ============================================================================== --- directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/SubstringFilter.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/SubstringFilter.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 java.nio.BufferOverflowException; @@ -30,8 +30,8 @@ import org.apache.directory.api.asn1.ber import org.apache.directory.api.asn1.ber.tlv.TLV; import org.apache.directory.api.asn1.ber.tlv.UniversalTag; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.codec.api.LdapConstants; import org.apache.directory.api.util.Strings; -import org.apache.directory.shared.ldap.codec.api.LdapConstants; /** Copied: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapControlTest.java (from r1423968, directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapControlTest.java?p2=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapControlTest.java&p1=directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.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/LdapControlTest.java (original) +++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapControlTest.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.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.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; @@ -205,26 +205,26 @@ public class LdapControlTest extends Abs 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() );