directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1424665 [1/2] - in /directory/apacheds/branches/apacheds-refact: ./ core-annotations/ core-api/ core-avl/ core-integ/ core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/ core-jndi/ core-jndi/src/main/java/org/apache/di...
Date Thu, 20 Dec 2012 20:12:33 GMT
Author: elecharny
Date: Thu Dec 20 20:12:31 2012
New Revision: 1424665

URL: http://svn.apache.org/viewvc?rev=1424665&view=rev
Log:
Fixed apacheds after havng renamed the shared modules

Modified:
    directory/apacheds/branches/apacheds-refact/core-annotations/pom.xml
    directory/apacheds/branches/apacheds-refact/core-api/pom.xml
    directory/apacheds/branches/apacheds-refact/core-avl/pom.xml
    directory/apacheds/branches/apacheds-refact/core-integ/pom.xml
    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-jndi/pom.xml
    directory/apacheds/branches/apacheds-refact/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
    directory/apacheds/branches/apacheds-refact/core-shared/pom.xml
    directory/apacheds/branches/apacheds-refact/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
    directory/apacheds/branches/apacheds-refact/core/pom.xml
    directory/apacheds/branches/apacheds-refact/http-directory-bridge/pom.xml
    directory/apacheds/branches/apacheds-refact/http-integration/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptor-kerberos/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptors/admin/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptors/authn/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java
    directory/apacheds/branches/apacheds-refact/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptors/changelog/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptors/collective/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptors/event/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptors/exception/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptors/hash/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptors/journal/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptors/logger/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptors/normalization/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptors/operational/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptors/referral/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptors/schema/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptors/subtree/pom.xml
    directory/apacheds/branches/apacheds-refact/interceptors/trigger/pom.xml
    directory/apacheds/branches/apacheds-refact/jdbm-partition/pom.xml
    directory/apacheds/branches/apacheds-refact/kerberos-codec/pom.xml
    directory/apacheds/branches/apacheds-refact/kerberos-test/pom.xml
    directory/apacheds/branches/apacheds-refact/ldap-client-test/pom.xml
    directory/apacheds/branches/apacheds-refact/ldif-partition/pom.xml
    directory/apacheds/branches/apacheds-refact/pom.xml
    directory/apacheds/branches/apacheds-refact/protocol-dhcp/pom.xml
    directory/apacheds/branches/apacheds-refact/protocol-dns/pom.xml
    directory/apacheds/branches/apacheds-refact/protocol-kerberos/pom.xml
    directory/apacheds/branches/apacheds-refact/protocol-ldap/pom.xml
    directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java
    directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.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/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java
    directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplSearchListener.java
    directory/apacheds/branches/apacheds-refact/protocol-shared/pom.xml
    directory/apacheds/branches/apacheds-refact/server-annotations/pom.xml
    directory/apacheds/branches/apacheds-refact/server-config/pom.xml
    directory/apacheds/branches/apacheds-refact/server-integ/pom.xml
    directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java
    directory/apacheds/branches/apacheds-refact/server-jndi/pom.xml
    directory/apacheds/branches/apacheds-refact/server-replication/pom.xml
    directory/apacheds/branches/apacheds-refact/service-builder/pom.xml
    directory/apacheds/branches/apacheds-refact/service/log4j.properties
    directory/apacheds/branches/apacheds-refact/service/pom.xml
    directory/apacheds/branches/apacheds-refact/test-framework/pom.xml
    directory/apacheds/branches/apacheds-refact/xdbm-partition/pom.xml

Modified: directory/apacheds/branches/apacheds-refact/core-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-annotations/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-annotations/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/core-annotations/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/core-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/core-avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-avl/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-avl/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/core-avl/pom.xml Thu Dec 20 20:12:31 2012
@@ -48,7 +48,7 @@
     
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
     
     <dependency>

Modified: directory/apacheds/branches/apacheds-refact/core-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-integ/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-integ/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/core-integ/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

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=1424665&r1=1424664&r2=1424665&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 20:12:31 2012
@@ -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 static org.junit.Assert.assertTru
 
 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.
 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;

