directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1423973 [2/17] - in /directory/apacheds/branches/apacheds-refact: core-annotations/src/main/java/org/apache/directory/server/core/factory/ core-api/src/main/java/org/apache/directory/server/core/api/ core-api/src/main/java/org/apache/direc...
Date Wed, 19 Dec 2012 17:34:18 GMT

Modified: directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java Wed Dec 19 17:34:07 2012
@@ -22,13 +22,13 @@ package org.apache.directory.server.core
 import java.io.File;
 import java.util.Set;
 
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.server.core.api.partition.Partition;
 import org.apache.directory.server.core.partition.impl.avl.AvlPartition;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java Wed Dec 19 17:34:07 2012
@@ -27,6 +27,12 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.directory.api.ldap.model.entry.DefaultEntry;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.ldif.LdifEntry;
+import org.apache.directory.api.ldap.model.ldif.LdifReader;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.server.core.annotations.AnnotationUtils;
 import org.apache.directory.server.core.annotations.ApplyLdifFiles;
 import org.apache.directory.server.core.annotations.ApplyLdifs;
@@ -44,12 +50,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.impl.btree.AbstractBTreePartition;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.model.ldif.LdifReader;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.junit.runner.Description;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java Wed Dec 19 17:34:07 2012
@@ -24,6 +24,9 @@ import java.io.IOException;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
+import org.apache.directory.api.ldap.model.schema.registries.SchemaLoader;
 import org.apache.directory.api.util.exception.Exceptions;
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.DefaultDirectoryService;
@@ -34,9 +37,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.schema.SchemaPartition;
 import org.apache.directory.server.core.partition.ldif.LdifPartition;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.model.schema.registries.SchemaLoader;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader;

Modified: directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java Wed Dec 19 17:34:07 2012
@@ -22,13 +22,13 @@ package org.apache.directory.server.core
 import java.io.File;
 import java.util.Set;
 
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.server.core.api.partition.Partition;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.apache.directory.server.xdbm.Index;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java Wed Dec 19 17:34:07 2012
@@ -22,13 +22,13 @@ package org.apache.directory.server.core
 import java.io.File;
 import java.util.Set;
 
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.server.core.api.partition.Partition;
 import org.apache.directory.server.core.partition.ldif.LdifPartition;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/PartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/PartitionFactory.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/PartitionFactory.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/PartitionFactory.java Wed Dec 19 17:34:07 2012
@@ -21,9 +21,9 @@ package org.apache.directory.server.core
 
 import java.io.File;
 
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.server.core.api.partition.Partition;
 import org.apache.directory.server.xdbm.Index;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/CoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/CoreSession.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/CoreSession.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/CoreSession.java Wed Dec 19 17:34:07 2012
@@ -24,27 +24,27 @@ import java.net.SocketAddress;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.Modification;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.filter.ExprNode;
+import org.apache.directory.api.ldap.model.message.AddRequest;
+import org.apache.directory.api.ldap.model.message.AliasDerefMode;
+import org.apache.directory.api.ldap.model.message.CompareRequest;
+import org.apache.directory.api.ldap.model.message.Control;
+import org.apache.directory.api.ldap.model.message.DeleteRequest;
+import org.apache.directory.api.ldap.model.message.ModifyDnRequest;
+import org.apache.directory.api.ldap.model.message.ModifyRequest;
+import org.apache.directory.api.ldap.model.message.SearchRequest;
+import org.apache.directory.api.ldap.model.message.SearchScope;
+import org.apache.directory.api.ldap.model.message.UnbindRequest;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.name.Rdn;
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.api.changelog.LogChange;
 import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.api.interceptor.context.OperationContext;
-import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.Modification;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.filter.ExprNode;
-import org.apache.directory.shared.ldap.model.message.AddRequest;
-import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.model.message.CompareRequest;
-import org.apache.directory.shared.ldap.model.message.Control;
-import org.apache.directory.shared.ldap.model.message.DeleteRequest;
-import org.apache.directory.shared.ldap.model.message.ModifyDnRequest;
-import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.model.message.SearchRequest;
-import org.apache.directory.shared.ldap.model.message.SearchScope;
-import org.apache.directory.shared.ldap.model.message.UnbindRequest;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.name.Rdn;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/DirectoryService.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/DirectoryService.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/DirectoryService.java Wed Dec 19 17:34:07 2012
@@ -24,6 +24,12 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.directory.api.ldap.model.csn.Csn;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.ldif.LdifEntry;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.server.core.api.administrative.AccessControlAdministrativePoint;
 import org.apache.directory.server.core.api.administrative.CollectiveAttributeAdministrativePoint;
 import org.apache.directory.server.core.api.administrative.SubschemaAdministrativePoint;
