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/06/20 17:43:05 UTC
svn commit: r191494 - in
/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server:
exception/ interceptor/ jndi/ operational/ partition/ schema/
Author: trustin
Date: Mon Jun 20 08:43:04 2005
New Revision: 191494
URL: http://svn.apache.org/viewcvs?rev=191494&view=rev
Log:
Renamed RootNexus to DefaultContextPartitionNexus
Added:
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java
- copied, changed from r191493, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/RootNexus.java
Removed:
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/RootNexus.java
Modified:
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorContext.java
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java?rev=191494&r1=191493&r2=191494&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java Mon Jun 20 08:43:04 2005
@@ -44,7 +44,7 @@
import org.apache.ldap.server.invocation.MoveAndModifyRN;
import org.apache.ldap.server.invocation.Search;
import org.apache.ldap.server.partition.ContextPartition;
-import org.apache.ldap.server.partition.RootNexus;
+import org.apache.ldap.server.partition.DefaultContextPartitionNexus;
/**
@@ -61,7 +61,7 @@
/**
* the root nexus of the system
*/
- private RootNexus nexus;
+ private DefaultContextPartitionNexus nexus;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorContext.java?rev=191494&r1=191493&r2=191494&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorContext.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorContext.java Mon Jun 20 08:43:04 2005
@@ -2,7 +2,7 @@
import org.apache.ldap.server.configuration.StartupConfiguration;
-import org.apache.ldap.server.partition.RootNexus;
+import org.apache.ldap.server.partition.DefaultContextPartitionNexus;
import org.apache.ldap.server.partition.SystemPartition;
import org.apache.ldap.server.schema.GlobalRegistries;
@@ -33,13 +33,13 @@
/**
* the root nexus
*/
- private final RootNexus rootNexus;
+ private final DefaultContextPartitionNexus rootNexus;
public InterceptorContext( StartupConfiguration configuration,
SystemPartition systemPartition,
GlobalRegistries globalRegistries,
- RootNexus rootNexus )
+ DefaultContextPartitionNexus rootNexus )
{
this.configuration = configuration;
@@ -63,7 +63,7 @@
}
- public RootNexus getRootNexus()
+ public DefaultContextPartitionNexus getRootNexus()
{
return rootNexus;
}
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java?rev=191494&r1=191493&r2=191494&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java Mon Jun 20 08:43:04 2005
@@ -23,7 +23,7 @@
import org.apache.ldap.server.configuration.StartupConfiguration;
import org.apache.ldap.server.invocation.Invocation;
-import org.apache.ldap.server.partition.RootNexus;
+import org.apache.ldap.server.partition.DefaultContextPartitionNexus;
import org.apache.ldap.server.schema.GlobalRegistries;
/** FIXME Rename to ContextFactoryContext */
@@ -47,7 +47,7 @@
/**
* Returns the root nexus of this context factory.
*/
- RootNexus getRootNexus();
+ DefaultContextPartitionNexus getRootNexus();
/**
* Returns <tt>true</tt> if this context is started for the first time
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java?rev=191494&r1=191493&r2=191494&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java Mon Jun 20 08:43:04 2005
@@ -40,7 +40,7 @@
import org.apache.ldap.server.interceptor.InterceptorContext;
import org.apache.ldap.server.invocation.Invocation;
import org.apache.ldap.server.partition.ContextPartitionNexus;
-import org.apache.ldap.server.partition.RootNexus;
+import org.apache.ldap.server.partition.DefaultContextPartitionNexus;
import org.apache.ldap.server.partition.SystemPartition;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
@@ -70,7 +70,7 @@
private GlobalRegistries globalRegistries;
/** the root nexus */
- private RootNexus rootNexus;
+ private DefaultContextPartitionNexus rootNexus;
/** whether or not server is started for the first time */
private boolean firstStart;
@@ -242,7 +242,7 @@
return globalRegistries;
}
- public RootNexus getRootNexus()
+ public DefaultContextPartitionNexus getRootNexus()
{
return rootNexus;
}
@@ -482,7 +482,7 @@
throw e;
}
- rootNexus = new RootNexus( new LockableAttributesImpl() );
+ rootNexus = new DefaultContextPartitionNexus( new LockableAttributesImpl() );
globalRegistries = new GlobalRegistries( rootNexus.getSystemPartition(), bootstrapRegistries );
interceptorChain = new InterceptorChain( configuration.getInterceptorConfigurations() );
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java?rev=191494&r1=191493&r2=191494&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java Mon Jun 20 08:43:04 2005
@@ -46,7 +46,7 @@
import org.apache.ldap.server.invocation.Move;
import org.apache.ldap.server.invocation.MoveAndModifyRN;
import org.apache.ldap.server.invocation.Search;
-import org.apache.ldap.server.partition.RootNexus;
+import org.apache.ldap.server.partition.DefaultContextPartitionNexus;
import org.apache.ldap.server.partition.store.impl.btree.ResultFilteringEnumeration;
import org.apache.ldap.server.partition.store.impl.btree.SearchResultFilter;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
@@ -83,7 +83,7 @@
/**
* the root nexus of the system
*/
- private RootNexus nexus;
+ private DefaultContextPartitionNexus nexus;
private AttributeTypeRegistry registry;
Copied: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java (from r191493, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/RootNexus.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java?p2=directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java&p1=directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/RootNexus.java&r1=191493&r2=191494&rev=191494&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/RootNexus.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java Mon Jun 20 08:43:04 2005
@@ -61,7 +61,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class RootNexus implements ContextPartitionNexus
+public class DefaultContextPartitionNexus implements ContextPartitionNexus
{
/** the vendorName string proudly set to: Apache Software Foundation*/
private static final String ASF = "Apache Software Foundation";
@@ -93,7 +93,7 @@
*
* @see <a href="http://www.faqs.org/rfcs/rfc3045.html">Vendor Information</a>
*/
- public RootNexus( Attributes rootDSE )
+ public DefaultContextPartitionNexus( Attributes rootDSE )
{
// setup that root DSE
this.rootDSE = rootDSE;
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java?rev=191494&r1=191493&r2=191494&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java Mon Jun 20 08:43:04 2005
@@ -54,7 +54,7 @@
import org.apache.ldap.server.invocation.LookupWithAttrIds;
import org.apache.ldap.server.invocation.Search;
import org.apache.ldap.server.jndi.ServerLdapContext;
-import org.apache.ldap.server.partition.RootNexus;
+import org.apache.ldap.server.partition.DefaultContextPartitionNexus;
import org.apache.ldap.server.partition.store.impl.btree.ResultFilteringEnumeration;
import org.apache.ldap.server.partition.store.impl.btree.SearchResultFilter;
@@ -73,7 +73,7 @@
/**
* the root nexus to all database partitions
*/
- private RootNexus nexus;
+ private DefaultContextPartitionNexus nexus;
/**
* a binary attribute tranforming filter: String -> byte[]