Modified: directory/apacheds/branches/apacheds-refact/core-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-jndi/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-jndi/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/core-jndi/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

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=1424665&r1=1424664&r2=1424665&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 20:12:31 2012
@@ -54,6 +54,13 @@ import org.apache.directory.api.ldap.cod
 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.
 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;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-shared/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-shared/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/core-shared/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java Thu Dec 20 20:12:31 2012
@@ -27,6 +27,7 @@ import java.util.Arrays;
 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.
 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;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/core/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/http-directory-bridge/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/http-directory-bridge/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/http-directory-bridge/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/http-directory-bridge/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>
   

Modified: directory/apacheds/branches/apacheds-refact/http-integration/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/http-integration/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/http-integration/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/http-integration/pom.xml Thu Dec 20 20:12:31 2012
@@ -65,7 +65,7 @@
     
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
 
     <dependency>

Modified: directory/apacheds/branches/apacheds-refact/interceptor-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptor-kerberos/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptor-kerberos/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptor-kerberos/pom.xml Thu Dec 20 20:12:31 2012
@@ -59,7 +59,7 @@
     
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
     
     <dependency>

Modified: directory/apacheds/branches/apacheds-refact/interceptors/admin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/admin/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/admin/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/admin/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authn/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authn/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authn/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authn/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java Thu Dec 20 20:12:31 2012
@@ -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;

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Thu Dec 20 20:12:31 2012
@@ -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.l
 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.List;
 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.
 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;
 

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/interceptors/changelog/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/changelog/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/changelog/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/changelog/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/interceptors/collective/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/collective/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/collective/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/collective/pom.xml Thu Dec 20 20:12:31 2012
@@ -48,7 +48,7 @@
     
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
   </dependencies>
 

Modified: directory/apacheds/branches/apacheds-refact/interceptors/event/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/event/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/event/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/event/pom.xml Thu Dec 20 20:12:31 2012
@@ -43,7 +43,7 @@
     
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
   </dependencies>
 

Modified: directory/apacheds/branches/apacheds-refact/interceptors/exception/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/exception/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/exception/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/exception/pom.xml Thu Dec 20 20:12:31 2012
@@ -58,7 +58,7 @@
     
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
   </dependencies>
 

Modified: directory/apacheds/branches/apacheds-refact/interceptors/hash/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/hash/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/hash/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/hash/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/interceptors/journal/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/journal/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/journal/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/journal/pom.xml Thu Dec 20 20:12:31 2012
@@ -43,7 +43,7 @@
     
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
   </dependencies>
 

Modified: directory/apacheds/branches/apacheds-refact/interceptors/logger/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/logger/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/logger/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/logger/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/interceptors/normalization/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/normalization/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/normalization/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/normalization/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/interceptors/operational/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/operational/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/operational/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/operational/pom.xml Thu Dec 20 20:12:31 2012
@@ -53,7 +53,7 @@
     
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
     
     <dependency>

Modified: directory/apacheds/branches/apacheds-refact/interceptors/referral/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/referral/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/referral/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/referral/pom.xml Thu Dec 20 20:12:31 2012
@@ -53,7 +53,7 @@
     
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
     
     <dependency>

Modified: directory/apacheds/branches/apacheds-refact/interceptors/schema/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/schema/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/schema/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/schema/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/interceptors/subtree/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/subtree/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/subtree/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/subtree/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/interceptors/trigger/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/trigger/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/trigger/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/trigger/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>
 

Modified: directory/apacheds/branches/apacheds-refact/jdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/jdbm-partition/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/jdbm-partition/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/jdbm-partition/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/kerberos-codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/kerberos-codec/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/kerberos-codec/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/kerberos-codec/pom.xml Thu Dec 20 20:12:31 2012
@@ -75,7 +75,7 @@
     
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
     
     <dependency>

Modified: directory/apacheds/branches/apacheds-refact/kerberos-test/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/kerberos-test/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/kerberos-test/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/kerberos-test/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/ldap-client-test/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/ldap-client-test/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/ldap-client-test/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/ldap-client-test/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/ldif-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/ldif-partition/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/ldif-partition/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/ldif-partition/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>
       

