Fixed apacheds after havng renamed the shared modules
git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/branches/apacheds-refact@1424665 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core-annotations/pom.xml b/core-annotations/pom.xml
index 63ff67c..4d821ad 100644
--- a/core-annotations/pom.xml
+++ b/core-annotations/pom.xml
@@ -80,18 +80,18 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
+ <artifactId>api-ldap-codec-standalone</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
diff --git a/core-api/pom.xml b/core-api/pom.xml
index c3b2e6b..d60f7ef 100644
--- a/core-api/pom.xml
+++ b/core-api/pom.xml
@@ -69,32 +69,32 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
+ <artifactId>api-ldap-client-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>api-ldap-codec-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
+ <artifactId>api-ldap-extras-aci</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
+ <artifactId>api-ldap-extras-util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
diff --git a/core-avl/pom.xml b/core-avl/pom.xml
index f559020..21173f4 100644
--- a/core-avl/pom.xml
+++ b/core-avl/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
diff --git a/core-integ/pom.xml b/core-integ/pom.xml
index 7005db2..20ea2f8 100644
--- a/core-integ/pom.xml
+++ b/core-integ/pom.xml
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
+ <artifactId>api-ldap-codec-standalone</artifactId>
<scope>test</scope>
</dependency>
@@ -107,13 +107,13 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
+ <artifactId>api-ldap-client-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
+ <artifactId>api-ldap-extras-codec</artifactId>
<scope>provided</scope>
</dependency>
@@ -124,22 +124,22 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-sp</artifactId>
+ <artifactId>api-ldap-extras-sp</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>api-ldap-codec-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
@@ -218,7 +218,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
+ <artifactId>api-ldap-extras-codec</artifactId>
<version>${org.apache.directory.api.version}</version>
<outputDirectory>${codec.plugin.directory}</outputDirectory>
</artifactItem>
@@ -330,7 +330,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
+ <artifactId>api-ldap-extras-codec</artifactId>
<version>${org.apache.directory.api.version}</version>
<outputDirectory>${codec.plugin.directory}</outputDirectory>
</artifactItem>
diff --git a/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyIT.java b/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyIT.java
index adf5853..25c2c90 100644
--- a/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyIT.java
@@ -20,14 +20,14 @@
package org.apache.directory.server.core.authn.ppolicy;
+import static org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.INSUFFICIENT_PASSWORD_QUALITY;
+import static org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.PASSWORD_EXPIRED;
+import static org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.PASSWORD_IN_HISTORY;
+import static org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.PASSWORD_TOO_SHORT;
+import static org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.PASSWORD_TOO_YOUNG;
import static org.apache.directory.api.ldap.model.constants.PasswordPolicySchemaConstants.*;
import static org.apache.directory.server.core.integ.IntegrationUtils.getAdminNetworkConnection;
import static org.apache.directory.server.core.integ.IntegrationUtils.getNetworkConnectionAs;
-import static org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.INSUFFICIENT_PASSWORD_QUALITY;
-import static org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.PASSWORD_EXPIRED;
-import static org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.PASSWORD_IN_HISTORY;
-import static org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.PASSWORD_TOO_SHORT;
-import static org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.PASSWORD_TOO_YOUNG;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -37,6 +37,8 @@
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyImpl;
import org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator;
import org.apache.directory.api.ldap.model.constants.LdapSecurityConstants;
import org.apache.directory.api.ldap.model.constants.PasswordPolicySchemaConstants;
@@ -70,8 +72,6 @@
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.extras.controls.ppolicy.PasswordPolicy;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyImpl;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/core-jndi/pom.xml b/core-jndi/pom.xml
index 5f95bd5..97f2371 100644
--- a/core-jndi/pom.xml
+++ b/core-jndi/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
+ <artifactId>api-ldap-extras-codec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java b/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
index fc324e6..d57279a 100644
--- a/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
+++ b/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
@@ -54,6 +54,13 @@
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.extras.controls.SyncDoneValue;
+import org.apache.directory.api.ldap.extras.controls.SyncInfoValue;
+import org.apache.directory.api.ldap.extras.controls.SyncRequestValue;
+import org.apache.directory.api.ldap.extras.controls.SyncStateValue;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyImpl;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyResponseImpl;
import org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueDecorator;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueDecorator;
@@ -115,13 +122,6 @@
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.extras.controls.SyncDoneValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
-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.PasswordPolicyResponseImpl;
/**
diff --git a/core-shared/pom.xml b/core-shared/pom.xml
index 65264ae..7f05f63 100644
--- a/core-shared/pom.xml
+++ b/core-shared/pom.xml
@@ -54,22 +54,22 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>api-ldap-codec-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-codec-api</artifactId>
+ <artifactId>api-ldap-extras-codec-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
+ <artifactId>api-ldap-extras-util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
diff --git a/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java b/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
index 8280f70..a848788 100644
--- a/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
+++ b/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.Set;
+import org.apache.directory.api.ldap.extras.controls.SyncRequestValue;
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.BinaryValue;
@@ -75,7 +76,6 @@
import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.api.interceptor.context.UnbindOperationContext;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
/**
diff --git a/core/pom.xml b/core/pom.xml
index 35a0d0f..fcbec48 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -131,22 +131,22 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>api-ldap-codec-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
+ <artifactId>api-ldap-extras-util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
diff --git a/http-directory-bridge/pom.xml b/http-directory-bridge/pom.xml
index f87c612..4757f09 100644
--- a/http-directory-bridge/pom.xml
+++ b/http-directory-bridge/pom.xml
@@ -38,12 +38,12 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
+ <artifactId>api-ldap-client-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
</dependencies>
diff --git a/http-integration/pom.xml b/http-integration/pom.xml
index dc4cb6c..9aa36bb 100644
--- a/http-integration/pom.xml
+++ b/http-integration/pom.xml
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
diff --git a/interceptor-kerberos/pom.xml b/interceptor-kerberos/pom.xml
index 993bed9..83ce4d7 100644
--- a/interceptor-kerberos/pom.xml
+++ b/interceptor-kerberos/pom.xml
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
diff --git a/interceptors/admin/pom.xml b/interceptors/admin/pom.xml
index c806f6b..8585dd0 100644
--- a/interceptors/admin/pom.xml
+++ b/interceptors/admin/pom.xml
@@ -50,12 +50,12 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
+ <artifactId>api-ldap-extras-util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
diff --git a/interceptors/authn/pom.xml b/interceptors/authn/pom.xml
index 4928638..d0368e8 100644
--- a/interceptors/authn/pom.xml
+++ b/interceptors/authn/pom.xml
@@ -69,27 +69,27 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
+ <artifactId>api-ldap-client-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
+ <artifactId>api-ldap-extras-codec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-codec-api</artifactId>
+ <artifactId>api-ldap-extras-codec-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
diff --git a/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java b/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java
index c354238..e09079b 100644
--- a/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java
+++ b/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java
@@ -20,14 +20,14 @@
package org.apache.directory.server.core.authn;
+import static org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.ACCOUNT_LOCKED;
+import static org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.PASSWORD_EXPIRED;
import static org.apache.directory.api.ldap.model.constants.PasswordPolicySchemaConstants.PWD_ACCOUNT_LOCKED_TIME_AT;
import static org.apache.directory.api.ldap.model.constants.PasswordPolicySchemaConstants.PWD_CHANGED_TIME_AT;
import static org.apache.directory.api.ldap.model.constants.PasswordPolicySchemaConstants.PWD_END_TIME_AT;
import static org.apache.directory.api.ldap.model.constants.PasswordPolicySchemaConstants.PWD_GRACE_USE_TIME_AT;
import static org.apache.directory.api.ldap.model.constants.PasswordPolicySchemaConstants.PWD_LAST_SUCCESS_AT;
import static org.apache.directory.api.ldap.model.constants.PasswordPolicySchemaConstants.PWD_START_TIME_AT;
-import static org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.ACCOUNT_LOCKED;
-import static org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.PASSWORD_EXPIRED;
import java.util.Collections;
import java.util.Date;
diff --git a/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java b/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
index 7cb2e47..5064101 100644
--- a/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
+++ b/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
@@ -20,6 +20,8 @@
package org.apache.directory.server.core.authn;
+import static org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.INSUFFICIENT_PASSWORD_QUALITY;
+import static org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.PASSWORD_TOO_SHORT;
import static org.apache.directory.api.ldap.model.constants.PasswordPolicySchemaConstants.PWD_ACCOUNT_LOCKED_TIME_AT;
import static org.apache.directory.api.ldap.model.constants.PasswordPolicySchemaConstants.PWD_CHANGED_TIME_AT;
import static org.apache.directory.api.ldap.model.constants.PasswordPolicySchemaConstants.PWD_FAILURE_TIME_AT;
@@ -31,8 +33,6 @@
import static org.apache.directory.api.ldap.model.entry.ModificationOperation.ADD_ATTRIBUTE;
import static org.apache.directory.api.ldap.model.entry.ModificationOperation.REMOVE_ATTRIBUTE;
import static org.apache.directory.api.ldap.model.entry.ModificationOperation.REPLACE_ATTRIBUTE;
-import static org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.INSUFFICIENT_PASSWORD_QUALITY;
-import static org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.PASSWORD_TOO_SHORT;
import java.util.ArrayList;
import java.util.Arrays;
@@ -45,6 +45,8 @@
import java.util.Map;
import java.util.Set;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum;
import org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator;
import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
import org.apache.directory.api.ldap.model.constants.LdapSecurityConstants;
@@ -95,8 +97,6 @@
import org.apache.directory.server.core.authn.ppolicy.PpolicyConfigContainer;
import org.apache.directory.server.core.shared.DefaultCoreSession;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/interceptors/authz/pom.xml b/interceptors/authz/pom.xml
index 64a6176..169cd7b 100644
--- a/interceptors/authz/pom.xml
+++ b/interceptors/authz/pom.xml
@@ -59,17 +59,17 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
+ <artifactId>api-ldap-extras-aci</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
diff --git a/interceptors/changelog/pom.xml b/interceptors/changelog/pom.xml
index 1c6f2b3..10cd6cb 100644
--- a/interceptors/changelog/pom.xml
+++ b/interceptors/changelog/pom.xml
@@ -59,12 +59,12 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
diff --git a/interceptors/collective/pom.xml b/interceptors/collective/pom.xml
index c8ac37a..6a2ab53 100644
--- a/interceptors/collective/pom.xml
+++ b/interceptors/collective/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
</dependencies>
diff --git a/interceptors/event/pom.xml b/interceptors/event/pom.xml
index b33c8cb..bebb338 100644
--- a/interceptors/event/pom.xml
+++ b/interceptors/event/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
</dependencies>
diff --git a/interceptors/exception/pom.xml b/interceptors/exception/pom.xml
index 6f11d73..a88a282 100644
--- a/interceptors/exception/pom.xml
+++ b/interceptors/exception/pom.xml
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
</dependencies>
diff --git a/interceptors/hash/pom.xml b/interceptors/hash/pom.xml
index 28688c9..95aceae 100644
--- a/interceptors/hash/pom.xml
+++ b/interceptors/hash/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
+ <artifactId>api-ldap-client-api</artifactId>
</dependency>
<dependency>
@@ -86,43 +86,43 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
+ <artifactId>api-ldap-codec-standalone</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>api-ldap-codec-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
+ <artifactId>api-ldap-extras-aci</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
+ <artifactId>api-ldap-extras-trigger</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
+ <artifactId>api-ldap-extras-util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<!--dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-util</artifactId>
+ <artifactId>api-util</artifactId>
</dependency-->
<dependency>
@@ -132,7 +132,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
+ <artifactId>api-ldap-extras-codec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/interceptors/journal/pom.xml b/interceptors/journal/pom.xml
index 9a30a34..2bb196d 100644
--- a/interceptors/journal/pom.xml
+++ b/interceptors/journal/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
</dependencies>
diff --git a/interceptors/logger/pom.xml b/interceptors/logger/pom.xml
index d61bfde..ed98bb2 100644
--- a/interceptors/logger/pom.xml
+++ b/interceptors/logger/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
+ <artifactId>api-ldap-client-api</artifactId>
</dependency>
<dependency>
@@ -81,38 +81,38 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
+ <artifactId>api-ldap-codec-standalone</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>api-ldap-codec-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
+ <artifactId>api-ldap-extras-aci</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
+ <artifactId>api-ldap-extras-trigger</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
+ <artifactId>api-ldap-extras-util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
+ <artifactId>api-ldap-extras-codec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/interceptors/normalization/pom.xml b/interceptors/normalization/pom.xml
index ed0a5f9..5a33a9f 100644
--- a/interceptors/normalization/pom.xml
+++ b/interceptors/normalization/pom.xml
@@ -54,12 +54,12 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
diff --git a/interceptors/operational/pom.xml b/interceptors/operational/pom.xml
index bb8e6d3..3fc7c9d 100644
--- a/interceptors/operational/pom.xml
+++ b/interceptors/operational/pom.xml
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
diff --git a/interceptors/referral/pom.xml b/interceptors/referral/pom.xml
index eb70925..915a2c6 100644
--- a/interceptors/referral/pom.xml
+++ b/interceptors/referral/pom.xml
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
diff --git a/interceptors/schema/pom.xml b/interceptors/schema/pom.xml
index af8a147..749e95f 100644
--- a/interceptors/schema/pom.xml
+++ b/interceptors/schema/pom.xml
@@ -64,12 +64,12 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
diff --git a/interceptors/subtree/pom.xml b/interceptors/subtree/pom.xml
index 8d7472d..754b0c3 100644
--- a/interceptors/subtree/pom.xml
+++ b/interceptors/subtree/pom.xml
@@ -59,17 +59,17 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>api-ldap-codec-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
diff --git a/interceptors/trigger/pom.xml b/interceptors/trigger/pom.xml
index f95b7ca..32d649f 100644
--- a/interceptors/trigger/pom.xml
+++ b/interceptors/trigger/pom.xml
@@ -53,12 +53,12 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
+ <artifactId>api-ldap-extras-trigger</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
</dependencies>
diff --git a/jdbm-partition/pom.xml b/jdbm-partition/pom.xml
index 9e974ff..16564a6 100644
--- a/jdbm-partition/pom.xml
+++ b/jdbm-partition/pom.xml
@@ -92,12 +92,12 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
diff --git a/kerberos-codec/pom.xml b/kerberos-codec/pom.xml
index f202da0..7e47757 100644
--- a/kerberos-codec/pom.xml
+++ b/kerberos-codec/pom.xml
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
diff --git a/kerberos-test/pom.xml b/kerberos-test/pom.xml
index ba2c9ae..5764fbc 100644
--- a/kerberos-test/pom.xml
+++ b/kerberos-test/pom.xml
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
+ <artifactId>api-ldap-client-api</artifactId>
</dependency>
<dependency>
diff --git a/ldap-client-test/pom.xml b/ldap-client-test/pom.xml
index f3c1b84..84d1577 100644
--- a/ldap-client-test/pom.xml
+++ b/ldap-client-test/pom.xml
@@ -68,12 +68,12 @@
<!-- Shared dependencies -->
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
@@ -84,7 +84,7 @@
<!-- Other dependencies -->
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
+ <artifactId>api-ldap-client-api</artifactId>
</dependency>
<dependency>
diff --git a/ldif-partition/pom.xml b/ldif-partition/pom.xml
index eae4040..6acd8bc 100644
--- a/ldif-partition/pom.xml
+++ b/ldif-partition/pom.xml
@@ -61,12 +61,12 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 971c7d1..a151d3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -874,7 +874,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
+ <artifactId>api-ldap-client-api</artifactId>
<version>${org.apache.directory.api.version}</version>
</dependency>
@@ -892,19 +892,19 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-all</artifactId>
+ <artifactId>api-all</artifactId>
<version>${org.apache.directory.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-dsml-parser</artifactId>
+ <artifactId>api-dsml-parser</artifactId>
<version>${org.apache.directory.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-dsml-engine</artifactId>
+ <artifactId>api-dsml-engine</artifactId>
<version>${org.apache.directory.api.version}</version>
</dependency>
@@ -916,61 +916,61 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>api-ldap-codec-core</artifactId>
<version>${org.apache.directory.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
+ <artifactId>api-ldap-codec-standalone</artifactId>
<version>${org.apache.directory.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
+ <artifactId>api-ldap-extras-aci</artifactId>
<version>${org.apache.directory.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
+ <artifactId>api-ldap-extras-codec</artifactId>
<version>${org.apache.directory.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-codec-api</artifactId>
+ <artifactId>api-ldap-extras-codec-api</artifactId>
<version>${org.apache.directory.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-sp</artifactId>
+ <artifactId>api-ldap-extras-sp</artifactId>
<version>${org.apache.directory.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
+ <artifactId>api-ldap-extras-trigger</artifactId>
<version>${org.apache.directory.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
+ <artifactId>api-ldap-extras-util</artifactId>
<version>${org.apache.directory.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
<version>${org.apache.directory.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
<version>${org.apache.directory.api.version}</version>
</dependency>
diff --git a/protocol-dhcp/pom.xml b/protocol-dhcp/pom.xml
index 1fd4a46..bf40b84 100644
--- a/protocol-dhcp/pom.xml
+++ b/protocol-dhcp/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
diff --git a/protocol-dns/pom.xml b/protocol-dns/pom.xml
index 8cb8738..f34223c 100644
--- a/protocol-dns/pom.xml
+++ b/protocol-dns/pom.xml
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
diff --git a/protocol-kerberos/pom.xml b/protocol-kerberos/pom.xml
index a6c18eb..5f686d3 100644
--- a/protocol-kerberos/pom.xml
+++ b/protocol-kerberos/pom.xml
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
diff --git a/protocol-ldap/pom.xml b/protocol-ldap/pom.xml
index f097b3c..85b5c0c 100644
--- a/protocol-ldap/pom.xml
+++ b/protocol-ldap/pom.xml
@@ -86,48 +86,48 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
+ <artifactId>api-ldap-client-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
+ <artifactId>api-ldap-codec-standalone</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-codec-api</artifactId>
+ <artifactId>api-ldap-extras-codec-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
+ <artifactId>api-ldap-extras-codec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-sp</artifactId>
+ <artifactId>api-ldap-extras-sp</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
+ <artifactId>api-ldap-extras-util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>api-ldap-codec-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java
index 01d550b..7a86a0f 100644
--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java
+++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java
@@ -24,6 +24,8 @@
import java.util.HashSet;
import java.util.Set;
+import org.apache.directory.api.ldap.extras.extended.CertGenerationRequest;
+import org.apache.directory.api.ldap.extras.extended.CertGenerationResponse;
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.entry.ClonedServerEntry;
@@ -31,8 +33,6 @@
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.extras.extended.CertGenerationRequest;
-import org.apache.directory.shared.ldap.extras.extended.CertGenerationResponse;
/**
diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
index d880d95..3997ffd 100644
--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
+++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
@@ -27,17 +27,17 @@
import java.util.List;
import java.util.Set;
+import org.apache.directory.api.ldap.extras.extended.GracefulDisconnectResponse;
+import org.apache.directory.api.ldap.extras.extended.GracefulDisconnectResponseImpl;
+import org.apache.directory.api.ldap.extras.extended.GracefulShutdownRequest;
+import org.apache.directory.api.ldap.extras.extended.GracefulShutdownResponse;
+import org.apache.directory.api.ldap.extras.extended.GracefulShutdownResponseImpl;
import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
import org.apache.directory.api.ldap.model.message.extended.NoticeOfDisconnect;
import org.apache.directory.server.i18n.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.extras.extended.GracefulDisconnectResponseImpl;
-import org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponse;
-import org.apache.directory.shared.ldap.extras.extended.GracefulShutdownResponseImpl;
-import org.apache.directory.shared.ldap.extras.extended.GracefulShutdownRequest;
-import org.apache.directory.shared.ldap.extras.extended.GracefulShutdownResponse;
import org.apache.mina.core.future.WriteFuture;
import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.core.session.IoSession;
diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
index 8695380..ec881d4 100644
--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
+++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
@@ -29,6 +29,8 @@
import org.apache.commons.lang.SerializationUtils;
import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
+import org.apache.directory.api.ldap.extras.extended.StoredProcedureRequest;
+import org.apache.directory.api.ldap.extras.extended.StoredProcedureResponse;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.ldap.sp.LdapContextParameter;
@@ -39,8 +41,6 @@
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.extras.extended.StoredProcedureRequest;
-import org.apache.directory.shared.ldap.extras.extended.StoredProcedureResponse;
/**
diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java
index d86141a..6453ff4 100644
--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java
+++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java
@@ -30,6 +30,7 @@
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator;
+import org.apache.directory.api.ldap.extras.controls.SyncRequestValue;
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;
@@ -79,7 +80,6 @@
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.extras.controls.SyncRequestValue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
index 188f720..65edfbb 100644
--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
+++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
@@ -28,6 +28,13 @@
import org.apache.commons.collections.map.LRUMap;
import org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITDecorator;
+import org.apache.directory.api.ldap.extras.controls.SyncDoneValue;
+import org.apache.directory.api.ldap.extras.controls.SyncInfoValue;
+import org.apache.directory.api.ldap.extras.controls.SyncModifyDnType;
+import org.apache.directory.api.ldap.extras.controls.SyncRequestValue;
+import org.apache.directory.api.ldap.extras.controls.SyncStateTypeEnum;
+import org.apache.directory.api.ldap.extras.controls.SyncStateValue;
+import org.apache.directory.api.ldap.extras.controls.SynchronizationModeEnum;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueDecorator;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueDecorator;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
@@ -80,13 +87,6 @@
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.extras.controls.SyncDoneValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncModifyDnType;
-import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateTypeEnum;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
-import org.apache.directory.shared.ldap.extras.controls.SynchronizationModeEnum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java
index 16df133..e9cb135 100644
--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java
+++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java
@@ -37,6 +37,13 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.directory.api.ldap.extras.controls.SyncDoneValue;
+import org.apache.directory.api.ldap.extras.controls.SyncInfoValue;
+import org.apache.directory.api.ldap.extras.controls.SyncRequestValue;
+import org.apache.directory.api.ldap.extras.controls.SyncStateTypeEnum;
+import org.apache.directory.api.ldap.extras.controls.SyncStateValue;
+import org.apache.directory.api.ldap.extras.controls.SynchronizationInfoEnum;
+import org.apache.directory.api.ldap.extras.controls.SynchronizationModeEnum;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueDecorator;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueDecorator;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueDecorator;
@@ -88,13 +95,6 @@
import org.apache.directory.server.ldap.handlers.SearchAbandonListener;
import org.apache.directory.server.ldap.handlers.SearchTimeLimitingMonitor;
import org.apache.directory.server.ldap.replication.ReplicaEventMessage;
-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;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateTypeEnum;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
-import org.apache.directory.shared.ldap.extras.controls.SynchronizationInfoEnum;
-import org.apache.directory.shared.ldap.extras.controls.SynchronizationModeEnum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplSearchListener.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplSearchListener.java
index 8a980a0..664b54c 100644
--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplSearchListener.java
+++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplSearchListener.java
@@ -20,6 +20,8 @@
package org.apache.directory.server.ldap.replication.provider;
+import org.apache.directory.api.ldap.extras.controls.SyncStateTypeEnum;
+import org.apache.directory.api.ldap.extras.controls.SyncStateValue;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueDecorator;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.Entry;
@@ -47,8 +49,6 @@
import org.apache.directory.server.ldap.LdapProtocolUtils;
import org.apache.directory.server.ldap.LdapSession;
import org.apache.directory.server.ldap.replication.ReplicaEventMessage;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateTypeEnum;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
import org.apache.mina.core.future.WriteFuture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/protocol-shared/pom.xml b/protocol-shared/pom.xml
index 066650e..c8f2383 100644
--- a/protocol-shared/pom.xml
+++ b/protocol-shared/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
</dependencies>
diff --git a/server-annotations/pom.xml b/server-annotations/pom.xml
index 49d1507..8317e5c 100644
--- a/server-annotations/pom.xml
+++ b/server-annotations/pom.xml
@@ -69,18 +69,18 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>api-ldap-codec-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
+ <artifactId>api-ldap-codec-standalone</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
diff --git a/server-config/pom.xml b/server-config/pom.xml
index b5cca24..58a21de 100644
--- a/server-config/pom.xml
+++ b/server-config/pom.xml
@@ -53,12 +53,12 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
diff --git a/server-integ/pom.xml b/server-integ/pom.xml
index d125ec0..8d6cdd1 100644
--- a/server-integ/pom.xml
+++ b/server-integ/pom.xml
@@ -106,22 +106,22 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-sp</artifactId>
+ <artifactId>api-ldap-extras-sp</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>api-ldap-codec-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
+ <artifactId>api-ldap-extras-codec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
@@ -154,18 +154,18 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
+ <artifactId>api-ldap-codec-standalone</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
+ <artifactId>api-ldap-client-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-dsml-engine</artifactId>
+ <artifactId>api-dsml-engine</artifactId>
</dependency>
</dependencies>
@@ -203,7 +203,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
+ <artifactId>api-ldap-extras-codec</artifactId>
<outputDirectory>${codec.plugin.directory}</outputDirectory>
</artifactItem>
</artifactItems>
diff --git a/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java b/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java
index ce1c64e..29c5e2f 100644
--- a/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java
+++ b/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java
@@ -34,6 +34,13 @@
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
+import org.apache.directory.api.ldap.extras.controls.SyncDoneValue;
+import org.apache.directory.api.ldap.extras.controls.SyncInfoValue;
+import org.apache.directory.api.ldap.extras.controls.SyncModifyDnType;
+import org.apache.directory.api.ldap.extras.controls.SyncRequestValue;
+import org.apache.directory.api.ldap.extras.controls.SyncStateTypeEnum;
+import org.apache.directory.api.ldap.extras.controls.SyncStateValue;
+import org.apache.directory.api.ldap.extras.controls.SynchronizationModeEnum;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueDecorator;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueDecorator;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
@@ -76,13 +83,6 @@
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.extras.controls.SyncDoneValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncModifyDnType;
-import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateTypeEnum;
-import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
-import org.apache.directory.shared.ldap.extras.controls.SynchronizationModeEnum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/server-jndi/pom.xml b/server-jndi/pom.xml
index 053862e..f9f0630 100644
--- a/server-jndi/pom.xml
+++ b/server-jndi/pom.xml
@@ -77,12 +77,12 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
diff --git a/server-replication/pom.xml b/server-replication/pom.xml
index cc4297c..29c0152 100644
--- a/server-replication/pom.xml
+++ b/server-replication/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
</dependencies>
diff --git a/service-builder/pom.xml b/service-builder/pom.xml
index 2baf325..66bcfce 100644
--- a/service-builder/pom.xml
+++ b/service-builder/pom.xml
@@ -128,12 +128,12 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
diff --git a/service/log4j.properties b/service/log4j.properties
index f4b6bc3..570504c 100644
--- a/service/log4j.properties
+++ b/service/log4j.properties
@@ -32,8 +32,8 @@
log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
# with these we'll not get innundated when switching to DEBUG
-log4j.logger.org.apache.directory.shared.ldap.name=FATAL
-log4j.logger.org.apache.directory.shared.codec=FATAL
+log4j.logger.org.apache.directory.api.ldap.name=FATAL
+log4j.logger.org.apache.directory.api.codec=FATAL
log4j.logger.org.apache.directory.api.asn1=FATAL
log4j.logger.org.apache.directory.server.schema.registries=FATAL
diff --git a/service/pom.xml b/service/pom.xml
index b79021e..594e898 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -51,17 +51,17 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
+ <artifactId>api-ldap-codec-standalone</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
diff --git a/test-framework/pom.xml b/test-framework/pom.xml
index b854758..1a21b40 100644
--- a/test-framework/pom.xml
+++ b/test-framework/pom.xml
@@ -70,12 +70,12 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
+ <artifactId>api-ldap-codec-standalone</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
diff --git a/xdbm-partition/pom.xml b/xdbm-partition/pom.xml
index 8772e69..d2bf73a 100644
--- a/xdbm-partition/pom.xml
+++ b/xdbm-partition/pom.xml
@@ -71,12 +71,12 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>api-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>api-ldap-schema-data</artifactId>
</dependency>
<dependency>
