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 40F04964D for ; Thu, 20 Dec 2012 00:41:41 +0000 (UTC) Received: (qmail 8502 invoked by uid 500); 20 Dec 2012 00:41:41 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 8464 invoked by uid 500); 20 Dec 2012 00:41:41 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 8457 invoked by uid 99); 20 Dec 2012 00:41:41 -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:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Dec 2012 00:41:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4F0642388AA9; Thu, 20 Dec 2012 00:41:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1424249 - in /directory/apacheds/branches/apacheds-refact: core-api/src/main/java/org/apache/directory/server/core/api/ core-api/src/main/java/org/apache/directory/server/core/api/event/ core-api/src/test/java/org/apache/directory/server/c... Date: Thu, 20 Dec 2012 00:41:15 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121220004117.4F0642388AA9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Thu Dec 20 00:41:14 2012 New Revision: 1424249 URL: http://svn.apache.org/viewvc?rev=1424249&view=rev Log: Renamed the shared.codec package to api.codec Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/DirectoryService.java directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/EventType.java directory/apacheds/branches/apacheds-refact/core-api/src/test/java/org/apache/directory/server/core/api/MockDirectoryService.java directory/apacheds/branches/apacheds-refact/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyIT.java directory/apacheds/branches/apacheds-refact/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java directory/apacheds/branches/apacheds-refact/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java directory/apacheds/branches/apacheds-refact/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java directory/apacheds/branches/apacheds-refact/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.bat directory/apacheds/branches/apacheds-refact/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh directory/apacheds/branches/apacheds-refact/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf directory/apacheds/branches/apacheds-refact/interceptors/subtree/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java directory/apacheds/branches/apacheds-refact/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/LdapApiIntegrationUtils.java directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java directory/apacheds/branches/apacheds-refact/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java directory/apacheds/branches/apacheds-refact/service/ApacheDS.launch directory/apacheds/branches/apacheds-refact/service/apacheds.bat directory/apacheds/branches/apacheds-refact/service/apacheds.sh directory/apacheds/branches/apacheds-refact/service/src/test/java/org/apache/directory/server/UberJarMainTest.java directory/apacheds/branches/apacheds-refact/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/DirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/DirectoryService.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/DirectoryService.java (original) +++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/DirectoryService.java Thu Dec 20 00:41:14 2012 @@ -24,6 +24,7 @@ import java.io.IOException; import java.util.List; import java.util.Set; +import org.apache.directory.api.ldap.codec.api.LdapApiService; import org.apache.directory.api.ldap.model.csn.Csn; import org.apache.directory.api.ldap.model.entry.Entry; import org.apache.directory.api.ldap.model.exception.LdapException; @@ -44,7 +45,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.schema.SchemaPartition; import org.apache.directory.server.core.api.subtree.SubentryCache; import org.apache.directory.server.core.api.subtree.SubtreeEvaluator; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; import org.apache.directory.shared.ldap.util.tree.DnNode; /** Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java (original) +++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java Thu Dec 20 00:41:14 2012 @@ -28,6 +28,8 @@ import java.util.Iterator; import java.util.List; import org.apache.directory.api.asn1.util.Oid; +import org.apache.directory.api.ldap.codec.api.BinaryAttributeDetector; +import org.apache.directory.api.ldap.codec.api.LdapApiService; import org.apache.directory.api.ldap.model.constants.SchemaConstants; import org.apache.directory.api.ldap.model.cursor.EmptyCursor; import org.apache.directory.api.ldap.model.cursor.EntryCursor; @@ -84,8 +86,6 @@ import org.apache.directory.ldap.client. import org.apache.directory.ldap.client.api.EntryCursorImpl; import org.apache.directory.server.core.api.filtering.EntryFilteringCursor; import org.apache.directory.server.core.api.interceptor.context.BindOperationContext; -import org.apache.directory.shared.ldap.codec.api.BinaryAttributeDetector; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/EventType.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/EventType.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/EventType.java (original) +++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/EventType.java Thu Dec 20 00:41:14 2012 @@ -22,7 +22,7 @@ package org.apache.directory.server.core import java.util.ArrayList; -import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchDecorator; +import org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchDecorator; /** Modified: directory/apacheds/branches/apacheds-refact/core-api/src/test/java/org/apache/directory/server/core/api/MockDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/test/java/org/apache/directory/server/core/api/MockDirectoryService.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/core-api/src/test/java/org/apache/directory/server/core/api/MockDirectoryService.java (original) +++ directory/apacheds/branches/apacheds-refact/core-api/src/test/java/org/apache/directory/server/core/api/MockDirectoryService.java Thu Dec 20 00:41:14 2012 @@ -28,6 +28,7 @@ import java.util.Set; import javax.naming.ldap.LdapContext; +import org.apache.directory.api.ldap.codec.api.LdapApiService; import org.apache.directory.api.ldap.model.csn.Csn; import org.apache.directory.api.ldap.model.entry.Entry; import org.apache.directory.api.ldap.model.exception.LdapException; @@ -47,7 +48,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.schema.SchemaPartition; import org.apache.directory.server.core.api.subtree.SubentryCache; import org.apache.directory.server.core.api.subtree.SubtreeEvaluator; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; import org.apache.directory.shared.ldap.util.tree.DnNode; Modified: directory/apacheds/branches/apacheds-refact/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyIT.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyIT.java (original) +++ directory/apacheds/branches/apacheds-refact/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyIT.java Thu Dec 20 00:41:14 2012 @@ -35,6 +35,8 @@ import static org.junit.Assert.assertNot import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory; import org.apache.directory.api.ldap.model.constants.LdapSecurityConstants; import org.apache.directory.api.ldap.model.constants.PasswordPolicySchemaConstants; import org.apache.directory.api.ldap.model.constants.SchemaConstants; @@ -67,8 +69,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.integ.IntegrationUtils; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory; import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy; import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyImpl; import org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator; Modified: directory/apacheds/branches/apacheds-refact/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java (original) +++ directory/apacheds/branches/apacheds-refact/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java Thu Dec 20 00:41:14 2012 @@ -41,6 +41,9 @@ import javax.naming.directory.SearchCont import javax.naming.directory.SearchResult; import javax.naming.ldap.LdapContext; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory; +import org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesDecorator; import org.apache.directory.api.ldap.model.cursor.EntryCursor; import org.apache.directory.api.ldap.model.entry.Attribute; import org.apache.directory.api.ldap.model.entry.DefaultEntry; @@ -60,9 +63,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.integ.IntegrationUtils; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory; -import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator; import org.apache.directory.shared.ldap.util.JndiUtils; import org.junit.Ignore; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original) +++ directory/apacheds/branches/apacheds-refact/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Thu Dec 20 00:41:14 2012 @@ -47,6 +47,13 @@ import javax.naming.spi.DirStateFactory; import javax.naming.spi.DirectoryManager; import org.apache.directory.api.asn1.DecoderException; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.controls.cascade.CascadeDecorator; +import org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITDecorator; +import org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeDecorator; +import org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; +import org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchDecorator; +import org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesDecorator; import org.apache.directory.api.ldap.model.constants.JndiPropertyConstants; import org.apache.directory.api.ldap.model.constants.SchemaConstants; import org.apache.directory.api.ldap.model.cursor.EmptyCursor; @@ -102,13 +109,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.shared.DefaultCoreSession; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.controls.cascade.CascadeDecorator; -import org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITDecorator; -import org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeDecorator; -import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; -import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchDecorator; -import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator; import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue; import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue; import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue; Modified: directory/apacheds/branches/apacheds-refact/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/apacheds/branches/apacheds-refact/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Thu Dec 20 00:41:14 2012 @@ -44,6 +44,8 @@ import java.util.concurrent.locks.Reentr import javax.naming.directory.Attributes; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory; import org.apache.directory.api.ldap.model.constants.AuthenticationLevel; import org.apache.directory.api.ldap.model.constants.SchemaConstants; import org.apache.directory.api.ldap.model.csn.Csn; @@ -123,8 +125,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.subtree.SubentryInterceptor; import org.apache.directory.server.core.trigger.TriggerInterceptor; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory; import org.apache.directory.shared.ldap.util.tree.DnNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.bat URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.bat?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.bat (original) +++ directory/apacheds/branches/apacheds-refact/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.bat Thu Dec 20 00:41:14 2012 @@ -33,7 +33,7 @@ REM Dynamically build the classpath set ADS_CLASSPATH= for %%i in (..\lib\*.jar) do call cpappend.bat %%i -set DEF_CTRLS="-Ddefault.controls=org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory" +set DEF_CTRLS="-Ddefault.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory" set EXT_CTRLS="-Dextra.controls=org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" Modified: directory/apacheds/branches/apacheds-refact/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh (original) +++ directory/apacheds/branches/apacheds-refact/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh Thu Dec 20 00:41:14 2012 @@ -60,7 +60,7 @@ do ADS_CP=${ADS_CP}:$ADS_PWD/lib/${i} done -DEF_CTRLS="-Ddefault.controls=org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory" +DEF_CTRLS="-Ddefault.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory" EXT_CTRLS="-Dextra.controls=org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" Modified: directory/apacheds/branches/apacheds-refact/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf (original) +++ directory/apacheds/branches/apacheds-refact/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf Thu Dec 20 00:41:14 2012 @@ -35,7 +35,7 @@ wrapper.java.additional.2=-Dapacheds.var wrapper.java.additional.3=-Dapacheds.log.dir=${double.quote}%INSTANCE_DIRECTORY%/log${double.quote} wrapper.java.additional.4=-Dapacheds.run.dir=${double.quote}%INSTANCE_DIRECTORY%/run${double.quote} wrapper.java.additional.5=-Dapacheds.instance=${double.quote}%INSTANCE%${double.quote} -wrapper.java.additional.6=-Ddefault.controls=${double.quote}org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory${double.quote} +wrapper.java.additional.6=-Ddefault.controls=${double.quote}org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory${double.quote} wrapper.java.additional.7=-Dextra.controls=${double.quote}org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory${double.quote} wrapper.java.additional.8=-Ddefault.extendedOperation.requests=${double.quote}org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory${double.quote} wrapper.java.additional.9=-Ddefault.extendedOperation.responses=${double.quote}org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory${double.quote} Modified: directory/apacheds/branches/apacheds-refact/interceptors/subtree/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/subtree/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/interceptors/subtree/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original) +++ directory/apacheds/branches/apacheds-refact/interceptors/subtree/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Thu Dec 20 00:41:14 2012 @@ -27,6 +27,7 @@ import java.util.Set; import javax.naming.directory.SearchControls; +import org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesDecorator; import org.apache.directory.api.ldap.model.constants.AuthenticationLevel; import org.apache.directory.api.ldap.model.constants.SchemaConstants; import org.apache.directory.api.ldap.model.entry.Attribute; @@ -82,7 +83,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.subtree.SubtreeEvaluator; import org.apache.directory.server.core.shared.DefaultCoreSession; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/LdapApiIntegrationUtils.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/LdapApiIntegrationUtils.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/LdapApiIntegrationUtils.java (original) +++ directory/apacheds/branches/apacheds-refact/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/LdapApiIntegrationUtils.java Thu Dec 20 00:41:14 2012 @@ -23,6 +23,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import org.apache.directory.api.ldap.codec.api.SchemaBinaryAttributeDetector; import org.apache.directory.api.ldap.model.exception.LdapException; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.ldap.client.api.LdapConnectionConfig; @@ -31,7 +32,6 @@ import org.apache.directory.ldap.client. import org.apache.directory.ldap.client.api.PoolableLdapConnectionFactory; import org.apache.directory.server.constants.ServerDNConstants; import org.apache.directory.server.ldap.LdapServer; -import org.apache.directory.shared.ldap.codec.api.SchemaBinaryAttributeDetector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java (original) +++ directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java Thu Dec 20 00:41:14 2012 @@ -30,6 +30,8 @@ import java.io.IOException; import java.util.HashMap; import java.util.List; +import org.apache.directory.api.ldap.codec.api.ConfigurableBinaryAttributeDetector; +import org.apache.directory.api.ldap.codec.api.DefaultConfigurableBinaryAttributeDetector; import org.apache.directory.api.ldap.model.constants.SchemaConstants; import org.apache.directory.api.ldap.model.cursor.EntryCursor; import org.apache.directory.api.ldap.model.entry.Entry; @@ -46,8 +48,6 @@ import org.apache.directory.server.const import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.codec.api.ConfigurableBinaryAttributeDetector; -import org.apache.directory.shared.ldap.codec.api.DefaultConfigurableBinaryAttributeDetector; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java (original) +++ directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java Thu Dec 20 00:41:14 2012 @@ -27,6 +27,7 @@ import static org.junit.Assert.assertTru import java.io.IOException; import java.util.List; +import org.apache.directory.api.ldap.codec.api.SchemaBinaryAttributeDetector; import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms; import org.apache.directory.api.ldap.model.exception.LdapException; import org.apache.directory.api.ldap.model.name.Dn; @@ -46,7 +47,6 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler; import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler; import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler; -import org.apache.directory.shared.ldap.codec.api.SchemaBinaryAttributeDetector; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java (original) +++ directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java Thu Dec 20 00:41:14 2012 @@ -20,6 +20,11 @@ package org.apache.directory.server.ldap; +import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory; +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.SchemaBinaryAttributeDetector; import org.apache.directory.api.ldap.model.exception.ResponseCarryingMessageException; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.message.ExtendedRequest; @@ -29,11 +34,6 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.message.ResultResponse; import org.apache.directory.api.ldap.model.message.ResultResponseRequest; import org.apache.directory.api.ldap.model.message.extended.NoticeOfDisconnect; -import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory; -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.SchemaBinaryAttributeDetector; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.service.IoHandler; import org.apache.mina.core.session.IoSession; Modified: directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original) +++ directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Thu Dec 20 00:41:14 2012 @@ -36,6 +36,7 @@ import java.util.Set; import javax.net.ssl.KeyManagerFactory; +import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory; import org.apache.directory.api.ldap.model.constants.SaslQoP; import org.apache.directory.api.ldap.model.exception.LdapConfigurationException; import org.apache.directory.api.ldap.model.message.AbandonRequest; @@ -99,7 +100,6 @@ import org.apache.directory.server.proto import org.apache.directory.server.protocol.shared.transport.TcpTransport; import org.apache.directory.server.protocol.shared.transport.Transport; import org.apache.directory.server.protocol.shared.transport.UdpTransport; -import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory; import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder; import org.apache.mina.core.filterchain.IoFilterChainBuilder; import org.apache.mina.core.future.WriteFuture; Modified: directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java (original) +++ directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java Thu Dec 20 00:41:14 2012 @@ -30,6 +30,8 @@ import java.util.Set; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; +import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator; +import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory; import org.apache.directory.api.ldap.model.message.ExtendedRequest; import org.apache.directory.api.ldap.model.message.ExtendedResponse; import org.apache.directory.api.ldap.model.message.ExtendedResponseImpl; @@ -41,8 +43,6 @@ import org.apache.directory.server.i18n. import org.apache.directory.server.ldap.ExtendedOperationHandler; import org.apache.directory.server.ldap.LdapServer; import org.apache.directory.server.ldap.LdapSession; -import org.apache.directory.shared.ldap.codec.api.ExtendedResponseDecorator; -import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory; import org.apache.mina.core.filterchain.IoFilterChain; import org.apache.mina.filter.ssl.SslFilter; import org.slf4j.Logger; Modified: directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java (original) +++ directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java Thu Dec 20 00:41:14 2012 @@ -28,6 +28,7 @@ import java.util.List; import java.util.Set; import org.apache.commons.lang.SerializationUtils; +import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory; import org.apache.directory.api.ldap.model.entry.Entry; import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.server.core.api.sp.StoredProcEngine; @@ -37,7 +38,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.ldap.ExtendedOperationHandler; import org.apache.directory.server.ldap.LdapServer; import org.apache.directory.server.ldap.LdapSession; -import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory; import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequest; import org.apache.directory.shared.ldap.extras.extended.StoredProcedureResponse; import org.apache.directory.shared.ldap.sp.LdapContextParameter; Modified: directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java (original) +++ directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java Thu Dec 20 00:41:14 2012 @@ -29,6 +29,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; import org.apache.directory.api.ldap.model.constants.SchemaConstants; import org.apache.directory.api.ldap.model.cursor.CursorClosedException; import org.apache.directory.api.ldap.model.entry.Attribute; @@ -78,7 +79,6 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.handlers.SearchTimeLimitingMonitor; import org.apache.directory.server.ldap.handlers.controls.PagedSearchContext; import org.apache.directory.server.ldap.replication.provider.ReplicationRequestHandler; -import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java (original) +++ directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java Thu Dec 20 00:41:14 2012 @@ -27,6 +27,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.collections.map.LRUMap; +import org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITDecorator; import org.apache.directory.api.ldap.model.constants.SchemaConstants; import org.apache.directory.api.ldap.model.csn.Csn; import org.apache.directory.api.ldap.model.entry.Attribute; @@ -77,7 +78,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.ldap.LdapProtocolUtils; import org.apache.directory.server.ldap.replication.ReplicationConsumerConfig; import org.apache.directory.server.ldap.replication.SyncReplConfiguration; -import org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITDecorator; import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue; import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue; import org.apache.directory.shared.ldap.extras.controls.SyncModifyDnType; Modified: directory/apacheds/branches/apacheds-refact/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java (original) +++ directory/apacheds/branches/apacheds-refact/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java Thu Dec 20 00:41:14 2012 @@ -35,6 +35,7 @@ import javax.naming.ldap.InitialLdapCont import javax.naming.ldap.LdapContext; import org.apache.commons.io.FileUtils; +import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory; import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.server.annotations.CreateLdapServer; @@ -48,7 +49,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.partition.Partition; import org.apache.directory.server.core.factory.DSAnnotationProcessor; import org.apache.directory.server.ldap.LdapServer; -import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory; import org.apache.directory.shared.ldap.util.JndiUtils; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java Thu Dec 20 00:41:14 2012 @@ -27,6 +27,7 @@ import static org.junit.Assert.assertNot import java.io.ByteArrayOutputStream; import java.io.InputStream; +import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.ldap.client.api.LdapNetworkConnection; import org.apache.directory.server.annotations.CreateLdapServer; @@ -38,7 +39,6 @@ import org.apache.directory.shared.dsmlv import org.apache.directory.shared.dsmlv2.engine.Dsmlv2Engine; import org.apache.directory.shared.dsmlv2.reponse.BatchResponseDsml; import org.apache.directory.shared.dsmlv2.reponse.SearchResponse; -import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java Thu Dec 20 00:41:14 2012 @@ -37,6 +37,10 @@ import javax.naming.directory.InitialDir import org.apache.commons.lang.ArrayUtils; import org.apache.commons.net.SocketClient; +import org.apache.directory.api.ldap.codec.api.LdapDecoder; +import org.apache.directory.api.ldap.codec.api.LdapEncoder; +import org.apache.directory.api.ldap.codec.api.LdapMessageContainer; +import org.apache.directory.api.ldap.codec.api.MessageDecorator; import org.apache.directory.api.ldap.model.constants.SaslQoP; import org.apache.directory.api.ldap.model.constants.SchemaConstants; import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms; @@ -76,10 +80,6 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler; import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler; import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler; -import org.apache.directory.shared.ldap.codec.api.LdapDecoder; -import org.apache.directory.shared.ldap.codec.api.LdapEncoder; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.api.MessageDecorator; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java Thu Dec 20 00:41:14 2012 @@ -39,6 +39,9 @@ import javax.naming.ldap.LdapContext; import javax.naming.ldap.PagedResultsResponseControl; import org.apache.directory.api.asn1.EncoderException; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory; +import org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; import org.apache.directory.api.ldap.model.cursor.EntryCursor; import org.apache.directory.api.ldap.model.entry.Entry; import org.apache.directory.api.ldap.model.message.Control; @@ -59,9 +62,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.ldap.LdapServer; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory; -import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; import org.apache.directory.shared.ldap.util.JndiUtils; import org.junit.Rule; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java Thu Dec 20 00:41:14 2012 @@ -43,6 +43,10 @@ import javax.naming.event.ObjectChangeLi import javax.naming.ldap.HasControls; import javax.naming.ldap.LdapContext; +import org.apache.directory.api.ldap.codec.api.CodecControl; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeDecorator; +import org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchDecorator; import org.apache.directory.api.ldap.model.exception.LdapException; import org.apache.directory.api.ldap.model.ldif.LdifUtils; import org.apache.directory.api.ldap.model.message.Control; @@ -58,10 +62,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.event.RegistrationEntry; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.codec.api.CodecControl; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeDecorator; -import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchDecorator; import org.apache.directory.shared.ldap.util.JndiUtils; import org.junit.After; import org.junit.Rule; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java Thu Dec 20 00:41:14 2012 @@ -32,6 +32,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.directory.api.ldap.codec.api.LdapApiService; +import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory; import org.apache.directory.api.ldap.model.constants.SchemaConstants; import org.apache.directory.api.ldap.model.cursor.EntryCursor; import org.apache.directory.api.ldap.model.entry.Attribute; @@ -72,8 +74,6 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.replication.SyncReplConfiguration; import org.apache.directory.server.ldap.replication.consumer.ReplicationConsumer; import org.apache.directory.server.ldap.replication.consumer.ReplicationStatusEnum; -import org.apache.directory.shared.ldap.codec.api.LdapApiService; -import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory; import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue; import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue; import org.apache.directory.shared.ldap.extras.controls.SyncModifyDnType; Modified: directory/apacheds/branches/apacheds-refact/service/ApacheDS.launch URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/service/ApacheDS.launch?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/service/ApacheDS.launch (original) +++ directory/apacheds/branches/apacheds-refact/service/ApacheDS.launch Thu Dec 20 00:41:14 2012 @@ -12,5 +12,5 @@ - + Modified: directory/apacheds/branches/apacheds-refact/service/apacheds.bat URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/service/apacheds.bat?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/service/apacheds.bat (original) +++ directory/apacheds/branches/apacheds-refact/service/apacheds.bat Thu Dec 20 00:41:14 2012 @@ -36,7 +36,7 @@ IF NOT exist target/apacheds-service-2.0 md target/instance/partitions md target/instance/log -set DEF_CTRLS="-Ddefault.controls=org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory" +set DEF_CTRLS="-Ddefault.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory" set EXT_CTRLS="-Dextra.controls=org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" Modified: directory/apacheds/branches/apacheds-refact/service/apacheds.sh URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/service/apacheds.sh?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/service/apacheds.sh (original) +++ directory/apacheds/branches/apacheds-refact/service/apacheds.sh Thu Dec 20 00:41:14 2012 @@ -40,7 +40,7 @@ if [ "$1" = -debug ] ; then JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8008 -Xnoagent -Djava.compiler=NONE" fi -DEF_CTRLS="-Ddefault.controls=org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory" +DEF_CTRLS="-Ddefault.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory" EXT_CTRLS="-Dextra.controls=org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" Modified: directory/apacheds/branches/apacheds-refact/service/src/test/java/org/apache/directory/server/UberJarMainTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/service/src/test/java/org/apache/directory/server/UberJarMainTest.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/service/src/test/java/org/apache/directory/server/UberJarMainTest.java (original) +++ directory/apacheds/branches/apacheds-refact/service/src/test/java/org/apache/directory/server/UberJarMainTest.java Thu Dec 20 00:41:14 2012 @@ -26,13 +26,13 @@ import java.io.File; import java.util.Calendar; import org.apache.commons.io.FileUtils; +import org.apache.directory.api.ldap.codec.api.SchemaBinaryAttributeDetector; import org.apache.directory.api.ldap.model.entry.Entry; import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.ldap.client.api.LdapConnectionConfig; import org.apache.directory.ldap.client.api.LdapNetworkConnection; import org.apache.directory.server.constants.ServerDNConstants; import org.apache.directory.server.core.api.partition.PartitionNexus; -import org.apache.directory.shared.ldap.codec.api.SchemaBinaryAttributeDetector; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java?rev=1424249&r1=1424248&r2=1424249&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java (original) +++ directory/apacheds/branches/apacheds-refact/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java Thu Dec 20 00:41:14 2012 @@ -83,12 +83,12 @@ public class FrameworkRunner extends Blo { // Load the extension points System.setProperty( StandaloneLdapApiService.DEFAULT_CONTROLS_LIST, - "org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory," + - "org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITFactory," + - "org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeFactory," + - "org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsFactory," + - "org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory," + - "org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory" ); + "org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory," + + "org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory," + + "org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory," + + "org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory," + + "org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory," + + "org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory" ); System.setProperty( StandaloneLdapApiService.EXTRA_CONTROLS_LIST, "org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory," +