You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/02/08 01:18:49 UTC
svn commit: r375785 [4/28] - in /directory/trunks: apacheds/
apacheds/core-plugin/src/main/antlr/
apacheds/core-plugin/src/main/java/org/apache/directory/
apacheds/core-plugin/src/main/java/org/apache/directory/server/
apacheds/core-plugin/src/main/jav...
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/RemoveDirectoryPartitionConfiguration.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/RemoveDirectoryPartitionConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/RemoveDirectoryPartitionConfiguration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/RemoveDirectoryPartitionConfiguration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/RemoveDirectoryPartitionConfiguration.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/RemoveDirectoryPartitionConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/RemoveDirectoryPartitionConfiguration.java Tue Feb 7 16:10:02 2006
@@ -16,14 +16,14 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
import javax.naming.Name;
import javax.naming.NamingException;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.partition.DirectoryPartition;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.DirectoryPartition;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.shared.ldap.name.LdapName;
/**
* A {@link Configuration} that removed the attached {@link DirectoryPartition} in
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/ShutdownConfiguration.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/ShutdownConfiguration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/ShutdownConfiguration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/ShutdownConfiguration.java Tue Feb 7 16:10:02 2006
@@ -16,9 +16,9 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
-import org.apache.ldap.server.DirectoryService;
+import org.apache.directory.server.core.DirectoryService;
/**
* A {@link Configuration} that shuts down ApacheDS.
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java Tue Feb 7 16:10:02 2006
@@ -16,7 +16,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
import java.io.File;
import java.util.ArrayList;
@@ -27,21 +27,21 @@
import javax.naming.directory.Attributes;
-import org.apache.ldap.server.DirectoryService;
-import org.apache.ldap.server.authn.AnonymousAuthenticator;
-import org.apache.ldap.server.authn.AuthenticationService;
-import org.apache.ldap.server.authn.SimpleAuthenticator;
-import org.apache.ldap.server.authz.OldAuthorizationService;
-import org.apache.ldap.server.authz.AuthorizationService;
-import org.apache.ldap.server.exception.ExceptionService;
-import org.apache.ldap.server.normalization.NormalizationService;
-import org.apache.ldap.server.operational.OperationalAttributeService;
-import org.apache.ldap.server.referral.ReferralService;
-import org.apache.ldap.server.schema.SchemaService;
-import org.apache.ldap.server.schema.bootstrap.*;
-import org.apache.ldap.server.subtree.SubentryService;
-import org.apache.ldap.server.event.EventService;
-import org.apache.ldap.server.collective.CollectiveAttributeService;
+import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.authn.AnonymousAuthenticator;
+import org.apache.directory.server.core.authn.AuthenticationService;
+import org.apache.directory.server.core.authn.SimpleAuthenticator;
+import org.apache.directory.server.core.authz.AuthorizationService;
+import org.apache.directory.server.core.authz.OldAuthorizationService;
+import org.apache.directory.server.core.collective.CollectiveAttributeService;
+import org.apache.directory.server.core.event.EventService;
+import org.apache.directory.server.core.exception.ExceptionService;
+import org.apache.directory.server.core.normalization.NormalizationService;
+import org.apache.directory.server.core.operational.OperationalAttributeService;
+import org.apache.directory.server.core.referral.ReferralService;
+import org.apache.directory.server.core.schema.SchemaService;
+import org.apache.directory.server.core.schema.bootstrap.*;
+import org.apache.directory.server.core.subtree.SubentryService;
/**
* A {@link Configuration} that starts up ApacheDS.
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/SyncConfiguration.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/SyncConfiguration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/SyncConfiguration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/SyncConfiguration.java Tue Feb 7 16:10:02 2006
@@ -16,9 +16,9 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.configuration;
+package org.apache.directory.server.core.configuration;
-import org.apache.ldap.server.DirectoryService;
+import org.apache.directory.server.core.DirectoryService;
/**
* A {@link Configuration} that makes a call to {@link DirectoryService#sync()}.
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/enumeration/ReferralHandlingEnumeration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/enumeration/ReferralHandlingEnumeration.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/enumeration/ReferralHandlingEnumeration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.enumeration;
+package org.apache.directory.server.core.enumeration;
import java.util.ArrayList;
@@ -28,12 +28,12 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-import org.apache.ldap.common.codec.util.LdapURL;
-import org.apache.ldap.common.codec.util.LdapURLEncodingException;
-import org.apache.ldap.common.exception.LdapReferralException;
-import org.apache.ldap.common.name.DnParser;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.referral.ReferralLut;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.referral.ReferralLut;
+import org.apache.directory.shared.ldap.codec.util.LdapURL;
+import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
+import org.apache.directory.shared.ldap.exception.LdapReferralException;
+import org.apache.directory.shared.ldap.name.DnParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultEnumeration.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultEnumeration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultEnumeration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultEnumeration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultEnumeration.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultEnumeration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultEnumeration.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.enumeration;
+package org.apache.directory.server.core.enumeration;
import javax.naming.NamingEnumeration;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilter.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilter.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilter.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilter.java Tue Feb 7 16:10:02 2006
@@ -14,10 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.enumeration;
+package org.apache.directory.server.core.enumeration;
-import org.apache.ldap.server.invocation.Invocation;
+import org.apache.directory.server.core.invocation.Invocation;
import javax.naming.NamingException;
import javax.naming.directory.SearchControls;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilteringEnumeration.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilteringEnumeration.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilteringEnumeration.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilteringEnumeration.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilteringEnumeration.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilteringEnumeration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilteringEnumeration.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.enumeration;
+package org.apache.directory.server.core.enumeration;
import java.util.ArrayList;
@@ -32,11 +32,11 @@
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
-import org.apache.ldap.server.invocation.Invocation;
-import org.apache.ldap.common.exception.OperationAbandonedException;
-import org.apache.ldap.common.message.AbandonListener;
-import org.apache.ldap.common.message.AbandonableRequest;
-import org.apache.ldap.common.name.LdapName;
+import org.apache.directory.server.core.invocation.Invocation;
+import org.apache.directory.shared.ldap.exception.OperationAbandonedException;
+import org.apache.directory.shared.ldap.message.AbandonListener;
+import org.apache.directory.shared.ldap.message.AbandonableRequest;
+import org.apache.directory.shared.ldap.name.LdapName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/Evaluator.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/Evaluator.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/Evaluator.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/Evaluator.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/Evaluator.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/Evaluator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/Evaluator.java Tue Feb 7 16:10:02 2006
@@ -14,13 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.event;
+package org.apache.directory.server.core.event;
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
-import org.apache.ldap.common.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.ExprNode;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/EventService.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/EventService.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/EventService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java Tue Feb 7 16:10:02 2006
@@ -14,23 +14,23 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.event;
+package org.apache.directory.server.core.event;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.invocation.Invocation;
-import org.apache.ldap.server.invocation.InvocationStack;
-import org.apache.ldap.server.interceptor.BaseInterceptor;
-import org.apache.ldap.server.interceptor.NextInterceptor;
-import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.server.schema.OidRegistry;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.filter.ScopeNode;
-import org.apache.ldap.common.filter.BranchNode;
-import org.apache.ldap.common.message.DerefAliasesEnum;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.configuration.InterceptorConfiguration;
+import org.apache.directory.server.core.interceptor.BaseInterceptor;
+import org.apache.directory.server.core.interceptor.NextInterceptor;
+import org.apache.directory.server.core.invocation.Invocation;
+import org.apache.directory.server.core.invocation.InvocationStack;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.shared.ldap.filter.BranchNode;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.ScopeNode;
+import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
import javax.naming.Name;
import javax.naming.NamingException;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/ExpressionEvaluator.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/ExpressionEvaluator.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/ExpressionEvaluator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.event;
+package org.apache.directory.server.core.event;
import java.util.Iterator;
@@ -22,10 +22,10 @@
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
-import org.apache.ldap.common.filter.BranchNode;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.shared.ldap.filter.BranchNode;
+import org.apache.directory.shared.ldap.filter.ExprNode;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/LeafEvaluator.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/LeafEvaluator.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/LeafEvaluator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.event;
+package org.apache.directory.server.core.event;
import java.util.Comparator;
@@ -24,17 +24,17 @@
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
-import org.apache.ldap.common.NotImplementedException;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.filter.LeafNode;
-import org.apache.ldap.common.filter.PresenceNode;
-import org.apache.ldap.common.filter.ScopeNode;
-import org.apache.ldap.common.filter.SimpleNode;
-import org.apache.ldap.common.schema.AttributeType;
-import org.apache.ldap.common.schema.MatchingRule;
-import org.apache.ldap.common.schema.Normalizer;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.shared.ldap.NotImplementedException;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.LeafNode;
+import org.apache.directory.shared.ldap.filter.PresenceNode;
+import org.apache.directory.shared.ldap.filter.ScopeNode;
+import org.apache.directory.shared.ldap.filter.SimpleNode;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.Normalizer;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/ScopeEvaluator.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/ScopeEvaluator.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/ScopeEvaluator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.event;
+package org.apache.directory.server.core.event;
import javax.naming.NamingException;
@@ -22,9 +22,9 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.Attributes;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.filter.ScopeNode;
-import org.apache.ldap.common.name.DnParser;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.ScopeNode;
+import org.apache.directory.shared.ldap.name.DnParser;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/SubstringEvaluator.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/SubstringEvaluator.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/event/SubstringEvaluator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.event;
+package org.apache.directory.server.core.event;
import java.util.regex.Pattern;
@@ -25,12 +25,12 @@
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.filter.SubstringNode;
-import org.apache.ldap.common.schema.AttributeType;
-import org.apache.ldap.common.schema.Normalizer;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.SubstringNode;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.Normalizer;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.exception;
+package org.apache.directory.server.core.exception;
import java.util.Map;
@@ -24,23 +24,23 @@
import javax.naming.NamingException;
import javax.naming.directory.*;
-import org.apache.ldap.common.exception.*;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.invocation.Invocation;
-import org.apache.ldap.server.invocation.InvocationStack;
-import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.interceptor.BaseInterceptor;
-import org.apache.ldap.server.interceptor.NextInterceptor;
-import org.apache.ldap.server.partition.DirectoryPartition;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.configuration.InterceptorConfiguration;
+import org.apache.directory.server.core.interceptor.BaseInterceptor;
+import org.apache.directory.server.core.interceptor.NextInterceptor;
+import org.apache.directory.server.core.invocation.Invocation;
+import org.apache.directory.server.core.invocation.InvocationStack;
+import org.apache.directory.server.core.partition.DirectoryPartition;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.shared.ldap.exception.*;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.name.LdapName;
/**
- * An {@link org.apache.ldap.server.interceptor.Interceptor} that detects any operations that breaks integrity
+ * An {@link org.apache.directory.server.core.interceptor.Interceptor} that detects any operations that breaks integrity
* of {@link DirectoryPartition} and terminates the current invocation chain by
* throwing a {@link NamingException}. Those operations include when an entry
* already exists at a DN and is added once again to the same DN.
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.interceptor;
+package org.apache.directory.server.core.interceptor;
import java.util.Iterator;
@@ -30,13 +30,13 @@
import javax.naming.directory.SearchControls;
import javax.naming.ldap.LdapContext;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.authn.LdapPrincipal;
-import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
-import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.invocation.InvocationStack;
-import org.apache.ldap.server.jndi.ServerContext;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.InterceptorConfiguration;
+import org.apache.directory.server.core.invocation.InvocationStack;
+import org.apache.directory.server.core.jndi.ServerContext;
+import org.apache.directory.shared.ldap.filter.ExprNode;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.interceptor;
+package org.apache.directory.server.core.interceptor;
import java.util.Iterator;
@@ -28,12 +28,12 @@
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
-import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.partition.DirectoryPartition;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.InterceptorConfiguration;
+import org.apache.directory.server.core.partition.DirectoryPartition;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.shared.ldap.filter.ExprNode;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.interceptor;
+package org.apache.directory.server.core.interceptor;
import java.util.*;
@@ -27,15 +27,15 @@
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.invocation.Invocation;
-import org.apache.ldap.server.invocation.InvocationStack;
-import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
-import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.configuration.MutableInterceptorConfiguration;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.InterceptorConfiguration;
+import org.apache.directory.server.core.configuration.MutableInterceptorConfiguration;
+import org.apache.directory.server.core.invocation.Invocation;
+import org.apache.directory.server.core.invocation.InvocationStack;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.shared.ldap.filter.ExprNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorException.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorException.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorException.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorException.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorException.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorException.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorException.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.interceptor;
+package org.apache.directory.server.core.interceptor;
import javax.naming.NamingException;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/interceptor/NextInterceptor.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/interceptor/NextInterceptor.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/interceptor/NextInterceptor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.interceptor;
+package org.apache.directory.server.core.interceptor;
import java.util.Iterator;
@@ -28,9 +28,9 @@
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.shared.ldap.filter.ExprNode;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/invocation/Invocation.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/invocation/Invocation.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/invocation/Invocation.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/invocation/Invocation.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/invocation/Invocation.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/invocation/Invocation.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/invocation/Invocation.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.invocation;
+package org.apache.directory.server.core.invocation;
import java.util.ArrayList;
@@ -24,8 +24,8 @@
import javax.naming.Context;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/invocation/InvocationStack.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/invocation/InvocationStack.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/invocation/InvocationStack.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/invocation/InvocationStack.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/invocation/InvocationStack.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/invocation/InvocationStack.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/invocation/InvocationStack.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.invocation;
+package org.apache.directory.server.core.invocation;
import java.util.ArrayList;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
import java.util.Hashtable;
@@ -25,15 +25,15 @@
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
-import org.apache.ldap.server.DirectoryService;
-import org.apache.ldap.server.DirectoryServiceListener;
-import org.apache.ldap.server.configuration.AddDirectoryPartitionConfiguration;
-import org.apache.ldap.server.configuration.Configuration;
-import org.apache.ldap.server.configuration.RemoveDirectoryPartitionConfiguration;
-import org.apache.ldap.server.configuration.ShutdownConfiguration;
-import org.apache.ldap.server.configuration.StartupConfiguration;
-import org.apache.ldap.server.configuration.SyncConfiguration;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.DirectoryServiceListener;
+import org.apache.directory.server.core.configuration.AddDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.Configuration;
+import org.apache.directory.server.core.configuration.RemoveDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.ShutdownConfiguration;
+import org.apache.directory.server.core.configuration.StartupConfiguration;
+import org.apache.directory.server.core.configuration.SyncConfiguration;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
/**
@@ -44,7 +44,7 @@
* Hashtable env = new Hashtable();
* env.put( Context.PROVIDER_URL, "ou=system" );
* env.put(
- * Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.CoreContextFactory" );
+ * Context.INITIAL_CONTEXT_FACTORY, "org.apache.directory.server.core.jndi.CoreContextFactory" );
* InitialContext initialContext = new InitialContext( env );
* </code>
* <p>
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java Tue Feb 7 16:10:02 2006
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
-import org.apache.ldap.server.DirectoryService;
+import org.apache.directory.server.core.DirectoryService;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/DeadContext.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/DeadContext.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/DeadContext.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
import java.util.Hashtable;
@@ -36,9 +36,9 @@
import javax.naming.ldap.ExtendedResponse;
import javax.naming.ldap.LdapContext;
-import org.apache.ldap.common.exception.LdapServiceUnavailableException;
-import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.ldap.server.configuration.SyncConfiguration;
+import org.apache.directory.server.core.configuration.SyncConfiguration;
+import org.apache.directory.shared.ldap.exception.LdapServiceUnavailableException;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/JavaLdapSupport.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/JavaLdapSupport.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/JavaLdapSupport.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java Tue Feb 7 16:10:02 2006
@@ -14,10 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
-import org.apache.ldap.common.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/LdapJndiProperties.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/LdapJndiProperties.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/LdapJndiProperties.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
import java.util.ArrayList;
@@ -25,10 +25,10 @@
import javax.naming.Context;
import javax.naming.NamingException;
-import org.apache.ldap.common.aci.AuthenticationLevel;
-import org.apache.ldap.common.exception.LdapConfigurationException;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.util.StringTools;
+import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
+import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.util.StringTools;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
import java.io.Serializable;
@@ -42,19 +42,19 @@
import javax.naming.spi.DirStateFactory;
import javax.naming.spi.DirectoryManager;
-import org.apache.ldap.common.exception.LdapNoPermissionException;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.filter.PresenceNode;
-import org.apache.ldap.common.message.LockableAttributesImpl;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.util.NamespaceTools;
-import org.apache.ldap.common.util.StringTools;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.DirectoryService;
-import org.apache.ldap.server.authn.AuthenticationService;
-import org.apache.ldap.server.authn.LdapPrincipal;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.authn.AuthenticationService;
+import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.PresenceNode;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.util.NamespaceTools;
+import org.apache.directory.shared.ldap.util.StringTools;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
import java.io.IOException;
@@ -38,16 +38,16 @@
import javax.naming.spi.DirStateFactory;
import javax.naming.spi.DirectoryManager;
-import org.apache.ldap.common.filter.BranchNode;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.filter.FilterParserImpl;
-import org.apache.ldap.common.filter.PresenceNode;
-import org.apache.ldap.common.filter.SimpleNode;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.util.NamespaceTools;
-import org.apache.ldap.server.DirectoryService;
-import org.apache.ldap.server.authn.LdapPrincipal;
-import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.shared.ldap.filter.BranchNode;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.FilterParserImpl;
+import org.apache.directory.shared.ldap.filter.PresenceNode;
+import org.apache.directory.shared.ldap.filter.SimpleNode;
+import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.util.NamespaceTools;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirObjectFactory.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/ServerDirObjectFactory.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirObjectFactory.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirObjectFactory.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/ServerDirObjectFactory.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/ServerDirObjectFactory.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirObjectFactory.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
import javax.naming.spi.DirObjectFactory;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirStateFactory.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/ServerDirStateFactory.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirStateFactory.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirStateFactory.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/ServerDirStateFactory.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/ServerDirStateFactory.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirStateFactory.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
import javax.naming.spi.DirStateFactory;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.jndi;
+package org.apache.directory.server.core.jndi;
import java.util.Hashtable;
@@ -27,10 +27,10 @@
import javax.naming.ldap.ExtendedResponse;
import javax.naming.ldap.LdapContext;
-import org.apache.ldap.common.NotImplementedException;
-import org.apache.ldap.server.DirectoryService;
-import org.apache.ldap.server.authn.LdapPrincipal;
-import org.apache.ldap.server.referral.ReferralService;
+import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.referral.ReferralService;
+import org.apache.directory.shared.ldap.NotImplementedException;
import com.sun.jndi.ldap.LdapName;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.normalization;
+package org.apache.directory.server.core.normalization;
import java.util.Map;
@@ -26,19 +26,19 @@
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.filter.LeafNode;
-import org.apache.ldap.common.filter.BranchNode;
-import org.apache.ldap.common.name.DnParser;
-import org.apache.ldap.common.name.NameComponentNormalizer;
-import org.apache.ldap.common.schema.AttributeType;
-import org.apache.ldap.common.util.EmptyEnumeration;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.interceptor.BaseInterceptor;
-import org.apache.ldap.server.interceptor.NextInterceptor;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.configuration.InterceptorConfiguration;
+import org.apache.directory.server.core.interceptor.BaseInterceptor;
+import org.apache.directory.server.core.interceptor.NextInterceptor;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.shared.ldap.filter.BranchNode;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.LeafNode;
+import org.apache.directory.shared.ldap.name.DnParser;
+import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.util.EmptyEnumeration;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/ValueNormalizingVisitor.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/normalization/ValueNormalizingVisitor.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/ValueNormalizingVisitor.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/ValueNormalizingVisitor.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/normalization/ValueNormalizingVisitor.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/normalization/ValueNormalizingVisitor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/ValueNormalizingVisitor.java Tue Feb 7 16:10:02 2006
@@ -14,11 +14,15 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.normalization;
+package org.apache.directory.server.core.normalization;
-import org.apache.ldap.common.filter.*;
-import org.apache.ldap.common.name.NameComponentNormalizer;
+import org.apache.directory.shared.ldap.filter.BranchNode;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.FilterVisitor;
+import org.apache.directory.shared.ldap.filter.LeafNode;
+import org.apache.directory.shared.ldap.filter.SimpleNode;
+import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java (from r375781, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java&r1=375781&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.operational;
+package org.apache.directory.server.core.operational;
import java.util.HashSet;
@@ -31,21 +31,21 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.schema.AttributeType;
-import org.apache.ldap.common.schema.UsageEnum;
-import org.apache.ldap.common.util.DateUtils;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.enumeration.SearchResultFilter;
-import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
-import org.apache.ldap.server.interceptor.BaseInterceptor;
-import org.apache.ldap.server.interceptor.Interceptor;
-import org.apache.ldap.server.interceptor.NextInterceptor;
-import org.apache.ldap.server.invocation.InvocationStack;
-import org.apache.ldap.server.invocation.Invocation;
-import org.apache.ldap.server.partition.DirectoryPartitionNexus;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.configuration.InterceptorConfiguration;
+import org.apache.directory.server.core.enumeration.SearchResultFilter;
+import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
+import org.apache.directory.server.core.interceptor.BaseInterceptor;
+import org.apache.directory.server.core.interceptor.Interceptor;
+import org.apache.directory.server.core.interceptor.NextInterceptor;
+import org.apache.directory.server.core.invocation.Invocation;
+import org.apache.directory.server.core.invocation.InvocationStack;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.UsageEnum;
+import org.apache.directory.shared.ldap.util.DateUtils;
/**
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/AbstractDirectoryPartition.java (from r375660, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/AbstractDirectoryPartition.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/AbstractDirectoryPartition.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java&r1=375660&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/AbstractDirectoryPartition.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.partition;
+package org.apache.directory.server.core.partition;
import java.util.ArrayList;
import java.util.List;
@@ -28,9 +28,9 @@
import javax.naming.directory.Attributes;
import javax.naming.directory.ModificationItem;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.shared.ldap.name.LdapName;
/**
* A {@link DirectoryPartition} that helps users to implement their own partition.
Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/AbstractDirectoryPartition.java
------------------------------------------------------------------------------
svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultDirectoryPartitionNexus.java (from r375660, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultDirectoryPartitionNexus.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultDirectoryPartitionNexus.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java&r1=375660&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultDirectoryPartitionNexus.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.partition;
+package org.apache.directory.server.core.partition;
import java.io.IOException;
@@ -41,32 +41,32 @@
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
-import org.apache.ldap.common.MultiException;
-import org.apache.ldap.common.NotImplementedException;
-import org.apache.ldap.common.schema.AttributeType;
-import org.apache.ldap.common.schema.Normalizer;
-import org.apache.ldap.common.exception.LdapNameNotFoundException;
-import org.apache.ldap.common.exception.LdapInvalidAttributeIdentifierException;
-import org.apache.ldap.common.exception.LdapNoSuchAttributeException;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.filter.PresenceNode;
-import org.apache.ldap.common.message.EntryChangeControl;
-import org.apache.ldap.common.message.LockableAttributeImpl;
-import org.apache.ldap.common.message.LockableAttributesImpl;
-import org.apache.ldap.common.message.ManageDsaITControl;
-import org.apache.ldap.common.message.PersistentSearchControl;
-import org.apache.ldap.common.message.SubentriesControl;
-import org.apache.ldap.common.message.extended.NoticeOfDisconnect;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.util.DateUtils;
-import org.apache.ldap.common.util.NamespaceTools;
-import org.apache.ldap.common.util.SingletonEnumeration;
-import org.apache.ldap.common.util.StringTools;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
-import org.apache.ldap.server.configuration.MutableDirectoryPartitionConfiguration;
-import org.apache.ldap.server.partition.impl.btree.jdbm.JdbmDirectoryPartition;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmDirectoryPartition;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.shared.ldap.MultiException;
+import org.apache.directory.shared.ldap.NotImplementedException;
+import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeIdentifierException;
+import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
+import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.PresenceNode;
+import org.apache.directory.shared.ldap.message.EntryChangeControl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.message.ManageDsaITControl;
+import org.apache.directory.shared.ldap.message.PersistentSearchControl;
+import org.apache.directory.shared.ldap.message.SubentriesControl;
+import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
+import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.Normalizer;
+import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.ldap.util.NamespaceTools;
+import org.apache.directory.shared.ldap.util.SingletonEnumeration;
+import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -494,7 +494,7 @@
/**
- * @see org.apache.ldap.server.partition.DirectoryPartitionNexus#getSuffix(javax.naming.Name, boolean)
+ * @see org.apache.directory.server.core.partition.DirectoryPartitionNexus#getSuffix(javax.naming.Name, boolean)
*/
public Name getSuffix( Name dn, boolean normalized ) throws NamingException
{
@@ -504,7 +504,7 @@
/**
- * @see org.apache.ldap.server.partition.DirectoryPartitionNexus#listSuffixes(boolean)
+ * @see org.apache.directory.server.core.partition.DirectoryPartitionNexus#listSuffixes(boolean)
*/
public Iterator listSuffixes( boolean normalized ) throws NamingException
{
@@ -574,7 +574,7 @@
* here so backend implementors do not have to worry about performing these
* kinds of checks.
*
- * @see org.apache.ldap.server.partition.DirectoryPartition#add(String, Name, Attributes)
+ * @see org.apache.directory.server.core.partition.DirectoryPartition#add(String, Name, Attributes)
*/
public void add( String updn, Name dn, Attributes an_entry ) throws NamingException
{
@@ -688,7 +688,7 @@
/**
- * @see org.apache.ldap.server.partition.DirectoryPartition#lookup(javax.naming.Name, String[])
+ * @see org.apache.directory.server.core.partition.DirectoryPartition#lookup(javax.naming.Name, String[])
*/
public Attributes lookup( Name dn, String[] attrIds ) throws NamingException
{
Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultDirectoryPartitionNexus.java
------------------------------------------------------------------------------
svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartition.java (from r375660, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartition.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartition.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java&r1=375660&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartition.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.partition;
+package org.apache.directory.server.core.partition;
import java.util.List;
@@ -29,9 +29,9 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.shared.ldap.filter.ExprNode;
/**
Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartition.java
------------------------------------------------------------------------------
svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexus.java (from r375660, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexus.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexus.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexus.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexus.java&r1=375660&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexus.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexus.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.partition;
+package org.apache.directory.server.core.partition;
import java.util.Iterator;
@@ -25,8 +25,8 @@
import javax.naming.directory.Attributes;
import javax.naming.ldap.LdapContext;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.shared.ldap.name.LdapName;
/**
Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexus.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexus.java
------------------------------------------------------------------------------
svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexusProxy.java (from r375660, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexusProxy.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexusProxy.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexusProxy.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexusProxy.java&r1=375660&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexusProxy.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexusProxy.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.partition;
+package org.apache.directory.server.core.partition;
import java.util.*;
@@ -33,20 +33,20 @@
import javax.naming.event.NamingListener;
import javax.naming.ldap.LdapContext;
-import org.apache.ldap.common.exception.LdapSizeLimitExceededException;
-import org.apache.ldap.common.exception.LdapTimeLimitExceededException;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.name.LdapDN;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.DirectoryService;
-import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
-import org.apache.ldap.server.enumeration.SearchResultFilter;
-import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
-import org.apache.ldap.server.event.EventService;
-import org.apache.ldap.server.interceptor.InterceptorChain;
-import org.apache.ldap.server.invocation.Invocation;
-import org.apache.ldap.server.invocation.InvocationStack;
-import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.enumeration.SearchResultFilter;
+import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
+import org.apache.directory.server.core.event.EventService;
+import org.apache.directory.server.core.interceptor.InterceptorChain;
+import org.apache.directory.server.core.invocation.Invocation;
+import org.apache.directory.server.core.invocation.InvocationStack;
+import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.shared.ldap.exception.LdapSizeLimitExceededException;
+import org.apache.directory.shared.ldap.exception.LdapTimeLimitExceededException;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.name.LdapDN;
/**
Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexusProxy.java
------------------------------------------------------------------------------
svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Oid.java (from r375660, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/Oid.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Oid.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Oid.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/Oid.java&r1=375660&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/Oid.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Oid.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.partition;
+package org.apache.directory.server.core.partition;
/**
* Provides constants of private OIDs.
Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Oid.java
------------------------------------------------------------------------------
svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Copied: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeDirectoryPartition.java (from r375660, directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeDirectoryPartition.java?p2=directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeDirectoryPartition.java&p1=directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java&r1=375660&r2=375785&rev=375785&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeDirectoryPartition.java Tue Feb 7 16:10:02 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.partition.impl.btree;
+package org.apache.directory.server.core.partition.impl.btree;
import java.math.BigInteger;
@@ -30,20 +30,20 @@
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
-import org.apache.ldap.common.exception.LdapContextNotEmptyException;
-import org.apache.ldap.common.exception.LdapNameNotFoundException;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.message.LockableAttributesImpl;
-import org.apache.ldap.common.schema.AttributeType;
-import org.apache.ldap.common.util.ArrayUtils;
-import org.apache.ldap.server.DirectoryServiceConfiguration;
-import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
-import org.apache.ldap.server.enumeration.SearchResultEnumeration;
-import org.apache.ldap.server.partition.DirectoryPartition;
-import org.apache.ldap.server.partition.Oid;
-import org.apache.ldap.server.partition.impl.btree.gui.PartitionViewer;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.directory.server.core.DirectoryServiceConfiguration;
+import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.enumeration.SearchResultEnumeration;
+import org.apache.directory.server.core.partition.DirectoryPartition;
+import org.apache.directory.server.core.partition.Oid;
+import org.apache.directory.server.core.partition.impl.btree.gui.PartitionViewer;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.shared.ldap.exception.LdapContextNotEmptyException;
+import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.util.ArrayUtils;
/**