@@ -39,12 +45,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.subtree.SubentryCache;
 import org.apache.directory.server.core.api.subtree.SubtreeEvaluator;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.model.csn.Csn;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.util.tree.DnNode;
 
 /**
@@ -380,7 +380,7 @@ public interface DirectoryService extend
 
 
     /**
-     * Returns test directory entries({@link org.apache.directory.shared.ldap.model.ldif.LdifEntry}) to be loaded while
+     * Returns test directory entries({@link org.apache.directory.api.ldap.model.ldif.LdifEntry}) to be loaded while
      * bootstrapping.
      *
      * @return test entries to load during bootstrapping

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/DnFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/DnFactory.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/DnFactory.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/DnFactory.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api;
 
 
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.api.ldap.model.name.Dn;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/EntryToResponseCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/EntryToResponseCursor.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/EntryToResponseCursor.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/EntryToResponseCursor.java Wed Dec 19 17:34:07 2012
@@ -24,21 +24,21 @@ package org.apache.directory.server.core
 import java.io.IOException;
 import java.util.Iterator;
 
-import org.apache.directory.shared.ldap.model.cursor.AbstractCursor;
-import org.apache.directory.shared.ldap.model.cursor.ClosureMonitor;
-import org.apache.directory.shared.ldap.model.cursor.Cursor;
-import org.apache.directory.shared.ldap.model.cursor.CursorException;
-import org.apache.directory.shared.ldap.model.cursor.SearchCursor;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.message.IntermediateResponse;
-import org.apache.directory.shared.ldap.model.message.Referral;
-import org.apache.directory.shared.ldap.model.message.Response;
-import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.model.message.SearchResultDone;
-import org.apache.directory.shared.ldap.model.message.SearchResultDoneImpl;
-import org.apache.directory.shared.ldap.model.message.SearchResultEntry;
-import org.apache.directory.shared.ldap.model.message.SearchResultEntryImpl;
+import org.apache.directory.api.ldap.model.cursor.AbstractCursor;
+import org.apache.directory.api.ldap.model.cursor.ClosureMonitor;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
+import org.apache.directory.api.ldap.model.cursor.CursorException;
+import org.apache.directory.api.ldap.model.cursor.SearchCursor;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.message.IntermediateResponse;
+import org.apache.directory.api.ldap.model.message.Referral;
+import org.apache.directory.api.ldap.model.message.Response;
+import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.api.ldap.model.message.SearchResultDone;
+import org.apache.directory.api.ldap.model.message.SearchResultDoneImpl;
+import org.apache.directory.api.ldap.model.message.SearchResultEntry;
+import org.apache.directory.api.ldap.model.message.SearchResultEntryImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java Wed Dec 19 17:34:07 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.server.core.api;
 
 
-import static org.apache.directory.shared.ldap.model.message.ResultCodeEnum.processResponse;
+import static org.apache.directory.api.ldap.model.message.ResultCodeEnum.processResponse;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -28,64 +28,64 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apache.directory.api.asn1.util.Oid;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.cursor.EmptyCursor;
+import org.apache.directory.api.ldap.model.cursor.EntryCursor;
+import org.apache.directory.api.ldap.model.cursor.SearchCursor;
+import org.apache.directory.api.ldap.model.entry.Attribute;
+import org.apache.directory.api.ldap.model.entry.DefaultModification;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.Modification;
+import org.apache.directory.api.ldap.model.entry.ModificationOperation;
+import org.apache.directory.api.ldap.model.entry.Value;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.exception.LdapNoPermissionException;
+import org.apache.directory.api.ldap.model.exception.LdapOperationException;
+import org.apache.directory.api.ldap.model.message.AbandonRequest;
+import org.apache.directory.api.ldap.model.message.AddRequest;
+import org.apache.directory.api.ldap.model.message.AddRequestImpl;
+import org.apache.directory.api.ldap.model.message.AddResponse;
+import org.apache.directory.api.ldap.model.message.AddResponseImpl;
+import org.apache.directory.api.ldap.model.message.AliasDerefMode;
+import org.apache.directory.api.ldap.model.message.BindRequest;
+import org.apache.directory.api.ldap.model.message.BindRequestImpl;
+import org.apache.directory.api.ldap.model.message.BindResponse;
+import org.apache.directory.api.ldap.model.message.BindResponseImpl;
+import org.apache.directory.api.ldap.model.message.CompareRequest;
+import org.apache.directory.api.ldap.model.message.CompareRequestImpl;
+import org.apache.directory.api.ldap.model.message.CompareResponse;
+import org.apache.directory.api.ldap.model.message.CompareResponseImpl;
+import org.apache.directory.api.ldap.model.message.Control;
+import org.apache.directory.api.ldap.model.message.DeleteRequest;
+import org.apache.directory.api.ldap.model.message.DeleteRequestImpl;
+import org.apache.directory.api.ldap.model.message.DeleteResponse;
+import org.apache.directory.api.ldap.model.message.DeleteResponseImpl;
+import org.apache.directory.api.ldap.model.message.ExtendedRequest;
+import org.apache.directory.api.ldap.model.message.ExtendedResponse;
+import org.apache.directory.api.ldap.model.message.LdapResult;
+import org.apache.directory.api.ldap.model.message.Message;
+import org.apache.directory.api.ldap.model.message.ModifyDnRequest;
+import org.apache.directory.api.ldap.model.message.ModifyDnRequestImpl;
+import org.apache.directory.api.ldap.model.message.ModifyDnResponse;
+import org.apache.directory.api.ldap.model.message.ModifyDnResponseImpl;
+import org.apache.directory.api.ldap.model.message.ModifyRequest;
+import org.apache.directory.api.ldap.model.message.ModifyRequestImpl;
+import org.apache.directory.api.ldap.model.message.ModifyResponse;
+import org.apache.directory.api.ldap.model.message.ModifyResponseImpl;
+import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.api.ldap.model.message.ResultResponseRequest;
+import org.apache.directory.api.ldap.model.message.SearchRequest;
+import org.apache.directory.api.ldap.model.message.SearchRequestImpl;
+import org.apache.directory.api.ldap.model.message.SearchScope;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.name.Rdn;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.ldap.client.api.AbstractLdapConnection;
 import org.apache.directory.ldap.client.api.EntryCursorImpl;
 import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.api.interceptor.context.BindOperationContext;
 import org.apache.directory.shared.ldap.codec.api.BinaryAttributeDetector;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.cursor.EmptyCursor;
-import org.apache.directory.shared.ldap.model.cursor.EntryCursor;
-import org.apache.directory.shared.ldap.model.cursor.SearchCursor;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
-import org.apache.directory.shared.ldap.model.entry.DefaultModification;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.Modification;
-import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.model.entry.Value;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.exception.LdapNoPermissionException;
-import org.apache.directory.shared.ldap.model.exception.LdapOperationException;
-import org.apache.directory.shared.ldap.model.message.AbandonRequest;
-import org.apache.directory.shared.ldap.model.message.AddRequest;
-import org.apache.directory.shared.ldap.model.message.AddRequestImpl;
-import org.apache.directory.shared.ldap.model.message.AddResponse;
-import org.apache.directory.shared.ldap.model.message.AddResponseImpl;
-import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.model.message.BindRequest;
-import org.apache.directory.shared.ldap.model.message.BindRequestImpl;
-import org.apache.directory.shared.ldap.model.message.BindResponse;
-import org.apache.directory.shared.ldap.model.message.BindResponseImpl;
-import org.apache.directory.shared.ldap.model.message.CompareRequest;
-import org.apache.directory.shared.ldap.model.message.CompareRequestImpl;
-import org.apache.directory.shared.ldap.model.message.CompareResponse;
-import org.apache.directory.shared.ldap.model.message.CompareResponseImpl;
-import org.apache.directory.shared.ldap.model.message.Control;
-import org.apache.directory.shared.ldap.model.message.DeleteRequest;
-import org.apache.directory.shared.ldap.model.message.DeleteRequestImpl;
-import org.apache.directory.shared.ldap.model.message.DeleteResponse;
-import org.apache.directory.shared.ldap.model.message.DeleteResponseImpl;
-import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
-import org.apache.directory.shared.ldap.model.message.LdapResult;
-import org.apache.directory.shared.ldap.model.message.Message;
-import org.apache.directory.shared.ldap.model.message.ModifyDnRequest;
-import org.apache.directory.shared.ldap.model.message.ModifyDnRequestImpl;
-import org.apache.directory.shared.ldap.model.message.ModifyDnResponse;
-import org.apache.directory.shared.ldap.model.message.ModifyDnResponseImpl;
-import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
-import org.apache.directory.shared.ldap.model.message.ModifyResponse;
-import org.apache.directory.shared.ldap.model.message.ModifyResponseImpl;
-import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.model.message.ResultResponseRequest;
-import org.apache.directory.shared.ldap.model.message.SearchRequest;
-import org.apache.directory.shared.ldap.model.message.SearchRequestImpl;
-import org.apache.directory.shared.ldap.model.message.SearchScope;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.name.Rdn;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -903,7 +903,7 @@ public class LdapCoreSessionConnection e
     /**
      * Moves and renames the given entryDn.The old Rdn will be deleted
      *
-     * @see #moveAndRename(org.apache.directory.shared.ldap.model.name.Dn, org.apache.directory.shared.ldap.model.name.Dn, boolean)
+     * @see #moveAndRename(org.apache.directory.api.ldap.model.name.Dn, org.apache.directory.api.ldap.model.name.Dn, boolean)
      */
     public void moveAndRename( Dn entryDn, Dn newDn ) throws LdapException
     {
@@ -914,7 +914,7 @@ public class LdapCoreSessionConnection e
     /**
      * Moves and renames the given entryDn.The old Rdn will be deleted
      *
-     * @see #moveAndRename(org.apache.directory.shared.ldap.model.name.Dn, org.apache.directory.shared.ldap.model.name.Dn, boolean)
+     * @see #moveAndRename(org.apache.directory.api.ldap.model.name.Dn, org.apache.directory.api.ldap.model.name.Dn, boolean)
      */
     public void moveAndRename( String entryDn, String newDn ) throws LdapException
     {

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapPrincipal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapPrincipal.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapPrincipal.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapPrincipal.java Wed Dec 19 17:34:07 2012
@@ -23,11 +23,11 @@ package org.apache.directory.server.core
 import java.net.SocketAddress;
 import java.security.Principal;
 
+import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 
 
 /**
@@ -126,9 +126,9 @@ public final class LdapPrincipal impleme
 
     /**
      * Gets a cloned copy of the normalized distinguished name of this
-     * principal as a {@link org.apache.directory.shared.ldap.model.name.Dn}.
+     * principal as a {@link org.apache.directory.api.ldap.model.name.Dn}.
      *
-     * @return the cloned distinguished name of the principal as a {@link org.apache.directory.shared.ldap.model.name.Dn}
+     * @return the cloned distinguished name of the principal as a {@link org.apache.directory.api.ldap.model.name.Dn}
      */
     public Dn getDn()
     {

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapPrincipalSerializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapPrincipalSerializer.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapPrincipalSerializer.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/LdapPrincipalSerializer.java Wed Dec 19 17:34:07 2012
@@ -24,10 +24,10 @@ import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
-import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java Wed Dec 19 17:34:07 2012
@@ -20,6 +20,8 @@
 package org.apache.directory.server.core.api;
 
 
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.BindOperationContext;
@@ -34,8 +36,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.UnbindOperationContext;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/ReferralManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/ReferralManager.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/ReferralManager.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/ReferralManager.java Wed Dec 19 17:34:07 2012
@@ -20,9 +20,9 @@
 package org.apache.directory.server.core.api;
 
 
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.name.Dn;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/SearchRequestContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/SearchRequestContainer.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/SearchRequestContainer.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/SearchRequestContainer.java Wed Dec 19 17:34:07 2012
@@ -19,9 +19,9 @@
  */
 package org.apache.directory.server.core.api;
 
-import org.apache.directory.shared.ldap.model.cursor.Cursor;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.message.SearchRequest;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.message.SearchRequest;
 
 /**
  * A container storing a SearchRequest being processed, and the associated 

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AbstractAdministrativePoint.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AbstractAdministrativePoint.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AbstractAdministrativePoint.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AbstractAdministrativePoint.java Wed Dec 19 17:34:07 2012
@@ -23,8 +23,8 @@ package org.apache.directory.server.core
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AccessControlAAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AccessControlAAP.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AccessControlAAP.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AccessControlAAP.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AccessControlAdministrativePoint.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AccessControlAdministrativePoint.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AccessControlAdministrativePoint.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AccessControlAdministrativePoint.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AccessControlIAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AccessControlIAP.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AccessControlIAP.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AccessControlIAP.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AccessControlSAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AccessControlSAP.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AccessControlSAP.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AccessControlSAP.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AdministrativePoint.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AdministrativePoint.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AdministrativePoint.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AdministrativePoint.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AutonomousAdministrativePoint.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AutonomousAdministrativePoint.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AutonomousAdministrativePoint.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/AutonomousAdministrativePoint.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeAAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeAAP.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeAAP.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeAAP.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeAdministrativePoint.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeAdministrativePoint.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeAdministrativePoint.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeAdministrativePoint.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeIAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeIAP.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeIAP.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeIAP.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeSAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeSAP.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeSAP.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/CollectiveAttributeSAP.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/SubschemaAAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/SubschemaAAP.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/SubschemaAAP.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/SubschemaAAP.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/SubschemaAdministrativePoint.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/SubschemaAdministrativePoint.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/SubschemaAdministrativePoint.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/SubschemaAdministrativePoint.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/SubschemaSAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/SubschemaSAP.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/SubschemaSAP.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/SubschemaSAP.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/TriggerExecutionAAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/TriggerExecutionAAP.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/TriggerExecutionAAP.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/TriggerExecutionAAP.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/TriggerExecutionAdministrativePoint.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/TriggerExecutionAdministrativePoint.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/TriggerExecutionAdministrativePoint.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/TriggerExecutionAdministrativePoint.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/TriggerExecutionIAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/TriggerExecutionIAP.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/TriggerExecutionIAP.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/TriggerExecutionIAP.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/TriggerExecutionSAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/TriggerExecutionSAP.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/TriggerExecutionSAP.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/administrative/TriggerExecutionSAP.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.administrative;
 
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.AdministrativeRole;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/PasswordPolicyConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/PasswordPolicyConfiguration.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/PasswordPolicyConfiguration.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/PasswordPolicyConfiguration.java Wed Dec 19 17:34:07 2012
@@ -21,8 +21,8 @@
 package org.apache.directory.server.core.api.authn.ppolicy;
 
 
-import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.exception.LdapException;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/PasswordPolicyException.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/PasswordPolicyException.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/PasswordPolicyException.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/PasswordPolicyException.java Wed Dec 19 17:34:07 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.server.core.api.authn.ppolicy;
 
 
-import org.apache.directory.shared.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.exception.LdapException;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLog.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLog.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLog.java Wed Dec 19 17:34:07 2012
@@ -22,10 +22,10 @@ package org.apache.directory.server.core
 
 import java.util.List;
 
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.ldif.LdifEntry;
 import org.apache.directory.server.core.api.DirectoryService;
 import org.apache.directory.server.core.api.LdapPrincipal;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogEvent.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogEvent.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogEvent.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogEvent.java Wed Dec 19 17:34:07 2012
@@ -23,9 +23,9 @@ package org.apache.directory.server.core
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.directory.api.ldap.model.entry.Attribute;
+import org.apache.directory.api.ldap.model.ldif.LdifEntry;
 import org.apache.directory.server.core.api.LdapPrincipal;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
-import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogEventSerializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogEventSerializer.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogEventSerializer.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogEventSerializer.java Wed Dec 19 17:34:07 2012
@@ -26,11 +26,11 @@ import java.io.ObjectOutput;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.api.ldap.model.ldif.LdifEntry;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.server.core.api.LdapPrincipal;
 import org.apache.directory.server.core.api.LdapPrincipalSerializer;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogSearchEngine.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogSearchEngine.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogSearchEngine.java Wed Dec 19 17:34:07 2012
@@ -20,14 +20,14 @@
 package org.apache.directory.server.core.api.changelog;
 
 
+import org.apache.directory.api.ldap.model.cursor.Cursor;
+import org.apache.directory.api.ldap.model.filter.ExprNode;
+import org.apache.directory.api.ldap.model.ldif.ChangeType;
+import org.apache.directory.api.ldap.model.message.SearchScope;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.schema.ObjectClass;
 import org.apache.directory.server.core.api.LdapPrincipal;
-import org.apache.directory.shared.ldap.model.cursor.Cursor;
-import org.apache.directory.shared.ldap.model.filter.ExprNode;
-import org.apache.directory.shared.ldap.model.ldif.ChangeType;
-import org.apache.directory.shared.ldap.model.message.SearchScope;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogStore.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogStore.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogStore.java Wed Dec 19 17:34:07 2012
@@ -22,11 +22,11 @@ package org.apache.directory.server.core
 
 import java.util.List;
 
+import org.apache.directory.api.ldap.model.cursor.Cursor;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.ldif.LdifEntry;
 import org.apache.directory.server.core.api.DirectoryService;
 import org.apache.directory.server.core.api.LdapPrincipal;
-import org.apache.directory.shared.ldap.model.cursor.Cursor;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/TagSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/TagSearchEngine.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/TagSearchEngine.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/TagSearchEngine.java Wed Dec 19 17:34:07 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.server.core.api.changelog;
 
 
-import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/TaggableChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/TaggableChangeLogStore.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/TaggableChangeLogStore.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/changelog/TaggableChangeLogStore.java Wed Dec 19 17:34:07 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.server.core.api.changelog;
 
 
-import org.apache.directory.shared.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.exception.LdapException;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntry.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntry.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntry.java Wed Dec 19 17:34:07 2012
@@ -27,15 +27,15 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.directory.api.ldap.model.entry.Attribute;
+import org.apache.directory.api.ldap.model.entry.DefaultEntry;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.Value;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.Value;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntrySearch.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntrySearch.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntrySearch.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntrySearch.java Wed Dec 19 17:34:07 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.server.core.api.entry;
 
 
-import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.Entry;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryFactory.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryFactory.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryFactory.java Wed Dec 19 17:34:07 2012
@@ -20,9 +20,9 @@
 package org.apache.directory.server.core.api.entry;
 
 
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.name.Dn;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryUtils.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryUtils.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryUtils.java Wed Dec 19 17:34:07 2012
@@ -35,26 +35,26 @@ import javax.naming.directory.InvalidAtt
 import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchResult;
 
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.entry.Attribute;
+import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
+import org.apache.directory.api.ldap.model.entry.DefaultEntry;
+import org.apache.directory.api.ldap.model.entry.DefaultModification;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.Modification;
+import org.apache.directory.api.ldap.model.entry.ModificationOperation;
+import org.apache.directory.api.ldap.model.entry.Value;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeTypeException;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.schema.AttributeTypeOptions;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
+import org.apache.directory.api.ldap.model.schema.SchemaUtils;
 import org.apache.directory.api.util.EmptyEnumeration;
 import org.apache.directory.api.util.Strings;
 import org.apache.directory.server.core.api.interceptor.context.FilteringOperationContext;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
-import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultModification;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.Modification;
-import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.model.entry.Value;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeTypeException;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.AttributeTypeOptions;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.model.schema.SchemaUtils;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerSearchResult.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerSearchResult.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerSearchResult.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerSearchResult.java Wed Dec 19 17:34:07 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.api.entry;
 
 
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.name.Dn;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/TestServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/TestServerEntryUtils.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/TestServerEntryUtils.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/entry/TestServerEntryUtils.java Wed Dec 19 17:34:07 2012
@@ -20,22 +20,22 @@
 package org.apache.directory.server.core.api.entry;
 
 
+import org.apache.directory.api.ldap.model.entry.BinaryValue;
+import org.apache.directory.api.ldap.model.entry.StringValue;
+import org.apache.directory.api.ldap.model.entry.Value;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.schema.LdapComparator;
+import org.apache.directory.api.ldap.model.schema.LdapSyntax;
+import org.apache.directory.api.ldap.model.schema.MatchingRule;
+import org.apache.directory.api.ldap.model.schema.MutableAttributeType;
+import org.apache.directory.api.ldap.model.schema.MutableMatchingRule;
+import org.apache.directory.api.ldap.model.schema.Normalizer;
+import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
+import org.apache.directory.api.ldap.model.schema.comparators.ByteArrayComparator;
+import org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
 import org.apache.directory.api.util.Strings;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.model.entry.BinaryValue;
-import org.apache.directory.shared.ldap.model.entry.StringValue;
-import org.apache.directory.shared.ldap.model.entry.Value;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.LdapComparator;
-import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
-import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
-import org.apache.directory.shared.ldap.model.schema.MutableMatchingRule;
-import org.apache.directory.shared.ldap.model.schema.Normalizer;
-import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.model.schema.comparators.ByteArrayComparator;
-import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/Evaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/Evaluator.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/Evaluator.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/Evaluator.java Wed Dec 19 17:34:07 2012
@@ -20,10 +20,10 @@
 package org.apache.directory.server.core.api.event;
 
 
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.filter.ExprNode;
-import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.filter.ExprNode;
+import org.apache.directory.api.ldap.model.name.Dn;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/ExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/ExpressionEvaluator.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/ExpressionEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/ExpressionEvaluator.java Wed Dec 19 17:34:07 2012
@@ -20,18 +20,18 @@
 package org.apache.directory.server.core.api.event;
 
 
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidSearchFilterException;
+import org.apache.directory.api.ldap.model.filter.AndNode;
+import org.apache.directory.api.ldap.model.filter.BranchNode;
+import org.apache.directory.api.ldap.model.filter.ExprNode;
+import org.apache.directory.api.ldap.model.filter.NotNode;
+import org.apache.directory.api.ldap.model.filter.OrNode;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.server.core.api.event.Evaluator;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidSearchFilterException;
-import org.apache.directory.shared.ldap.model.filter.AndNode;
-import org.apache.directory.shared.ldap.model.filter.BranchNode;
-import org.apache.directory.shared.ldap.model.filter.ExprNode;
-import org.apache.directory.shared.ldap.model.filter.NotNode;
-import org.apache.directory.shared.ldap.model.filter.OrNode;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/LeafEvaluator.java?rev=1423973&r1=1423972&r2=1423973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/LeafEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/event/LeafEvaluator.java Wed Dec 19 17:34:07 2012
@@ -22,29 +22,29 @@ package org.apache.directory.server.core
 
 import java.util.Comparator;
 
+import org.apache.directory.api.ldap.model.entry.Attribute;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.Value;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidSearchFilterException;
+import org.apache.directory.api.ldap.model.filter.ApproximateNode;
+import org.apache.directory.api.ldap.model.filter.EqualityNode;
+import org.apache.directory.api.ldap.model.filter.ExprNode;
+import org.apache.directory.api.ldap.model.filter.ExtensibleNode;
+import org.apache.directory.api.ldap.model.filter.GreaterEqNode;
+import org.apache.directory.api.ldap.model.filter.LessEqNode;
+import org.apache.directory.api.ldap.model.filter.PresenceNode;
+import org.apache.directory.api.ldap.model.filter.ScopeNode;
+import org.apache.directory.api.ldap.model.filter.SimpleNode;
+import org.apache.directory.api.ldap.model.filter.SubstringNode;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.schema.LdapComparator;
+import org.apache.directory.api.ldap.model.schema.MatchingRule;
+import org.apache.directory.api.ldap.model.schema.Normalizer;
 import org.apache.directory.api.util.exception.NotImplementedException;
 import org.apache.directory.server.core.api.event.Evaluator;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.Value;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidSearchFilterException;
-import org.apache.directory.shared.ldap.model.filter.ApproximateNode;
-import org.apache.directory.shared.ldap.model.filter.EqualityNode;
-import org.apache.directory.shared.ldap.model.filter.ExprNode;
-import org.apache.directory.shared.ldap.model.filter.ExtensibleNode;
-import org.apache.directory.shared.ldap.model.filter.GreaterEqNode;
-import org.apache.directory.shared.ldap.model.filter.LessEqNode;
-import org.apache.directory.shared.ldap.model.filter.PresenceNode;
-import org.apache.directory.shared.ldap.model.filter.ScopeNode;
-import org.apache.directory.shared.ldap.model.filter.SimpleNode;
-import org.apache.directory.shared.ldap.model.filter.SubstringNode;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.LdapComparator;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
-import org.apache.directory.shared.ldap.model.schema.Normalizer;
 
 
 /**
@@ -251,7 +251,7 @@ public class LeafEvaluator implements Ev
      * @param node the equality node to evaluate
      * @param entry the perspective candidate
      * @return the ava evaluation on the perspective candidate
-     * @throws org.apache.directory.shared.ldap.model.exception.LdapException if there is a database access failure
+     * @throws org.apache.directory.api.ldap.model.exception.LdapException if there is a database access failure
      */
     @SuppressWarnings("unchecked")
     private boolean evalEquality( EqualityNode<?> node, Entry entry ) throws LdapException
@@ -280,7 +280,7 @@ public class LeafEvaluator implements Ev
             }
             else
             {
-                value = new org.apache.directory.shared.ldap.model.entry.StringValue( node.getValue().getString() );
+                value = new org.apache.directory.api.ldap.model.entry.StringValue( node.getValue().getString() );
             }
         }
         else



Mime
View raw message