You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2005/10/07 12:39:16 UTC
svn commit: r307079 [1/2] - in /directory/apacheds/trunk/core/src:
main/java/org/apache/ldap/server/authn/
main/java/org/apache/ldap/server/authz/
main/java/org/apache/ldap/server/collective/
main/java/org/apache/ldap/server/configuration/ main/java/or...
Author: trustin
Date: Fri Oct 7 03:38:21 2005
New Revision: 307079
URL: http://svn.apache.org/viewcvs?rev=307079&view=rev
Log:
DIREVE-273: Renamed ContextPartition and its related classes to DirectoryPartition.
Added:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AddDirectoryPartitionConfiguration.java
- copied, changed from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AddContextPartitionConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/DirectoryPartitionConfiguration.java
- copied, changed from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableDirectoryPartitionConfiguration.java
- copied, changed from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableContextPartitionConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/RemoveDirectoryPartitionConfiguration.java
- copied, changed from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/RemoveContextPartitionConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DirectoryPartitionNexusProxy.java
- copied, changed from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextPartitionNexusProxy.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java
- copied, changed from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractContextPartition.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java
- copied, changed from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java
- copied, changed from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/ContextPartition.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexus.java
- copied, changed from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/ContextPartitionNexus.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java
- copied, changed from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeContextPartition.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java
- copied, changed from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmContextPartition.java
directory/apacheds/trunk/core/src/test/org/apache/ldap/server/configuration/DirectoryPartitionConfigurationTest.java
- copied, changed from r307049, directory/apacheds/trunk/core/src/test/org/apache/ldap/server/configuration/ContextPartitionConfigurationTest.java
Removed:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AddContextPartitionConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableContextPartitionConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/RemoveContextPartitionConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextPartitionNexusProxy.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractContextPartition.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/ContextPartition.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/ContextPartitionNexus.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeContextPartition.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmContextPartition.java
directory/apacheds/trunk/core/src/test/org/apache/ldap/server/configuration/ContextPartitionConfigurationTest.java
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/event/EventService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/NextInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Invocation.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeSearchResultEnumeration.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DefaultOptimizer.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DefaultSearchEngine.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ExpressionEnumerator.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ExpressionEvaluator.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/LeafEvaluator.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ScopeEnumerator.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ScopeEvaluator.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SubstringEnumerator.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SubstringEvaluator.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryNode.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/MainFrame.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/PartitionViewer.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java
directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/support/MaxImmSubFilterTest.java
directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/MixedCaseTest.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java Fri Oct 7 03:38:21 2005
@@ -23,11 +23,11 @@
import org.apache.ldap.server.configuration.AuthenticatorConfiguration;
import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.jndi.ServerContext;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
/**
- * Authenticates users who access {@link ContextPartitionNexus}.
+ * Authenticates users who access {@link DirectoryPartitionNexus}.
* <p>
* {@link Authenticator}s are registered to and configured by
* {@link AuthenticationService} interceptor.
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java Fri Oct 7 03:38:21 2005
@@ -27,7 +27,7 @@
import org.apache.ldap.common.util.ArrayUtils;
import org.apache.ldap.common.aci.AuthenticationLevel;
import org.apache.ldap.server.jndi.ServerContext;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
/**
@@ -88,7 +88,7 @@
LdapName principalDn = new LdapName( principal );
- ContextPartitionNexus nexus = getFactoryConfiguration().getPartitionNexus();
+ DirectoryPartitionNexus nexus = getFactoryConfiguration().getPartitionNexus();
Attributes userEntry;
try
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java Fri Oct 7 03:38:21 2005
@@ -23,7 +23,7 @@
import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.jndi.ServerContext;
import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.apache.ldap.server.authz.support.ACDFEngine;
import org.apache.ldap.server.invocation.InvocationStack;
import org.apache.ldap.server.authn.LdapPrincipal;
@@ -114,7 +114,7 @@
}
/** the partition nexus */
- private ContextPartitionNexus nexus;
+ private DirectoryPartitionNexus nexus;
/** a tupleCache that responds to add, delete, and modify attempts */
private TupleCache tupleCache;
/** a groupCache that responds to add, delete, and modify attempts */
@@ -294,7 +294,7 @@
{
// Access the principal requesting the operation, and bypass checks if it is the admin
LdapPrincipal user = ( ( ServerContext ) InvocationStack.getInstance().peek().getCaller() ).getPrincipal();
- if ( user.getName().equalsIgnoreCase( ContextPartitionNexus.ADMIN_PRINCIPAL ) || ! enabled )
+ if ( user.getName().equalsIgnoreCase( DirectoryPartitionNexus.ADMIN_PRINCIPAL ) || ! enabled )
{
next.add( upName, normName, entry );
tupleCache.subentryAdded( upName, normName, entry );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java Fri Oct 7 03:38:21 2005
@@ -23,7 +23,7 @@
import org.apache.ldap.common.filter.BranchNode;
import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,7 +58,7 @@
/** String key for the DN of a group to a Set (HashSet) for the Strings of member DNs */
private final Map groups = new HashMap();
/** a handle on the partition nexus */
- private final ContextPartitionNexus nexus;
+ private final DirectoryPartitionNexus nexus;
/** the env to use for searching */
private final Hashtable env;
/** the normalizing Dn parser for member names */
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java Fri Oct 7 03:38:21 2005
@@ -41,13 +41,13 @@
import org.apache.ldap.server.invocation.InvocationStack;
import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.jndi.ServerContext;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
/**
- * An {@link Interceptor} that controls access to {@link ContextPartitionNexus}.
+ * An {@link Interceptor} that controls access to {@link DirectoryPartitionNexus}.
* If a user tries to perform any operations that requires
* permission he or she doesn't have, {@link NoPermissionException} will be
* thrown and therefore the current invocation chain will terminate.
@@ -60,17 +60,17 @@
/**
* the administrator's distinguished {@link Name}
*/
- private static final Name ADMIN_DN = ContextPartitionNexus.getAdminName();
+ private static final Name ADMIN_DN = DirectoryPartitionNexus.getAdminName();
/**
* the base distinguished {@link Name} for all users
*/
- private static final Name USER_BASE_DN = ContextPartitionNexus.getUsersBaseName();
+ private static final Name USER_BASE_DN = DirectoryPartitionNexus.getUsersBaseName();
/**
* the base distinguished {@link Name} for all groups
*/
- private static final Name GROUP_BASE_DN = ContextPartitionNexus.getGroupsBaseName();
+ private static final Name GROUP_BASE_DN = DirectoryPartitionNexus.getGroupsBaseName();
/**
* the name parser used by this service
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java Fri Oct 7 03:38:21 2005
@@ -38,7 +38,7 @@
import org.apache.ldap.common.message.ResultCodeEnum;
import org.apache.ldap.common.name.LdapName;
import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,7 +69,7 @@
/** a map of strings to ACITuple collections */
private final Map tuples = new HashMap();
/** a handle on the partition nexus */
- private final ContextPartitionNexus nexus;
+ private final DirectoryPartitionNexus nexus;
/** a normalizing ACIItem parser */
private final ACIItemParser aciParser;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java Fri Oct 7 03:38:21 2005
@@ -21,7 +21,7 @@
import org.apache.ldap.server.interceptor.NextInterceptor;
import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
import org.apache.ldap.server.subtree.SubentryService;
import org.apache.ldap.server.invocation.InvocationStack;
@@ -71,7 +71,7 @@
};
private AttributeTypeRegistry registry = null;
- private ContextPartitionNexus nexus = null;
+ private DirectoryPartitionNexus nexus = null;
public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AddDirectoryPartitionConfiguration.java (from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AddContextPartitionConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AddDirectoryPartitionConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AddDirectoryPartitionConfiguration.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AddContextPartitionConfiguration.java&r1=307049&r2=307079&rev=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AddContextPartitionConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AddDirectoryPartitionConfiguration.java Fri Oct 7 03:38:21 2005
@@ -18,39 +18,39 @@
*/
package org.apache.ldap.server.configuration;
-import org.apache.ldap.server.partition.ContextPartition;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartition;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
/**
- * A {@link Configuration} that adds a new {@link ContextPartition} to
- * the current {@link ContextPartitionNexus}.
+ * A {@link Configuration} that adds a new {@link DirectoryPartition} to
+ * the current {@link DirectoryPartitionNexus}.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class AddContextPartitionConfiguration extends Configuration
+public class AddDirectoryPartitionConfiguration extends Configuration
{
private static final long serialVersionUID = -6690435863387769527L;
- private final ContextPartitionConfiguration contextPartitionConfiguration;
+ private final DirectoryPartitionConfiguration directoryPartitionConfiguration;
- public AddContextPartitionConfiguration( ContextPartitionConfiguration contextPartitionConfiguration )
+ public AddDirectoryPartitionConfiguration( DirectoryPartitionConfiguration directoryPartitionConfiguration )
{
- if( contextPartitionConfiguration == null )
+ if( directoryPartitionConfiguration == null )
{
- throw new NullPointerException( "contextPartitionConfiguration" );
+ throw new NullPointerException( "directoryPartitionConfiguration" );
}
- this.contextPartitionConfiguration = contextPartitionConfiguration;
+ this.directoryPartitionConfiguration = directoryPartitionConfiguration;
}
- public ContextPartitionConfiguration getContextPartitionConfiguration()
+ public DirectoryPartitionConfiguration getDirectoryPartitionConfiguration()
{
- return contextPartitionConfiguration;
+ return directoryPartitionConfiguration;
}
public void validate()
{
- contextPartitionConfiguration.validate();
+ directoryPartitionConfiguration.validate();
}
}
Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/DirectoryPartitionConfiguration.java (from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/DirectoryPartitionConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/DirectoryPartitionConfiguration.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java&r1=307049&r2=307079&rev=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/DirectoryPartitionConfiguration.java Fri Oct 7 03:38:21 2005
@@ -30,18 +30,18 @@
import org.apache.ldap.common.name.LdapName;
import org.apache.ldap.common.schema.Normalizer;
-import org.apache.ldap.server.partition.ContextPartition;
-import org.apache.ldap.server.partition.impl.btree.jdbm.JdbmContextPartition;
+import org.apache.ldap.server.partition.DirectoryPartition;
+import org.apache.ldap.server.partition.impl.btree.jdbm.JdbmDirectoryPartition;
import org.apache.ldap.server.schema.MatchingRuleRegistry;
/**
- * A configuration for {@link ContextPartition}.
+ * A configuration for {@link DirectoryPartition}.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class ContextPartitionConfiguration
+public class DirectoryPartitionConfiguration
{
/** The name of reserved system partition */
public static final String SYSTEM_PARTITION_NAME = "system";
@@ -50,17 +50,17 @@
private String suffix;
private Set indexedAttributes = new HashSet(); // Set<String>
private Attributes contextEntry = new BasicAttributes( true );
- private ContextPartition contextPartition = new JdbmContextPartition();
+ private DirectoryPartition contextPartition = new JdbmDirectoryPartition();
/**
* Creates a new instance.
*/
- protected ContextPartitionConfiguration()
+ protected DirectoryPartitionConfiguration()
{
}
/**
- * Returns user-defined name of the {@link ContextPartition} that
+ * Returns user-defined name of the {@link DirectoryPartition} that
* this configuration configures.
*/
public String getName()
@@ -69,7 +69,7 @@
}
/**
- * Sets user-defined name of the {@link ContextPartition} that
+ * Sets user-defined name of the {@link DirectoryPartition} that
* this configuration configures.
*/
protected void setName( String name )
@@ -106,17 +106,17 @@
}
/**
- * Returns the {@link ContextPartition} that this configuration configures.
+ * Returns the {@link DirectoryPartition} that this configuration configures.
*/
- public ContextPartition getContextPartition()
+ public DirectoryPartition getContextPartition()
{
return contextPartition;
}
/**
- * Sets the {@link ContextPartition} that this configuration configures.
+ * Sets the {@link DirectoryPartition} that this configuration configures.
*/
- protected void setContextPartition( ContextPartition partition )
+ protected void setContextPartition( DirectoryPartition partition )
{
if( partition == null )
{
@@ -126,7 +126,7 @@
}
/**
- * Returns root entry that will be added to the {@link ContextPartition}
+ * Returns root entry that will be added to the {@link DirectoryPartition}
* after it is initialized.
*/
public Attributes getContextEntry()
@@ -135,7 +135,7 @@
}
/**
- * Sets root entry that will be added to the {@link ContextPartition}
+ * Sets root entry that will be added to the {@link DirectoryPartition}
* after it is initialized.
*/
protected void setContextEntry( Attributes rootEntry )
@@ -144,7 +144,7 @@
}
/**
- * Returns the suffix of the {@link ContextPartition}.
+ * Returns the suffix of the {@link DirectoryPartition}.
*/
public String getSuffix()
{
@@ -152,7 +152,7 @@
}
/**
- * Returns the normalized suffix of the {@link ContextPartition}.
+ * Returns the normalized suffix of the {@link DirectoryPartition}.
*/
public Name getNormalizedSuffix( MatchingRuleRegistry matchingRuleRegistry ) throws NamingException
{
@@ -160,7 +160,7 @@
}
/**
- * Returns the normalized suffix of the {@link ContextPartition}.
+ * Returns the normalized suffix of the {@link DirectoryPartition}.
*/
public Name getNormalizedSuffix( Normalizer normalizer ) throws NamingException
{
@@ -168,7 +168,7 @@
}
/**
- * Sets the suffix of the {@link ContextPartition}.
+ * Sets the suffix of the {@link DirectoryPartition}.
*/
protected void setSuffix( String suffix )
{
Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableDirectoryPartitionConfiguration.java (from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableContextPartitionConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableDirectoryPartitionConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableDirectoryPartitionConfiguration.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableContextPartitionConfiguration.java&r1=307049&r2=307079&rev=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableContextPartitionConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableDirectoryPartitionConfiguration.java Fri Oct 7 03:38:21 2005
@@ -22,21 +22,21 @@
import javax.naming.directory.Attributes;
-import org.apache.ldap.server.partition.ContextPartition;
+import org.apache.ldap.server.partition.DirectoryPartition;
/**
- * A mutable version of {@link ContextPartitionConfiguration}.
+ * A mutable version of {@link DirectoryPartitionConfiguration}.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class MutableContextPartitionConfiguration extends
- ContextPartitionConfiguration
+public class MutableDirectoryPartitionConfiguration extends
+ DirectoryPartitionConfiguration
{
/**
* Creates a new instance.
*/
- public MutableContextPartitionConfiguration()
+ public MutableDirectoryPartitionConfiguration()
{
}
@@ -50,7 +50,7 @@
super.setIndexedAttributes( indexedAttributes );
}
- public void setContextPartition( ContextPartition partition )
+ public void setContextPartition( DirectoryPartition partition )
{
super.setContextPartition( partition );
}
Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/RemoveDirectoryPartitionConfiguration.java (from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/RemoveContextPartitionConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/RemoveDirectoryPartitionConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/RemoveDirectoryPartitionConfiguration.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/RemoveContextPartitionConfiguration.java&r1=307049&r2=307079&rev=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/RemoveContextPartitionConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/RemoveDirectoryPartitionConfiguration.java Fri Oct 7 03:38:21 2005
@@ -22,28 +22,28 @@
import javax.naming.NamingException;
import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.partition.ContextPartition;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartition;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
/**
- * A {@link Configuration} that removed the attached {@link ContextPartition} in
- * the current {@link ContextPartitionNexus}.
+ * A {@link Configuration} that removed the attached {@link DirectoryPartition} in
+ * the current {@link DirectoryPartitionNexus}.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class RemoveContextPartitionConfiguration extends Configuration
+public class RemoveDirectoryPartitionConfiguration extends Configuration
{
private static final long serialVersionUID = -6690435863387769527L;
private final Name suffix;
- public RemoveContextPartitionConfiguration( String suffix ) throws NamingException
+ public RemoveDirectoryPartitionConfiguration( String suffix ) throws NamingException
{
this( new LdapName( suffix.trim() ) );
}
- public RemoveContextPartitionConfiguration( Name suffix )
+ public RemoveDirectoryPartitionConfiguration( Name suffix )
{
if( suffix == null )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java Fri Oct 7 03:38:21 2005
@@ -236,7 +236,7 @@
}
/**
- * Returns {@link ContextPartitionConfiguration}s to configure context partitions.
+ * Returns {@link DirectoryPartitionConfiguration}s to configure context partitions.
*/
public Set getContextPartitionConfigurations()
{
@@ -244,18 +244,18 @@
}
/**
- * Sets {@link ContextPartitionConfiguration}s to configure context partitions.
+ * Sets {@link DirectoryPartitionConfiguration}s to configure context partitions.
*/
protected void setContextPartitionConfigurations( Set contextParitionConfigurations )
{
Set newSet = ConfigurationUtil.getTypeSafeSet(
- contextParitionConfigurations, ContextPartitionConfiguration.class );
+ contextParitionConfigurations, DirectoryPartitionConfiguration.class );
Set names = new HashSet();
Iterator i = newSet.iterator();
while( i.hasNext() )
{
- ContextPartitionConfiguration cfg = ( ContextPartitionConfiguration ) i.next();
+ DirectoryPartitionConfiguration cfg = ( DirectoryPartitionConfiguration ) i.next();
cfg.validate();
String name = cfg.getName();
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/event/EventService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/event/EventService.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/event/EventService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/event/EventService.java Fri Oct 7 03:38:21 2005
@@ -23,7 +23,7 @@
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.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.apache.ldap.common.filter.ExprNode;
import org.apache.ldap.common.filter.ScopeNode;
import org.apache.ldap.common.filter.BranchNode;
@@ -48,7 +48,7 @@
*/
public class EventService extends BaseInterceptor
{
- private ContextPartitionNexus nexus;
+ private DirectoryPartitionNexus nexus;
private Map sources = new HashMap();
private Evaluator evaluator = null;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java Fri Oct 7 03:38:21 2005
@@ -32,13 +32,13 @@
import org.apache.ldap.server.interceptor.BaseInterceptor;
import org.apache.ldap.server.interceptor.NextInterceptor;
import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
-import org.apache.ldap.server.partition.ContextPartition;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartition;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
/**
* An {@link org.apache.ldap.server.interceptor.Interceptor} that detects any operations that breaks integrity
- * of {@link ContextPartition} and terminates the current invocation chain by
+ * 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.
*
@@ -47,7 +47,7 @@
*/
public class ExceptionService extends BaseInterceptor
{
- private ContextPartitionNexus nexus;
+ private DirectoryPartitionNexus nexus;
/**
* Creates an interceptor that is also the exception handling service.
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java Fri Oct 7 03:38:21 2005
@@ -31,7 +31,7 @@
import org.apache.ldap.common.filter.ExprNode;
import org.apache.ldap.server.authn.LdapPrincipal;
-import org.apache.ldap.server.configuration.ContextPartitionConfiguration;
+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.ContextFactoryConfiguration;
@@ -195,7 +195,7 @@
return next.search( base, env, filter, searchCtls );
}
- public void addContextPartition( NextInterceptor next, ContextPartitionConfiguration cfg ) throws NamingException
+ public void addContextPartition( NextInterceptor next, DirectoryPartitionConfiguration cfg ) throws NamingException
{
next.addContextPartition( cfg );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java Fri Oct 7 03:38:21 2005
@@ -28,16 +28,16 @@
import javax.naming.directory.SearchControls;
import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.configuration.ContextPartitionConfiguration;
+import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
import org.apache.ldap.server.configuration.InterceptorConfiguration;
import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
-import org.apache.ldap.server.partition.ContextPartition;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartition;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
/**
- * Filters invocations on {@link ContextPartitionNexus}. {@link Interceptor}
- * filters most method calls performed on {@link ContextPartitionNexus} just
+ * Filters invocations on {@link DirectoryPartitionNexus}. {@link Interceptor}
+ * filters most method calls performed on {@link DirectoryPartitionNexus} just
* like Servlet filters do.
* <p/>
* <h2>Interceptor Chaining</h2>
@@ -113,102 +113,102 @@
void destroy();
/**
- * Filters {@link ContextPartitionNexus#getRootDSE()} call.
+ * Filters {@link DirectoryPartitionNexus#getRootDSE()} call.
*/
Attributes getRootDSE( NextInterceptor next ) throws NamingException;
/**
- * Filters {@link ContextPartitionNexus#getMatchedName(Name, boolean)} call.
+ * Filters {@link DirectoryPartitionNexus#getMatchedName(Name, boolean)} call.
*/
Name getMatchedName( NextInterceptor next, Name name, boolean normalized ) throws NamingException;
/**
- * Filters {@link ContextPartitionNexus#getSuffix(Name, boolean)} call.
+ * Filters {@link DirectoryPartitionNexus#getSuffix(Name, boolean)} call.
*/
Name getSuffix( NextInterceptor next, Name name, boolean normalized ) throws NamingException;
/**
- * Filters {@link ContextPartitionNexus#listSuffixes(boolean)} call.
+ * Filters {@link DirectoryPartitionNexus#listSuffixes(boolean)} call.
*/
Iterator listSuffixes( NextInterceptor next, boolean normalized ) throws NamingException;
/**
- * Filters {@link ContextPartitionNexus#addContextPartition(ContextPartitionConfiguration)} call.
+ * Filters {@link DirectoryPartitionNexus#addContextPartition(DirectoryPartitionConfiguration)} call.
*/
- void addContextPartition( NextInterceptor next, ContextPartitionConfiguration cfg ) throws NamingException;
+ void addContextPartition( NextInterceptor next, DirectoryPartitionConfiguration cfg ) throws NamingException;
/**
- * Filters {@link ContextPartitionNexus#removeContextPartition(Name)} call.
+ * Filters {@link DirectoryPartitionNexus#removeContextPartition(Name)} call.
*/
void removeContextPartition( NextInterceptor next, Name suffix ) throws NamingException;
/**
- * Filters {@link ContextPartitionNexus#compare(Name,String,Object)} call.
+ * Filters {@link DirectoryPartitionNexus#compare(Name,String,Object)} call.
*/
boolean compare( NextInterceptor next, Name name, String oid, Object value ) throws NamingException;
/**
- * Filters {@link ContextPartition#delete(Name)} call.
+ * Filters {@link DirectoryPartition#delete(Name)} call.
*/
void delete( NextInterceptor next, Name name ) throws NamingException;
/**
- * Filters {@link ContextPartition#add(String, Name, Attributes)} call.
+ * Filters {@link DirectoryPartition#add(String, Name, Attributes)} call.
*/
void add( NextInterceptor next, String userProvidedName, Name normalizedName, Attributes entry ) throws NamingException;
/**
- * Filters {@link ContextPartition#modify(Name, int, Attributes)} call.
+ * Filters {@link DirectoryPartition#modify(Name, int, Attributes)} call.
*/
void modify( NextInterceptor next, Name name, int modOp, Attributes attributes ) throws NamingException;
/**
- * Filters {@link ContextPartition#modify(Name, ModificationItem[])} call.
+ * Filters {@link DirectoryPartition#modify(Name, ModificationItem[])} call.
*/
void modify( NextInterceptor next, Name name, ModificationItem [] items ) throws NamingException;
/**
- * Filters {@link ContextPartition#list(Name)} call.
+ * Filters {@link DirectoryPartition#list(Name)} call.
*/
NamingEnumeration list( NextInterceptor next, Name baseName ) throws NamingException;
/**
- * Filters {@link ContextPartition#search(Name, Map, ExprNode, SearchControls)} call.
+ * Filters {@link DirectoryPartition#search(Name, Map, ExprNode, SearchControls)} call.
*/
NamingEnumeration search( NextInterceptor next, Name baseName, Map environment, ExprNode filter,
SearchControls searchControls ) throws NamingException;
/**
- * Filters {@link ContextPartition#lookup(Name)} call.
+ * Filters {@link DirectoryPartition#lookup(Name)} call.
*/
Attributes lookup( NextInterceptor next, Name name ) throws NamingException;
/**
- * Filters {@link ContextPartition#lookup(Name, String[])} call.
+ * Filters {@link DirectoryPartition#lookup(Name, String[])} call.
*/
Attributes lookup( NextInterceptor next, Name dn, String [] attrIds ) throws NamingException;
/**
- * Filters {@link ContextPartition#lookup(Name, String[])} call.
+ * Filters {@link DirectoryPartition#lookup(Name, String[])} call.
*/
boolean hasEntry( NextInterceptor next, Name name ) throws NamingException;
/**
- * Filters {@link ContextPartition#isSuffix(Name)} call.
+ * Filters {@link DirectoryPartition#isSuffix(Name)} call.
*/
boolean isSuffix( NextInterceptor next, Name name ) throws NamingException;
/**
- * Filters {@link ContextPartition#modifyRn(Name, String, boolean)} call.
+ * Filters {@link DirectoryPartition#modifyRn(Name, String, boolean)} call.
*/
void modifyRn( NextInterceptor next, Name name, String newRn, boolean deleteOldRn ) throws NamingException;
/**
- * Filters {@link ContextPartition#move(Name, Name)} call.
+ * Filters {@link DirectoryPartition#move(Name, Name)} call.
*/
void move( NextInterceptor next, Name oldName, Name newParentName ) throws NamingException;
/**
- * Filters {@link ContextPartition#move(Name, Name, String, boolean)} call.
+ * Filters {@link DirectoryPartition#move(Name, Name, String, boolean)} call.
*/
void move( NextInterceptor next, Name oldName, Name newParentName, String newRn,
boolean deleteOldRn ) throws NamingException;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java Fri Oct 7 03:38:21 2005
@@ -33,11 +33,11 @@
import javax.naming.directory.SearchControls;
import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.configuration.ContextPartitionConfiguration;
+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.jndi.ContextFactoryConfiguration;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,7 +54,7 @@
private final Interceptor FINAL_INTERCEPTOR = new Interceptor()
{
- private ContextPartitionNexus nexus;
+ private DirectoryPartitionNexus nexus;
public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg )
{
@@ -176,7 +176,7 @@
}
- public void addContextPartition( NextInterceptor next, ContextPartitionConfiguration cfg ) throws NamingException
+ public void addContextPartition( NextInterceptor next, DirectoryPartitionConfiguration cfg ) throws NamingException
{
nexus.addContextPartition( cfg );
}
@@ -552,7 +552,7 @@
}
}
- public void addContextPartition( ContextPartitionConfiguration cfg ) throws NamingException
+ public void addContextPartition( DirectoryPartitionConfiguration cfg ) throws NamingException
{
Interceptor head = this.head.configuration.getInterceptor();
NextInterceptor next = this.head.nextInterceptor;
@@ -1206,7 +1206,7 @@
}
}
- public void addContextPartition( ContextPartitionConfiguration cfg ) throws NamingException
+ public void addContextPartition( DirectoryPartitionConfiguration cfg ) throws NamingException
{
Interceptor interceptor = Entry.this.nextEntry.configuration.getInterceptor();
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/NextInterceptor.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/NextInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/NextInterceptor.java Fri Oct 7 03:38:21 2005
@@ -28,8 +28,8 @@
import javax.naming.directory.SearchControls;
import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.configuration.ContextPartitionConfiguration;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
/**
@@ -64,11 +64,11 @@
*/
Iterator listSuffixes( boolean normalized ) throws NamingException;
/**
- * Calls the next interceptor's {@link ContextPartitionNexus#addContextPartition(ContextPartitionConfiguration)}.
+ * Calls the next interceptor's {@link DirectoryPartitionNexus#addContextPartition(DirectoryPartitionConfiguration)}.
*/
- void addContextPartition( ContextPartitionConfiguration cfg ) throws NamingException;
+ void addContextPartition( DirectoryPartitionConfiguration cfg ) throws NamingException;
/**
- * Calls the next interceptor's {@link ContextPartitionNexus#removeContextPartition(Name)}.
+ * Calls the next interceptor's {@link DirectoryPartitionNexus#removeContextPartition(Name)}.
*/
void removeContextPartition( Name suffix ) throws NamingException;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Invocation.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Invocation.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Invocation.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/invocation/Invocation.java Fri Oct 7 03:38:21 2005
@@ -23,11 +23,11 @@
import javax.naming.Context;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
/**
- * Represents a call from JNDI {@link Context} to {@link ContextPartitionNexus}.
+ * Represents a call from JNDI {@link Context} to {@link DirectoryPartitionNexus}.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java Fri Oct 7 03:38:21 2005
@@ -25,9 +25,9 @@
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
-import org.apache.ldap.server.configuration.AddContextPartitionConfiguration;
+import org.apache.ldap.server.configuration.AddDirectoryPartitionConfiguration;
import org.apache.ldap.server.configuration.Configuration;
-import org.apache.ldap.server.configuration.RemoveContextPartitionConfiguration;
+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;
@@ -98,17 +98,17 @@
{
service.startup( this, env );
}
- else if( cfg instanceof AddContextPartitionConfiguration )
+ else if( cfg instanceof AddDirectoryPartitionConfiguration )
{
- new ContextPartitionNexusProxy(
+ new DirectoryPartitionNexusProxy(
service.getJndiContext( principal, credential, authentication, providerUrl ),
- service).addContextPartition( ( ( AddContextPartitionConfiguration ) cfg ).getContextPartitionConfiguration() );
+ service).addContextPartition( ( ( AddDirectoryPartitionConfiguration ) cfg ).getDirectoryPartitionConfiguration() );
}
- else if( cfg instanceof RemoveContextPartitionConfiguration )
+ else if( cfg instanceof RemoveDirectoryPartitionConfiguration )
{
- new ContextPartitionNexusProxy(
+ new DirectoryPartitionNexusProxy(
service.getJndiContext( principal, credential, authentication, providerUrl ),
- service).removeContextPartition( ( ( RemoveContextPartitionConfiguration ) cfg ).getSuffix() );
+ service).removeContextPartition( ( ( RemoveDirectoryPartitionConfiguration ) cfg ).getSuffix() );
}
else if( service == null )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java Fri Oct 7 03:38:21 2005
@@ -22,7 +22,7 @@
import org.apache.ldap.server.configuration.StartupConfiguration;
import org.apache.ldap.server.interceptor.InterceptorChain;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.apache.ldap.server.schema.GlobalRegistries;
/**
@@ -65,10 +65,10 @@
GlobalRegistries getGlobalRegistries();
/**
- * Returns the {@link ContextPartitionNexus} of the {@link ContextFactoryService}
+ * Returns the {@link DirectoryPartitionNexus} of the {@link ContextFactoryService}
* which bypasses the interceptor chain.
*/
- ContextPartitionNexus getPartitionNexus();
+ DirectoryPartitionNexus getPartitionNexus();
/**
* Returns the interceptor chain of the {@link ContextFactoryService}.
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryService.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryService.java Fri Oct 7 03:38:21 2005
@@ -27,7 +27,7 @@
import javax.naming.NamingException;
import org.apache.ldap.server.configuration.Configuration;
-import org.apache.ldap.server.partition.ContextPartition;
+import org.apache.ldap.server.partition.DirectoryPartition;
/**
* Provides JNDI service to {@link AbstractContextFactory}.
@@ -90,7 +90,7 @@
public abstract void shutdown() throws NamingException;
/**
- * Calls {@link ContextPartition#sync()} for all registered {@link ContextPartition}s.
+ * Calls {@link DirectoryPartition#sync()} for all registered {@link DirectoryPartition}s.
* @throws NamingException if synchronization failed
*/
public abstract void sync() throws NamingException;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java Fri Oct 7 03:38:21 2005
@@ -23,7 +23,7 @@
import org.apache.ldap.server.configuration.StartupConfiguration;
import org.apache.ldap.server.interceptor.InterceptorChain;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.apache.ldap.server.schema.GlobalRegistries;
@@ -72,7 +72,7 @@
return parent.getGlobalRegistries();
}
- public ContextPartitionNexus getPartitionNexus()
+ public DirectoryPartitionNexus getPartitionNexus()
{
return parent.getPartitionNexus();
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java Fri Oct 7 03:38:21 2005
@@ -40,8 +40,8 @@
import org.apache.ldap.server.configuration.ConfigurationException;
import org.apache.ldap.server.configuration.StartupConfiguration;
import org.apache.ldap.server.interceptor.InterceptorChain;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
-import org.apache.ldap.server.partition.DefaultContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
+import org.apache.ldap.server.partition.DefaultDirectoryPartitionNexus;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
import org.apache.ldap.server.schema.GlobalRegistries;
@@ -78,7 +78,7 @@
private GlobalRegistries globalRegistries;
/** the root nexus */
- private DefaultContextPartitionNexus partitionNexus;
+ private DefaultDirectoryPartitionNexus partitionNexus;
/** whether or not server is started for the first time */
private boolean firstStart;
@@ -281,7 +281,7 @@
return globalRegistries;
}
- public ContextPartitionNexus getPartitionNexus()
+ public DirectoryPartitionNexus getPartitionNexus()
{
return partitionNexus;
}
@@ -384,7 +384,7 @@
/*
* If the admin entry is there, then the database was already created
*/
- if ( !partitionNexus.hasEntry( ContextPartitionNexus.getAdminName() ) )
+ if ( !partitionNexus.hasEntry( DirectoryPartitionNexus.getAdminName() ) )
{
checkPermissionToCreateBootstrapEntries();
firstStart = true;
@@ -397,16 +397,16 @@
objectClass.add( "inetOrgPerson" );
attributes.put( objectClass );
- attributes.put( "uid", ContextPartitionNexus.ADMIN_UID );
+ attributes.put( "uid", DirectoryPartitionNexus.ADMIN_UID );
attributes.put( "userPassword", environment.get( Context.SECURITY_CREDENTIALS ) );
attributes.put( "displayName", "Directory Superuser" );
attributes.put( "cn", "system administrator" );
attributes.put( "sn", "administrator" );
- attributes.put( "creatorsName", ContextPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
attributes.put( "displayName", "Directory Superuser" );
- partitionNexus.add( ContextPartitionNexus.ADMIN_PRINCIPAL, ContextPartitionNexus.getAdminName(), attributes );
+ partitionNexus.add( DirectoryPartitionNexus.ADMIN_PRINCIPAL, DirectoryPartitionNexus.getAdminName(), attributes );
}
// -------------------------------------------------------------------
@@ -425,7 +425,7 @@
attributes.put( objectClass );
attributes.put( "ou", "users" );
- attributes.put( "creatorsName", ContextPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
partitionNexus.add( "ou=users,ou=system", new LdapName( "ou=users,ou=system" ), attributes );
@@ -447,7 +447,7 @@
attributes.put( objectClass );
attributes.put( "ou", "groups" );
- attributes.put( "creatorsName", ContextPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
partitionNexus.add( "ou=groups,ou=system", new LdapName( "ou=groups,ou=system" ), attributes );
@@ -470,8 +470,8 @@
objectClass.add( "groupOfUniqueNames" );
attributes.put( objectClass );
attributes.put( "cn", "Administrators" );
- attributes.put( "uniqueMember", ContextPartitionNexus.ADMIN_PRINCIPAL );
- attributes.put( "creatorsName", ContextPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "uniqueMember", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
partitionNexus.add( upName, normName, attributes );
@@ -495,7 +495,7 @@
attributes.put( objectClass );
attributes.put( "ou", "configuration" );
- attributes.put( "creatorsName", ContextPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
partitionNexus.add( "ou=configuration,ou=system", new LdapName( "ou=configuration,ou=system" ), attributes );
@@ -517,7 +517,7 @@
attributes.put( objectClass );
attributes.put( "ou", "partitions" );
- attributes.put( "creatorsName", ContextPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
partitionNexus.add( "ou=partitions,ou=configuration,ou=system",
@@ -540,7 +540,7 @@
attributes.put( objectClass );
attributes.put( "ou", "services" );
- attributes.put( "creatorsName", ContextPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
partitionNexus.add( "ou=services,ou=configuration,ou=system",
@@ -563,7 +563,7 @@
attributes.put( objectClass );
attributes.put( "ou", "interceptors" );
- attributes.put( "creatorsName", ContextPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
partitionNexus.add( "ou=interceptors,ou=configuration,ou=system",
@@ -587,7 +587,7 @@
attributes.put( "objectClass", "extensibleObject" );
attributes.put( "prefNodeName", "sysPrefRoot" );
- attributes.put( "creatorsName", ContextPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
LdapName dn = new LdapName( "prefNodeName=sysPrefRoot,ou=system" );
@@ -601,10 +601,10 @@
private void checkPermissionToCreateBootstrapEntries() throws NamingException
{
String principal = ( String ) environment.get( Context.SECURITY_PRINCIPAL );
- if( principal == null || !ContextPartitionNexus.ADMIN_PRINCIPAL.equals( principal ) )
+ if( principal == null || !DirectoryPartitionNexus.ADMIN_PRINCIPAL.equals( principal ) )
{
throw new NoPermissionException(
- "Only '" + ContextPartitionNexus.ADMIN_PRINCIPAL + "' can initiate the first run." );
+ "Only '" + DirectoryPartitionNexus.ADMIN_PRINCIPAL + "' can initiate the first run." );
}
}
@@ -622,7 +622,7 @@
while( i.hasNext() )
{
Attributes entry = ( Attributes ) i.next();
- entry.put( "creatorsName", ContextPartitionNexus.ADMIN_PRINCIPAL );
+ entry.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
entry.put( "createTimestamp", DateUtils.getGeneralizedTime() );
Attribute dn = ( Attribute ) entry.get( "dn" ).clone();
@@ -663,7 +663,7 @@
globalRegistries = new GlobalRegistries( bootstrapRegistries );
- partitionNexus = new DefaultContextPartitionNexus( new LockableAttributesImpl() );
+ partitionNexus = new DefaultDirectoryPartitionNexus( new LockableAttributesImpl() );
partitionNexus.init( configuration, null );
interceptorChain = new InterceptorChain();
Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DirectoryPartitionNexusProxy.java (from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextPartitionNexusProxy.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DirectoryPartitionNexusProxy.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DirectoryPartitionNexusProxy.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextPartitionNexusProxy.java&r1=307049&r2=307079&rev=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextPartitionNexusProxy.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DirectoryPartitionNexusProxy.java Fri Oct 7 03:38:21 2005
@@ -33,17 +33,17 @@
import javax.naming.ldap.LdapContext;
import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.configuration.ContextPartitionConfiguration;
+import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
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.partition.ContextPartition;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartition;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.apache.ldap.server.event.EventService;
/**
- * A decorator that wraps other {@link ContextPartitionNexus} to enable
+ * A decorator that wraps other {@link DirectoryPartitionNexus} to enable
* {@link InterceptorChain} and {@link InvocationStack} support.
* All {@link Invocation}s made to this nexus is automatically pushed to
* {@link InvocationStack} of the current thread, and popped when
@@ -52,7 +52,7 @@
* @author The Apache Directory Project
* @version $Rev$, $Date$
*/
-class ContextPartitionNexusProxy extends ContextPartitionNexus
+class DirectoryPartitionNexusProxy extends DirectoryPartitionNexus
{
private final Context caller;
private final ContextFactoryService service;
@@ -64,7 +64,7 @@
* @param caller a JNDI {@link Context} object that will call this proxy
* @param service a JNDI service
*/
- ContextPartitionNexusProxy( Context caller, ContextFactoryService service )
+ DirectoryPartitionNexusProxy( Context caller, ContextFactoryService service )
{
this.caller = caller;
this.service = service;
@@ -75,7 +75,7 @@
return this.configuration.getPartitionNexus().getLdapContext();
}
- public void init( ContextFactoryConfiguration factoryCfg, ContextPartitionConfiguration cfg )
+ public void init( ContextFactoryConfiguration factoryCfg, DirectoryPartitionConfiguration cfg )
{
}
@@ -83,7 +83,7 @@
{
}
- public ContextPartition getSystemPartition()
+ public DirectoryPartition getSystemPartition()
{
return this.configuration.getPartitionNexus().getSystemPartition();
}
@@ -393,7 +393,7 @@
}
}
- public void addContextPartition( ContextPartitionConfiguration config ) throws NamingException
+ public void addContextPartition( DirectoryPartitionConfiguration config ) throws NamingException
{
ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java Fri Oct 7 03:38:21 2005
@@ -51,7 +51,7 @@
import org.apache.ldap.common.util.NamespaceTools;
import org.apache.ldap.server.authn.AuthenticationService;
import org.apache.ldap.server.authn.LdapPrincipal;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
/**
@@ -66,7 +66,7 @@
public static final String DELETE_OLD_RDN_PROP = "java.naming.ldap.deleteRDN";
/** The interceptor proxy to the backend nexus */
- private final ContextPartitionNexus nexusProxy;
+ private final DirectoryPartitionNexus nexusProxy;
/** The cloned environment used by this Context */
private final Hashtable env;
@@ -102,7 +102,7 @@
protected ServerContext( ContextFactoryService service, Hashtable env ) throws NamingException
{
// set references to cloned env and the proxy
- this.nexusProxy = new ContextPartitionNexusProxy( this, service );
+ this.nexusProxy = new DirectoryPartitionNexusProxy( this, service );
ContextFactoryConfiguration cfg = service.getConfiguration();
@@ -150,7 +150,7 @@
* @param env the environment properties used by this context
* @param dn the distinguished name of this context
*/
- protected ServerContext( LdapPrincipal principal, ContextPartitionNexus nexusProxy, Hashtable env, Name dn )
+ protected ServerContext( LdapPrincipal principal, DirectoryPartitionNexus nexusProxy, Hashtable env, Name dn )
{
this.dn = ( LdapName ) dn.clone();
@@ -201,7 +201,7 @@
*
* @return the proxy to the backend nexus.
*/
- protected ContextPartitionNexus getNexusProxy()
+ protected DirectoryPartitionNexus getNexusProxy()
{
return nexusProxy ;
}
@@ -231,7 +231,7 @@
Iterator list = listeners.iterator();
while ( list.hasNext() )
{
- ( ( ContextPartitionNexusProxy ) this.nexusProxy )
+ ( ( DirectoryPartitionNexusProxy ) this.nexusProxy )
.removeNamingListener( this, ( NamingListener ) list.next() );
}
}
@@ -781,7 +781,7 @@
ExprNode filter = new PresenceNode( "objectClass" );
SearchControls controls = new SearchControls();
controls.setSearchScope( scope );
- ( ( ContextPartitionNexusProxy ) this.nexusProxy )
+ ( ( DirectoryPartitionNexusProxy ) this.nexusProxy )
.addNamingListener( this, buildTarget( name ), filter, controls, namingListener );
listeners.add( namingListener );
}
@@ -795,7 +795,7 @@
public void removeNamingListener( NamingListener namingListener ) throws NamingException
{
- ( ( ContextPartitionNexusProxy ) this.nexusProxy ).removeNamingListener( this, namingListener );
+ ( ( DirectoryPartitionNexusProxy ) this.nexusProxy ).removeNamingListener( this, namingListener );
listeners.remove( namingListener );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java Fri Oct 7 03:38:21 2005
@@ -48,7 +48,7 @@
import org.apache.ldap.common.name.LdapName;
import org.apache.ldap.common.util.NamespaceTools;
import org.apache.ldap.server.authn.LdapPrincipal;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
/**
@@ -87,7 +87,7 @@
* @param env the environment properties used by this context
* @param dn the distinguished name of this context
*/
- protected ServerDirContext( LdapPrincipal principal, ContextPartitionNexus nexusProxy, Hashtable env, Name dn )
+ protected ServerDirContext( LdapPrincipal principal, DirectoryPartitionNexus nexusProxy, Hashtable env, Name dn )
{
super( principal, nexusProxy, env, dn );
}
@@ -707,7 +707,7 @@
throw e2;
}
- ( ( ContextPartitionNexusProxy ) getNexusProxy() )
+ ( ( DirectoryPartitionNexusProxy ) getNexusProxy() )
.addNamingListener( this, buildTarget( name ), filter, searchControls, namingListener );
getListeners().add( namingListener );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java Fri Oct 7 03:38:21 2005
@@ -28,7 +28,7 @@
import org.apache.ldap.common.NotImplementedException;
import org.apache.ldap.server.authn.LdapPrincipal;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
/**
@@ -67,7 +67,7 @@
* @param env the environment properties used by this context
* @param dn the distinguished name of this context
*/
- ServerLdapContext( LdapPrincipal principal, ContextPartitionNexus nexusProxy, Hashtable env, Name dn )
+ ServerLdapContext( LdapPrincipal principal, DirectoryPartitionNexus nexusProxy, Hashtable env, Name dn )
{
super( principal, nexusProxy, env, dn );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java Fri Oct 7 03:38:21 2005
@@ -34,14 +34,14 @@
import org.apache.ldap.server.interceptor.BaseInterceptor;
import org.apache.ldap.server.interceptor.NextInterceptor;
import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
/**
* A name normalization service. This service makes sure all relative and distinuished
* names are normalized before calls are made against the respective interface methods
- * on {@link ContextPartitionNexus}.
+ * on {@link DirectoryPartitionNexus}.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java Fri Oct 7 03:38:21 2005
@@ -44,7 +44,7 @@
import org.apache.ldap.server.interceptor.NextInterceptor;
import org.apache.ldap.server.invocation.InvocationStack;
import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
@@ -79,7 +79,7 @@
/**
* the root nexus of the system
*/
- private ContextPartitionNexus nexus;
+ private DirectoryPartitionNexus nexus;
private AttributeTypeRegistry registry;
Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java (from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractContextPartition.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractContextPartition.java&r1=307049&r2=307079&rev=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractContextPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java Fri Oct 7 03:38:21 2005
@@ -29,27 +29,27 @@
import javax.naming.directory.ModificationItem;
import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.configuration.ContextPartitionConfiguration;
+import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
/**
- * A {@link ContextPartition} that helps users to implement their own partition.
+ * A {@link DirectoryPartition} that helps users to implement their own partition.
* Most methods are implemented by default. Please look at the description of
* each methods for the detail of implementations.
*
* @author The Apache Directory Project
* @version $Rev$, $Date$
*/
-public abstract class AbstractContextPartition implements ContextPartition
+public abstract class AbstractDirectoryPartition implements DirectoryPartition
{
- /** {@link ContextFactoryConfiguration} specified at {@link #init(ContextFactoryConfiguration, ContextPartitionConfiguration)}. */
+ /** {@link ContextFactoryConfiguration} specified at {@link #init(ContextFactoryConfiguration, DirectoryPartitionConfiguration)}. */
private ContextFactoryConfiguration factoryCfg;
- /** {@link ContextPartitionConfiguration} specified at {@link #init(ContextFactoryConfiguration, ContextPartitionConfiguration)}. */
- private ContextPartitionConfiguration cfg;
+ /** {@link DirectoryPartitionConfiguration} specified at {@link #init(ContextFactoryConfiguration, DirectoryPartitionConfiguration)}. */
+ private DirectoryPartitionConfiguration cfg;
/** <tt>true</tt> if and only if this partition is initialized. */
private boolean initialized;
- protected AbstractContextPartition()
+ protected AbstractDirectoryPartition()
{
}
@@ -60,7 +60,7 @@
* without any errors. {@link #destroy()} is called automatically as a clean-up process
* if {@link #doInit()} throws an exception.
*/
- public final void init( ContextFactoryConfiguration factoryCfg, ContextPartitionConfiguration cfg ) throws NamingException
+ public final void init( ContextFactoryConfiguration factoryCfg, DirectoryPartitionConfiguration cfg ) throws NamingException
{
if( initialized )
{
@@ -132,7 +132,7 @@
/**
* Returns {@link ContextFactoryConfiguration} that is provided from
- * {@link #init(ContextFactoryConfiguration, ContextPartitionConfiguration)}.
+ * {@link #init(ContextFactoryConfiguration, DirectoryPartitionConfiguration)}.
*/
public final ContextFactoryConfiguration getFactoryConfiguration()
{
@@ -140,10 +140,10 @@
}
/**
- * Returns {@link ContextPartitionConfiguration} that is provided from
- * {@link #init(ContextFactoryConfiguration, ContextPartitionConfiguration)}.
+ * Returns {@link DirectoryPartitionConfiguration} that is provided from
+ * {@link #init(ContextFactoryConfiguration, DirectoryPartitionConfiguration)}.
*/
- public final ContextPartitionConfiguration getConfiguration()
+ public final DirectoryPartitionConfiguration getConfiguration()
{
return cfg;
}
@@ -191,7 +191,7 @@
}
/**
- * This method calls {@link ContextPartition#lookup(Name, String[])}
+ * This method calls {@link DirectoryPartition#lookup(Name, String[])}
* with null <tt>attributeIds</tt> by default. Please override
* this method if there is more effective way for your implementation.
*/
@@ -202,7 +202,7 @@
/**
* This method forwards the request to
- * {@link ContextPartition#modify(Name, ModificationItem[])} after
+ * {@link DirectoryPartition#modify(Name, ModificationItem[])} after
* translating parameters to {@link ModificationItem}<tt>[]</tt> by default.
* Please override this method if there is more effactive way for your
* implementation.
@@ -222,8 +222,8 @@
}
/**
- * This method calls {@link ContextPartition#move(Name, Name)} and
- * {@link ContextPartition#modifyRn(Name, String, boolean)} subsequently
+ * This method calls {@link DirectoryPartition#move(Name, Name)} and
+ * {@link DirectoryPartition#modifyRn(Name, String, boolean)} subsequently
* by default. Please override this method if there is more effactive
* way for your implementation.
*/