Modified: directory/apacheds/branches/apacheds-refact/protocol-dhcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-dhcp/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/protocol-dhcp/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/protocol-dhcp/pom.xml Thu Dec 20 20:12:31 2012
@@ -40,7 +40,7 @@
 
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
 
     <dependency>

Modified: directory/apacheds/branches/apacheds-refact/protocol-dns/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-dns/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/protocol-dns/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/protocol-dns/pom.xml Thu Dec 20 20:12:31 2012
@@ -65,7 +65,7 @@
 
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
 
     <dependency>

Modified: directory/apacheds/branches/apacheds-refact/protocol-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-kerberos/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/protocol-kerberos/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/protocol-kerberos/pom.xml Thu Dec 20 20:12:31 2012
@@ -59,7 +59,7 @@
 
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
 
     <dependency>

Modified: directory/apacheds/branches/apacheds-refact/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-ldap/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/protocol-ldap/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/protocol-ldap/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java (original)
+++ directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java Thu Dec 20 20:12:31 2012
@@ -24,6 +24,8 @@ import java.util.Collections;
 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.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.extras.extended.CertGenerationRequest;
-import org.apache.directory.shared.ldap.extras.extended.CertGenerationResponse;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java (original)
+++ directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java Thu Dec 20 20:12:31 2012
@@ -27,17 +27,17 @@ import java.util.Iterator;
 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;

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=1424665&r1=1424664&r2=1424665&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 20:12:31 2012
@@ -29,6 +29,8 @@ 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.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.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.extras.extended.StoredProcedureRequest;
-import org.apache.directory.shared.ldap.extras.extended.StoredProcedureResponse;
 
 
 /**

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=1424665&r1=1424664&r2=1424665&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 20:12:31 2012
@@ -30,6 +30,7 @@ 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.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.
 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;
 

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=1424665&r1=1424664&r2=1424665&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 20:12:31 2012
@@ -28,6 +28,13 @@ 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.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.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.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;

Modified: directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java (original)
+++ directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java Thu Dec 20 20:12:31 2012
@@ -37,6 +37,13 @@ import java.util.Set;
 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.
 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;
 

Modified: directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplSearchListener.java?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplSearchListener.java (original)
+++ directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplSearchListener.java Thu Dec 20 20:12:31 2012
@@ -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.i18n.
 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;

Modified: directory/apacheds/branches/apacheds-refact/protocol-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-shared/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/protocol-shared/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/protocol-shared/pom.xml Thu Dec 20 20:12:31 2012
@@ -51,7 +51,7 @@
     
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
   </dependencies>
 

Modified: directory/apacheds/branches/apacheds-refact/server-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-annotations/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/server-annotations/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/server-annotations/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/server-config/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-config/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/server-config/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/server-config/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/server-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/server-integ/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/server-integ/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

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=1424665&r1=1424664&r2=1424665&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 20:12:31 2012
@@ -34,6 +34,13 @@ import java.util.concurrent.atomic.Atomi
 
 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.
 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;
 

Modified: directory/apacheds/branches/apacheds-refact/server-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-jndi/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/server-jndi/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/server-jndi/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/server-replication/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-replication/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/server-replication/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/server-replication/pom.xml Thu Dec 20 20:12:31 2012
@@ -42,7 +42,7 @@
     
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>shared-ldap-model</artifactId>
+      <artifactId>api-ldap-model</artifactId>
     </dependency>
   </dependencies>
   

Modified: directory/apacheds/branches/apacheds-refact/service-builder/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/service-builder/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/service-builder/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/service-builder/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>

Modified: directory/apacheds/branches/apacheds-refact/service/log4j.properties
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/service/log4j.properties?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/service/log4j.properties (original)
+++ directory/apacheds/branches/apacheds-refact/service/log4j.properties Thu Dec 20 20:12:31 2012
@@ -32,8 +32,8 @@ log4j.appender.R.layout.ConversionPatter
 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

Modified: directory/apacheds/branches/apacheds-refact/service/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/service/pom.xml?rev=1424665&r1=1424664&r2=1424665&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/service/pom.xml (original)
+++ directory/apacheds/branches/apacheds-refact/service/pom.xml Thu Dec 20 20:12:31 2012
@@ -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>



Mime
View raw message