You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/07/20 05:07:55 UTC
svn commit: r423731 [2/3] - in /directory/branches/apacheds/optimization:
core-unit/src/main/java/org/apache/directory/server/core/unit/
core-unit/src/test/java/org/apache/directory/server/core/authz/
core-unit/src/test/java/org/apache/directory/server...
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/event/EventService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/event/EventService.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/event/EventService.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/event/EventService.java Wed Jul 19 20:07:52 2006
@@ -24,8 +24,8 @@
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.normalization.NormalizingVisitor;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.PartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
import org.apache.directory.server.core.schema.ConcreteNameComponentNormalizer;
import org.apache.directory.server.core.schema.OidRegistry;
@@ -62,7 +62,7 @@
public class EventService extends BaseInterceptor
{
private static Logger log = LoggerFactory.getLogger( EventService.class );
- private DirectoryPartitionNexus nexus;
+ private PartitionNexus nexus;
private Map sources = new HashMap();
private Evaluator evaluator = null;
private AttributeTypeRegistry attributeRegistry;
@@ -296,8 +296,8 @@
public void modify( NextInterceptor next, LdapDN name, int modOp, Attributes mods ) throws NamingException
{
Invocation invocation = InvocationStack.getInstance().peek();
- DirectoryPartitionNexusProxy proxy = invocation.getProxy();
- Attributes oriEntry = proxy.lookup( name, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ PartitionNexusProxy proxy = invocation.getProxy();
+ Attributes oriEntry = proxy.lookup( name, PartitionNexusProxy.LOOKUP_BYPASS );
super.modify( next, name, modOp, mods );
// package modifications in ModItem format for event delivery
@@ -314,8 +314,8 @@
public void modify( NextInterceptor next, LdapDN name, ModificationItem[] mods ) throws NamingException
{
Invocation invocation = InvocationStack.getInstance().peek();
- DirectoryPartitionNexusProxy proxy = invocation.getProxy();
- Attributes oriEntry = proxy.lookup( name, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ PartitionNexusProxy proxy = invocation.getProxy();
+ Attributes oriEntry = proxy.lookup( name, PartitionNexusProxy.LOOKUP_BYPASS );
super.modify( next, name, mods );
notifyOnModify( name, mods, oriEntry );
}
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java Wed Jul 19 20:07:52 2006
@@ -29,9 +29,9 @@
import org.apache.directory.server.core.interceptor.NextInterceptor;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
-import org.apache.directory.server.core.partition.DirectoryPartition;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.Partition;
+import org.apache.directory.server.core.partition.PartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.shared.ldap.exception.*;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -40,7 +40,7 @@
/**
* An {@link org.apache.directory.server.core.interceptor.Interceptor} that detects any operations that breaks integrity
- * of {@link DirectoryPartition} and terminates the current invocation chain by
+ * of {@link Partition} 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.
*
@@ -49,7 +49,7 @@
*/
public class ExceptionService extends BaseInterceptor
{
- private DirectoryPartitionNexus nexus;
+ private PartitionNexus nexus;
/**
* The OIDs normalizer map
@@ -395,7 +395,7 @@
private void assertHasEntry( NextInterceptor nextInterceptor, String msg, LdapDN dn ) throws NamingException
{
Invocation invocation = InvocationStack.getInstance().peek();
- DirectoryPartitionNexusProxy proxy = invocation.getProxy();
+ PartitionNexusProxy proxy = invocation.getProxy();
if ( !nextInterceptor.hasEntry( dn ) )
{
LdapNameNotFoundException e;
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java Wed Jul 19 20:07:52 2006
@@ -30,15 +30,15 @@
import org.apache.directory.server.core.DirectoryServiceConfiguration;
import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.core.configuration.InterceptorConfiguration;
-import org.apache.directory.server.core.partition.DirectoryPartition;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.Partition;
+import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.name.LdapDN;
/**
- * Filters invocations on {@link DirectoryPartitionNexus}. {@link Interceptor}
- * filters most method calls performed on {@link DirectoryPartitionNexus} just
+ * Filters invocations on {@link PartitionNexus}. {@link Interceptor}
+ * filters most method calls performed on {@link PartitionNexus} just
* like Servlet filters do.
* <p/>
* <h2>Interceptor Chaining</h2>
@@ -116,136 +116,136 @@
/**
- * Filters {@link DirectoryPartitionNexus#getRootDSE()} call.
+ * Filters {@link PartitionNexus#getRootDSE()} call.
*/
Attributes getRootDSE( NextInterceptor next ) throws NamingException;
/**
- * Filters {@link DirectoryPartitionNexus#getMatchedName(org.apache.directory.shared.ldap.name.LdapDN)} call.
+ * Filters {@link PartitionNexus#getMatchedName(org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
LdapDN getMatchedName ( NextInterceptor next, LdapDN name ) throws NamingException;
/**
- * Filters {@link DirectoryPartitionNexus#getSuffix(org.apache.directory.shared.ldap.name.LdapDN)} call.
+ * Filters {@link PartitionNexus#getSuffix(org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
LdapDN getSuffix ( NextInterceptor next, LdapDN name ) throws NamingException;
/**
- * Filters {@link DirectoryPartitionNexus#listSuffixes()} call.
+ * Filters {@link PartitionNexus#listSuffixes()} call.
*/
Iterator listSuffixes ( NextInterceptor next ) throws NamingException;
/**
- * Filters {@link DirectoryPartitionNexus#addContextPartition(PartitionConfiguration)} call.
+ * Filters {@link PartitionNexus#addContextPartition(PartitionConfiguration)} call.
*/
void addContextPartition( NextInterceptor next, PartitionConfiguration cfg ) throws NamingException;
/**
- * Filters {@link DirectoryPartitionNexus#removeContextPartition(org.apache.directory.shared.ldap.name.LdapDN)} call.
+ * Filters {@link PartitionNexus#removeContextPartition(org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
void removeContextPartition( NextInterceptor next, LdapDN suffix ) throws NamingException;
/**
- * Filters {@link DirectoryPartitionNexus#compare(org.apache.directory.shared.ldap.name.LdapDN,String,Object)} call.
+ * Filters {@link PartitionNexus#compare(org.apache.directory.shared.ldap.name.LdapDN,String,Object)} call.
*/
boolean compare( NextInterceptor next, LdapDN name, String oid, Object value ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#delete(org.apache.directory.shared.ldap.name.LdapDN)} call.
+ * Filters {@link Partition#delete(org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
void delete( NextInterceptor next, LdapDN name ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#add(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.Attributes)} call.
+ * Filters {@link Partition#add(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.Attributes)} call.
*/
void add( NextInterceptor next, LdapDN name, Attributes entry ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#modify(org.apache.directory.shared.ldap.name.LdapDN,int,javax.naming.directory.Attributes)} call.
+ * Filters {@link Partition#modify(org.apache.directory.shared.ldap.name.LdapDN,int,javax.naming.directory.Attributes)} call.
*/
void modify( NextInterceptor next, LdapDN name, int modOp, Attributes attributes ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#modify(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.ModificationItem[])} call.
+ * Filters {@link Partition#modify(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.ModificationItem[])} call.
*/
void modify( NextInterceptor next, LdapDN name, ModificationItem[] items ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#list(org.apache.directory.shared.ldap.name.LdapDN)} call.
+ * Filters {@link Partition#list(org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
NamingEnumeration list( NextInterceptor next, LdapDN baseName ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#search(org.apache.directory.shared.ldap.name.LdapDN,java.util.Map,org.apache.directory.shared.ldap.filter.ExprNode,javax.naming.directory.SearchControls)} call.
+ * Filters {@link Partition#search(org.apache.directory.shared.ldap.name.LdapDN,java.util.Map,org.apache.directory.shared.ldap.filter.ExprNode,javax.naming.directory.SearchControls)} call.
*/
NamingEnumeration search( NextInterceptor next, LdapDN baseName, Map environment, ExprNode filter,
SearchControls searchControls ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#lookup(org.apache.directory.shared.ldap.name.LdapDN)} call.
+ * Filters {@link Partition#lookup(org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
Attributes lookup( NextInterceptor next, LdapDN name ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#lookup(org.apache.directory.shared.ldap.name.LdapDN,String[])} call.
+ * Filters {@link Partition#lookup(org.apache.directory.shared.ldap.name.LdapDN,String[])} call.
*/
Attributes lookup( NextInterceptor next, LdapDN dn, String[] attrIds ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#lookup(org.apache.directory.shared.ldap.name.LdapDN,String[])} call.
+ * Filters {@link Partition#lookup(org.apache.directory.shared.ldap.name.LdapDN,String[])} call.
*/
boolean hasEntry( NextInterceptor next, LdapDN name ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#isSuffix(org.apache.directory.shared.ldap.name.LdapDN)} call.
+ * Filters {@link Partition#isSuffix(org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
boolean isSuffix( NextInterceptor next, LdapDN name ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#modifyRn(org.apache.directory.shared.ldap.name.LdapDN,String,boolean)} call.
+ * Filters {@link Partition#modifyRn(org.apache.directory.shared.ldap.name.LdapDN,String,boolean)} call.
*/
void modifyRn( NextInterceptor next, LdapDN name, String newRn, boolean deleteOldRn ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#move(org.apache.directory.shared.ldap.name.LdapDN,org.apache.directory.shared.ldap.name.LdapDN)} call.
+ * Filters {@link Partition#move(org.apache.directory.shared.ldap.name.LdapDN,org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
void move( NextInterceptor next, LdapDN oldName, LdapDN newParentName ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#move(org.apache.directory.shared.ldap.name.LdapDN,org.apache.directory.shared.ldap.name.LdapDN,String,boolean)} call.
+ * Filters {@link Partition#move(org.apache.directory.shared.ldap.name.LdapDN,org.apache.directory.shared.ldap.name.LdapDN,String,boolean)} call.
*/
void move( NextInterceptor next, LdapDN oldName, LdapDN newParentName, String newRn, boolean deleteOldRn )
throws NamingException;
/**
- * Filters {@link DirectoryPartition#bind(org.apache.directory.shared.ldap.name.LdapDN,byte[],java.util.List,String)} call.
+ * Filters {@link Partition#bind(org.apache.directory.shared.ldap.name.LdapDN,byte[],java.util.List,String)} call.
*/
void bind( NextInterceptor next, LdapDN bindDn, byte[] credentials, List mechanisms, String saslAuthId )
throws NamingException;
/**
- * Filters {@link DirectoryPartition#unbind(org.apache.directory.shared.ldap.name.LdapDN)} call.
+ * Filters {@link Partition#unbind(org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
void unbind( NextInterceptor next, LdapDN bindDn ) throws NamingException;
}
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java Wed Jul 19 20:07:52 2006
@@ -32,8 +32,8 @@
import org.apache.directory.server.core.configuration.MutableInterceptorConfiguration;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.PartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.slf4j.Logger;
@@ -52,7 +52,7 @@
private final Interceptor FINAL_INTERCEPTOR = new Interceptor()
{
- private DirectoryPartitionNexus nexus;
+ private PartitionNexus nexus;
public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg )
@@ -501,7 +501,7 @@
return head;
}
- if ( invocation.isBypassed( DirectoryPartitionNexusProxy.BYPASS_ALL ) )
+ if ( invocation.isBypassed( PartitionNexusProxy.BYPASS_ALL ) )
{
return tail;
}
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java Wed Jul 19 20:07:52 2006
@@ -28,7 +28,7 @@
import javax.naming.directory.SearchControls;
import org.apache.directory.server.core.configuration.PartitionConfiguration;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -74,13 +74,13 @@
/**
- * Calls the next interceptor's {@link DirectoryPartitionNexus#addContextPartition(PartitionConfiguration)}.
+ * Calls the next interceptor's {@link PartitionNexus#addContextPartition(PartitionConfiguration)}.
*/
void addContextPartition( PartitionConfiguration cfg ) throws NamingException;
/**
- * Calls the next interceptor's {@link DirectoryPartitionNexus#removeContextPartition(org.apache.directory.shared.ldap.name.LdapDN)}.
+ * Calls the next interceptor's {@link PartitionNexus#removeContextPartition(org.apache.directory.shared.ldap.name.LdapDN)}.
*/
void removeContextPartition( LdapDN suffix ) throws NamingException;
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/invocation/Invocation.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/invocation/Invocation.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/invocation/Invocation.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/invocation/Invocation.java Wed Jul 19 20:07:52 2006
@@ -24,12 +24,12 @@
import javax.naming.Context;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.PartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexusProxy;
/**
- * Represents a call from JNDI {@link Context} to {@link DirectoryPartitionNexus}.
+ * Represents a call from JNDI {@link Context} to {@link PartitionNexus}.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
@@ -40,7 +40,7 @@
private final String name;
private final List parameters;
private final Collection bypassed;
- private final DirectoryPartitionNexusProxy proxy;
+ private final PartitionNexusProxy proxy;
/**
@@ -49,7 +49,7 @@
* @param caller the JNDI {@link Context} that made this invocation
* @param name the name of the called method
*/
- public Invocation(DirectoryPartitionNexusProxy proxy, Context caller, String name)
+ public Invocation(PartitionNexusProxy proxy, Context caller, String name)
{
this( proxy, caller, name, null, Collections.EMPTY_SET );
}
@@ -62,7 +62,7 @@
* @param name the name of the called method
* @param parameters the array of parameters passed to the called method
*/
- public Invocation(DirectoryPartitionNexusProxy proxy, Context caller, String name, Object[] parameters)
+ public Invocation(PartitionNexusProxy proxy, Context caller, String name, Object[] parameters)
{
this( proxy, caller, name, parameters, Collections.EMPTY_SET );
}
@@ -76,7 +76,7 @@
* @param parameters the array of parameters passed to the called method
* @param bypassed the set of bypassed Interceptor names
*/
- public Invocation(DirectoryPartitionNexusProxy proxy, Context caller, String name, Object[] parameters,
+ public Invocation(PartitionNexusProxy proxy, Context caller, String name, Object[] parameters,
Collection bypassed)
{
if ( proxy == null )
@@ -121,9 +121,9 @@
/**
- * Returns the proxy object to the {@link DirectoryPartitionNexus}.
+ * Returns the proxy object to the {@link PartitionNexus}.
*/
- public DirectoryPartitionNexusProxy getProxy()
+ public PartitionNexusProxy getProxy()
{
return proxy;
}
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java Wed Jul 19 20:07:52 2006
@@ -33,7 +33,7 @@
import org.apache.directory.server.core.configuration.ShutdownConfiguration;
import org.apache.directory.server.core.configuration.StartupConfiguration;
import org.apache.directory.server.core.configuration.SyncConfiguration;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -115,7 +115,7 @@
}
else if ( cfg instanceof AddPartitionConfiguration )
{
- new DirectoryPartitionNexusProxy(
+ new PartitionNexusProxy(
service.getJndiContext( principalDn, principal, credential, authentication, "" ),
service ).addContextPartition( ( ( AddPartitionConfiguration ) cfg )
.getDirectoryPartitionConfiguration() );
@@ -123,7 +123,7 @@
else if ( cfg instanceof RemovePartitionConfiguration )
{
Context ctx = service.getJndiContext( principalDn, principal, credential, authentication, "" );
- DirectoryPartitionNexusProxy proxy = new DirectoryPartitionNexusProxy( ctx, service );
+ PartitionNexusProxy proxy = new PartitionNexusProxy( ctx, service );
proxy.removeContextPartition( ( ( RemovePartitionConfiguration ) cfg ).getSuffix() );
}
else if ( service == null )
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Wed Jul 19 20:07:52 2006
@@ -46,8 +46,8 @@
import org.apache.directory.server.core.DirectoryServiceConfiguration;
import org.apache.directory.server.core.authn.AuthenticationService;
import org.apache.directory.server.core.authn.LdapPrincipal;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.PartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.PresenceNode;
@@ -72,7 +72,7 @@
private final DirectoryService service;
/** The interceptor proxy to the backend nexus */
- private final DirectoryPartitionNexus nexusProxy;
+ private final PartitionNexus nexusProxy;
/** The cloned environment used by this Context */
private final Hashtable env;
@@ -110,7 +110,7 @@
this.service = service;
// set references to cloned env and the proxy
- this.nexusProxy = new DirectoryPartitionNexusProxy( this, service );
+ this.nexusProxy = new PartitionNexusProxy( this, service );
DirectoryServiceConfiguration cfg = service.getConfiguration();
this.env = ( Hashtable ) cfg.getEnvironment().clone();
@@ -149,7 +149,7 @@
this.env = ( Hashtable ) service.getConfiguration().getEnvironment().clone();
this.env.put( PROVIDER_URL, dn.toString() );
- this.nexusProxy = new DirectoryPartitionNexusProxy( this, service );
+ this.nexusProxy = new PartitionNexusProxy( this, service );
;
this.principal = principal;
}
@@ -199,7 +199,7 @@
*
* @return the proxy to the backend nexus.
*/
- protected DirectoryPartitionNexus getNexusProxy()
+ protected PartitionNexus getNexusProxy()
{
return nexusProxy;
}
@@ -228,7 +228,7 @@
Iterator list = listeners.iterator();
while ( list.hasNext() )
{
- ( ( DirectoryPartitionNexusProxy ) this.nexusProxy ).removeNamingListener( this, ( NamingListener ) list
+ ( ( PartitionNexusProxy ) this.nexusProxy ).removeNamingListener( this, ( NamingListener ) list
.next() );
}
}
@@ -757,7 +757,7 @@
ExprNode filter = new PresenceNode( "objectClass" );
SearchControls controls = new SearchControls();
controls.setSearchScope( scope );
- ( ( DirectoryPartitionNexusProxy ) this.nexusProxy ).addNamingListener( this, buildTarget( name ), filter,
+ ( ( PartitionNexusProxy ) this.nexusProxy ).addNamingListener( this, buildTarget( name ), filter,
controls, namingListener );
listeners.add( namingListener );
}
@@ -771,7 +771,7 @@
public void removeNamingListener( NamingListener namingListener ) throws NamingException
{
- ( ( DirectoryPartitionNexusProxy ) this.nexusProxy ).removeNamingListener( this, namingListener );
+ ( ( PartitionNexusProxy ) this.nexusProxy ).removeNamingListener( this, namingListener );
listeners.remove( namingListener );
}
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Wed Jul 19 20:07:52 2006
@@ -40,7 +40,7 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.authn.LdapPrincipal;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.shared.ldap.filter.BranchNode;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.FilterParserImpl;
@@ -643,7 +643,7 @@
throw e2;
}
- ( ( DirectoryPartitionNexusProxy ) getNexusProxy() ).addNamingListener( this, buildTarget( name ), filter,
+ ( ( PartitionNexusProxy ) getNexusProxy() ).addNamingListener( this, buildTarget( name ), filter,
searchControls, namingListener );
getListeners().add( namingListener );
}
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java Wed Jul 19 20:07:52 2006
@@ -31,7 +31,7 @@
import org.apache.directory.server.core.configuration.InterceptorConfiguration;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
import org.apache.directory.server.core.schema.ConcreteNameComponentNormalizer;
import org.apache.directory.server.core.schema.OidRegistry;
@@ -50,7 +50,7 @@
/**
* 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 DirectoryPartitionNexus}.
+ * on {@link PartitionNexus}.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java Wed Jul 19 20:07:52 2006
@@ -40,7 +40,7 @@
import org.apache.directory.server.core.interceptor.NextInterceptor;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -80,7 +80,7 @@
/**
* the root nexus of the system
*/
- private DirectoryPartitionNexus nexus;
+ private PartitionNexus nexus;
private AttributeTypeRegistry registry;
Copied: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java (from r423455, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/AbstractDirectoryPartition.java)
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java?p2=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java&p1=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/AbstractDirectoryPartition.java&r1=423455&r2=423731&rev=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/AbstractDirectoryPartition.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java Wed Jul 19 20:07:52 2006
@@ -34,14 +34,14 @@
/**
- * A {@link DirectoryPartition} that helps users to implement their own partition.
+ * A {@link Partition} 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 AbstractDirectoryPartition implements DirectoryPartition
+public abstract class AbstractPartition implements Partition
{
/** {@link DirectoryServiceConfiguration} specified at {@link #init(DirectoryServiceConfiguration, PartitionConfiguration)}. */
private DirectoryServiceConfiguration factoryCfg;
@@ -53,7 +53,7 @@
private LdapDN suffixDn;
- protected AbstractDirectoryPartition()
+ protected AbstractPartition()
{
}
@@ -189,7 +189,7 @@
/**
- * This method calls {@link DirectoryPartition#lookup(org.apache.directory.shared.ldap.name.LdapDN)} and return <tt>true</tt>
+ * This method calls {@link Partition#lookup(org.apache.directory.shared.ldap.name.LdapDN)} and return <tt>true</tt>
* if it returns an entry by default. Please override this method if
* there is more effective way for your implementation.
*/
@@ -207,7 +207,7 @@
/**
- * This method calls {@link DirectoryPartition#lookup(org.apache.directory.shared.ldap.name.LdapDN,String[])}
+ * This method calls {@link Partition#lookup(org.apache.directory.shared.ldap.name.LdapDN,String[])}
* with null <tt>attributeIds</tt> by default. Please override
* this method if there is more effective way for your implementation.
*/
@@ -219,7 +219,7 @@
/**
* This method forwards the request to
- * {@link DirectoryPartition#modify(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.ModificationItem[])} after
+ * {@link Partition#modify(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.ModificationItem[])} after
* translating parameters to {@link ModificationItem}<tt>[]</tt> by default.
* Please override this method if there is more effactive way for your
* implementation.
@@ -240,8 +240,8 @@
/**
- * This method calls {@link DirectoryPartition#move(org.apache.directory.shared.ldap.name.LdapDN,org.apache.directory.shared.ldap.name.LdapDN)} and
- * {@link DirectoryPartition#modifyRn(org.apache.directory.shared.ldap.name.LdapDN,String,boolean)} subsequently
+ * This method calls {@link Partition#move(org.apache.directory.shared.ldap.name.LdapDN,org.apache.directory.shared.ldap.name.LdapDN)} and
+ * {@link Partition#modifyRn(org.apache.directory.shared.ldap.name.LdapDN,String,boolean)} subsequently
* by default. Please override this method if there is more effactive
* way for your implementation.
*/
Copied: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (from r423455, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DefaultDirectoryPartitionNexus.java)
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?p2=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java&p1=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DefaultDirectoryPartitionNexus.java&r1=423455&r2=423731&rev=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DefaultDirectoryPartitionNexus.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Wed Jul 19 20:07:52 2006
@@ -43,7 +43,7 @@
import org.apache.directory.server.core.DirectoryServiceConfiguration;
import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmDirectoryPartition;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
import org.apache.directory.server.core.schema.OidRegistry;
import org.apache.directory.shared.ldap.MultiException;
@@ -79,9 +79,9 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class DefaultDirectoryPartitionNexus extends DirectoryPartitionNexus
+public class DefaultPartitionNexus extends PartitionNexus
{
- private static final Logger log = LoggerFactory.getLogger( DefaultDirectoryPartitionNexus.class );
+ private static final Logger log = LoggerFactory.getLogger( DefaultPartitionNexus.class );
/** the vendorName string proudly set to: Apache Software Foundation*/
private static final String ASF = "Apache Software Foundation";
@@ -101,7 +101,7 @@
private DirectoryServiceConfiguration factoryCfg;
/** the system backend */
- private DirectoryPartition system;
+ private Partition system;
/** the backends keyed by normalized suffix strings */
private HashMap partitions = new HashMap();
@@ -118,7 +118,7 @@
*
* @see <a href="http://www.faqs.org/rfcs/rfc3045.html">Vendor Information</a>
*/
- public DefaultDirectoryPartitionNexus(Attributes rootDSE)
+ public DefaultPartitionNexus(Attributes rootDSE)
{
// setup that root DSE
this.rootDSE = rootDSE;
@@ -206,7 +206,7 @@
while ( i.hasNext() )
{
PartitionConfiguration partitionCfg = ( PartitionConfiguration ) i.next();
- DirectoryPartition partition = partitionCfg.getContextPartition();
+ Partition partition = partitionCfg.getContextPartition();
i.remove();
try
{
@@ -250,10 +250,10 @@
objectClassAttr.add( "top" );
objectClassAttr.add( "organizationalUnit" );
objectClassAttr.add( "extensibleObject" );
- systemEntry.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
+ systemEntry.put( "creatorsName", PartitionNexus.ADMIN_PRINCIPAL );
systemEntry.put( "createTimestamp", DateUtils.getGeneralizedTime() );
- systemEntry.put( NamespaceTools.getRdnAttribute( DirectoryPartitionNexus.SYSTEM_PARTITION_SUFFIX ),
- NamespaceTools.getRdnValue( DirectoryPartitionNexus.SYSTEM_PARTITION_SUFFIX ) );
+ systemEntry.put( NamespaceTools.getRdnAttribute( PartitionNexus.SYSTEM_PARTITION_SUFFIX ),
+ NamespaceTools.getRdnValue( PartitionNexus.SYSTEM_PARTITION_SUFFIX ) );
systemCfg.setContextEntry( systemEntry );
// ---------------------------------------------------------------
@@ -319,7 +319,7 @@
// @TODO need to make this configurable for the system partition
systemCfg.setCacheSize( 500 );
- systemCfg.setSuffix( DirectoryPartitionNexus.SYSTEM_PARTITION_SUFFIX );
+ systemCfg.setSuffix( PartitionNexus.SYSTEM_PARTITION_SUFFIX );
// Add indexed attributes for system partition
Set indexedSystemAttrs = new HashSet();
@@ -340,14 +340,14 @@
objectClassAttr.add( "organizationalUnit" );
objectClassAttr.add( "extensibleObject" );
systemEntry.put( objectClassAttr );
- systemEntry.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
+ systemEntry.put( "creatorsName", PartitionNexus.ADMIN_PRINCIPAL );
systemEntry.put( "createTimestamp", DateUtils.getGeneralizedTime() );
- systemEntry.put( NamespaceTools.getRdnAttribute( DirectoryPartitionNexus.SYSTEM_PARTITION_SUFFIX ),
- NamespaceTools.getRdnValue( DirectoryPartitionNexus.SYSTEM_PARTITION_SUFFIX ) );
+ systemEntry.put( NamespaceTools.getRdnAttribute( PartitionNexus.SYSTEM_PARTITION_SUFFIX ),
+ NamespaceTools.getRdnValue( PartitionNexus.SYSTEM_PARTITION_SUFFIX ) );
systemCfg.setContextEntry( systemEntry );
}
- system = new JdbmDirectoryPartition(); // using default implementation.
+ system = new JdbmPartition(); // using default implementation.
system.init( factoryCfg, systemCfg );
systemCfg.setContextPartition( system );
String key = system.getSuffix().toString();
@@ -399,7 +399,7 @@
/**
- * @see DirectoryPartition#sync()
+ * @see Partition#sync()
*/
public void sync() throws NamingException
{
@@ -407,7 +407,7 @@
Iterator list = this.partitions.values().iterator();
while ( list.hasNext() )
{
- DirectoryPartition partition = ( DirectoryPartition ) list.next();
+ Partition partition = ( Partition ) list.next();
try
{
@@ -441,7 +441,7 @@
public boolean compare( LdapDN name, String oid, Object value ) throws NamingException
{
- DirectoryPartition partition = getBackend( name );
+ Partition partition = getBackend( name );
AttributeTypeRegistry registry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
// complain if we do not recognize the attribute being compared
@@ -506,7 +506,7 @@
public synchronized void addContextPartition( PartitionConfiguration config ) throws NamingException
{
- DirectoryPartition partition = config.getContextPartition();
+ Partition partition = config.getContextPartition();
// Turn on default indices
String key = config.getSuffix();
@@ -526,7 +526,7 @@
public synchronized void removeContextPartition( LdapDN suffix ) throws NamingException
{
String key = suffix.toString();
- DirectoryPartition partition = ( DirectoryPartition ) partitions.get( key );
+ Partition partition = ( Partition ) partitions.get( key );
if ( partition == null )
{
throw new NameNotFoundException( "No partition with suffix: " + key );
@@ -541,14 +541,14 @@
}
- public DirectoryPartition getSystemPartition()
+ public Partition getSystemPartition()
{
return system;
}
/**
- * @see DirectoryPartitionNexus#getLdapContext()
+ * @see PartitionNexus#getLdapContext()
*/
public LdapContext getLdapContext()
{
@@ -557,7 +557,7 @@
/**
- * @see DirectoryPartitionNexus#getMatchedName(org.apache.directory.shared.ldap.name.LdapDN)
+ * @see PartitionNexus#getMatchedName(org.apache.directory.shared.ldap.name.LdapDN)
*/
public LdapDN getMatchedName ( LdapDN dn ) throws NamingException
{
@@ -588,17 +588,17 @@
/**
- * @see DirectoryPartitionNexus#getSuffix(org.apache.directory.shared.ldap.name.LdapDN)
+ * @see PartitionNexus#getSuffix(org.apache.directory.shared.ldap.name.LdapDN)
*/
public LdapDN getSuffix ( LdapDN dn ) throws NamingException
{
- DirectoryPartition backend = getBackend( dn );
+ Partition backend = getBackend( dn );
return backend.getSuffix();
}
/**
- * @see DirectoryPartitionNexus#listSuffixes()
+ * @see PartitionNexus#listSuffixes()
*/
public Iterator listSuffixes () throws NamingException
{
@@ -624,7 +624,7 @@
* @param partition ContextPartition component to unregister with this
* BackendNexus.
*/
- private void unregister( DirectoryPartition partition ) throws NamingException
+ private void unregister( Partition partition ) throws NamingException
{
Attribute namingContexts = rootDSE.get( NAMINGCTXS_ATTR );
namingContexts.remove( partition.getSuffix().toString() );
@@ -638,24 +638,24 @@
public void bind( LdapDN bindDn, byte[] credentials, List mechanisms, String saslAuthId ) throws NamingException
{
- DirectoryPartition partition = getBackend( bindDn );
+ Partition partition = getBackend( bindDn );
partition.bind( bindDn, credentials, mechanisms, saslAuthId );
}
public void unbind( LdapDN bindDn ) throws NamingException
{
- DirectoryPartition partition = getBackend( bindDn );
+ Partition partition = getBackend( bindDn );
partition.unbind( bindDn );
}
/**
- * @see DirectoryPartition#delete(org.apache.directory.shared.ldap.name.LdapDN)
+ * @see Partition#delete(org.apache.directory.shared.ldap.name.LdapDN)
*/
public void delete( LdapDN dn ) throws NamingException
{
- DirectoryPartition backend = getBackend( dn );
+ Partition backend = getBackend( dn );
backend.delete( dn );
}
@@ -667,47 +667,47 @@
* here so backend implementors do not have to worry about performing these
* kinds of checks.
*
- * @see DirectoryPartition#add(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.Attributes)
+ * @see Partition#add(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.Attributes)
*/
public void add( LdapDN dn, Attributes entry ) throws NamingException
{
- DirectoryPartition backend = getBackend( dn );
+ Partition backend = getBackend( dn );
backend.add( dn, entry );
}
/**
- * @see DirectoryPartition#modify(org.apache.directory.shared.ldap.name.LdapDN,int,javax.naming.directory.Attributes)
+ * @see Partition#modify(org.apache.directory.shared.ldap.name.LdapDN,int,javax.naming.directory.Attributes)
*/
public void modify( LdapDN dn, int modOp, Attributes mods ) throws NamingException
{
- DirectoryPartition backend = getBackend( dn );
+ Partition backend = getBackend( dn );
backend.modify( dn, modOp, mods );
}
/**
- * @see DirectoryPartition#modify(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.ModificationItem[])
+ * @see Partition#modify(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.ModificationItem[])
*/
public void modify( LdapDN dn, ModificationItem[] mods ) throws NamingException
{
- DirectoryPartition backend = getBackend( dn );
+ Partition backend = getBackend( dn );
backend.modify( dn, mods );
}
/**
- * @see DirectoryPartition#list(org.apache.directory.shared.ldap.name.LdapDN)
+ * @see Partition#list(org.apache.directory.shared.ldap.name.LdapDN)
*/
public NamingEnumeration list( LdapDN base ) throws NamingException
{
- DirectoryPartition backend = getBackend( base );
+ Partition backend = getBackend( base );
return backend.list( base );
}
/**
- * @see DirectoryPartition#search(org.apache.directory.shared.ldap.name.LdapDN,java.util.Map,org.apache.directory.shared.ldap.filter.ExprNode,javax.naming.directory.SearchControls)
+ * @see Partition#search(org.apache.directory.shared.ldap.name.LdapDN,java.util.Map,org.apache.directory.shared.ldap.filter.ExprNode,javax.naming.directory.SearchControls)
*/
public NamingEnumeration search( LdapDN base, Map env, ExprNode filter, SearchControls searchCtls )
throws NamingException
@@ -761,13 +761,13 @@
throw new LdapNameNotFoundException();
}
- DirectoryPartition backend = getBackend( base );
+ Partition backend = getBackend( base );
return backend.search( base, env, filter, searchCtls );
}
/**
- * @see DirectoryPartition#lookup(org.apache.directory.shared.ldap.name.LdapDN)
+ * @see Partition#lookup(org.apache.directory.shared.ldap.name.LdapDN)
*/
public Attributes lookup( LdapDN dn ) throws NamingException
{
@@ -776,13 +776,13 @@
return ( Attributes ) rootDSE.clone();
}
- DirectoryPartition backend = getBackend( dn );
+ Partition backend = getBackend( dn );
return backend.lookup( dn );
}
/**
- * @see DirectoryPartition#lookup(org.apache.directory.shared.ldap.name.LdapDN,String[])
+ * @see Partition#lookup(org.apache.directory.shared.ldap.name.LdapDN,String[])
*/
public Attributes lookup( LdapDN dn, String[] attrIds ) throws NamingException
{
@@ -799,13 +799,13 @@
return retval;
}
- DirectoryPartition backend = getBackend( dn );
+ Partition backend = getBackend( dn );
return backend.lookup( dn, attrIds );
}
/**
- * @see DirectoryPartition#hasEntry(org.apache.directory.shared.ldap.name.LdapDN)
+ * @see Partition#hasEntry(org.apache.directory.shared.ldap.name.LdapDN)
*/
public boolean hasEntry( LdapDN dn ) throws NamingException
{
@@ -819,13 +819,13 @@
return true;
}
- DirectoryPartition backend = getBackend( dn );
+ Partition backend = getBackend( dn );
return backend.hasEntry( dn );
}
/**
- * @see DirectoryPartition#isSuffix(org.apache.directory.shared.ldap.name.LdapDN)
+ * @see Partition#isSuffix(org.apache.directory.shared.ldap.name.LdapDN)
*/
public boolean isSuffix( LdapDN dn )
{
@@ -834,31 +834,31 @@
/**
- * @see DirectoryPartition#modifyRn(org.apache.directory.shared.ldap.name.LdapDN,String,boolean)
+ * @see Partition#modifyRn(org.apache.directory.shared.ldap.name.LdapDN,String,boolean)
*/
public void modifyRn( LdapDN dn, String newRdn, boolean deleteOldRdn ) throws NamingException
{
- DirectoryPartition backend = getBackend( dn );
+ Partition backend = getBackend( dn );
backend.modifyRn( dn, newRdn, deleteOldRdn );
}
/**
- * @see DirectoryPartition#move(org.apache.directory.shared.ldap.name.LdapDN,org.apache.directory.shared.ldap.name.LdapDN)
+ * @see Partition#move(org.apache.directory.shared.ldap.name.LdapDN,org.apache.directory.shared.ldap.name.LdapDN)
*/
public void move( LdapDN oriChildName, LdapDN newParentName ) throws NamingException
{
- DirectoryPartition backend = getBackend( oriChildName );
+ Partition backend = getBackend( oriChildName );
backend.move( oriChildName, newParentName );
}
/**
- * @see DirectoryPartition#move(org.apache.directory.shared.ldap.name.LdapDN,org.apache.directory.shared.ldap.name.LdapDN,String,boolean)
+ * @see Partition#move(org.apache.directory.shared.ldap.name.LdapDN,org.apache.directory.shared.ldap.name.LdapDN,String,boolean)
*/
public void move( LdapDN oldChildDn, LdapDN newParentDn, String newRdn, boolean deleteOldRdn ) throws NamingException
{
- DirectoryPartition backend = getBackend( oldChildDn );
+ Partition backend = getBackend( oldChildDn );
backend.move( oldChildDn, newParentDn, newRdn, deleteOldRdn );
}
@@ -874,14 +874,14 @@
* @return the backend partition associated with the normalized dn
* @throws NamingException if the name cannot be resolved to a backend
*/
- private DirectoryPartition getBackend( LdapDN dn ) throws NamingException
+ private Partition getBackend( LdapDN dn ) throws NamingException
{
LdapDN clonedDn = ( LdapDN ) dn.clone();
while ( clonedDn.size() > 0 )
{
if ( partitions.containsKey( clonedDn.toString() ) )
{
- return ( DirectoryPartition ) partitions.get( clonedDn.toString() );
+ return ( Partition ) partitions.get( clonedDn.toString() );
}
clonedDn.remove( clonedDn.size() - 1 );
@@ -890,7 +890,7 @@
}
- public DirectoryPartition getPartition( LdapDN dn ) throws NamingException
+ public Partition getPartition( LdapDN dn ) throws NamingException
{
return getBackend( dn );
}
Copied: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/Partition.java (from r423455, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartition.java)
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/Partition.java?p2=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/Partition.java&p1=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartition.java&r1=423455&r2=423731&rev=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartition.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/Partition.java Wed Jul 19 20:07:52 2006
@@ -37,7 +37,7 @@
/**
* An interfaces that bridges between underlying JNDI entries and JNDI
* {@link Context} API. DIT (Directory Information Tree) consists one or
- * above {@link DirectoryPartition}s whose parent is {@link DirectoryPartitionNexus},
+ * above {@link Partition}s whose parent is {@link PartitionNexus},
* and all of them are mapped to different
* base suffix. Each partition contains entries whose name ends with that
* base suffix.
@@ -45,7 +45,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public interface DirectoryPartition
+public interface Partition
{
/** The objectClass name for aliases: 'alias' */
String ALIAS_OBJECT = "alias";
Copied: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java (from r423455, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexus.java)
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java?p2=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java&p1=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexus.java&r1=423455&r2=423731&rev=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexus.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java Wed Jul 19 20:07:52 2006
@@ -34,7 +34,7 @@
/**
- * A root {@link DirectoryPartition} that contains all other partitions, and
+ * A root {@link Partition} that contains all other partitions, and
* routes all operations to the child partition that matches to its base suffixes.
* It also provides some extended operations such as accessing rootDSE and
* listing base suffixes.
@@ -42,7 +42,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public abstract class DirectoryPartitionNexus implements DirectoryPartition
+public abstract class PartitionNexus implements Partition
{
/** the default user principal or DN */
public final static String ADMIN_PRINCIPAL = "uid=admin,ou=system";
@@ -200,7 +200,7 @@
public abstract void removeContextPartition( LdapDN suffix ) throws NamingException;
- public abstract DirectoryPartition getSystemPartition();
+ public abstract Partition getSystemPartition();
/**
@@ -213,7 +213,7 @@
* @return the partition containing the entry represented by the dn
* @throws NamingException if there is no partition for the dn
*/
- public abstract DirectoryPartition getPartition( LdapDN dn ) throws NamingException;
+ public abstract Partition getPartition( LdapDN dn ) throws NamingException;
/**
@@ -243,7 +243,7 @@
/**
* Gets an iteration over the Name suffixes of the partitions managed by this
- * {@link DirectoryPartitionNexus}.
+ * {@link PartitionNexus}.
*
* @return Iteration over ContextPartition suffix names as Names.
* @throws NamingException if there are any problems
Copied: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java (from r423455, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexusProxy.java)
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java?p2=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java&p1=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexusProxy.java&r1=423455&r2=423731&rev=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexusProxy.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java Wed Jul 19 20:07:52 2006
@@ -49,7 +49,7 @@
/**
- * A decorator that wraps other {@link DirectoryPartitionNexus} to enable
+ * A decorator that wraps other {@link PartitionNexus} 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
@@ -58,7 +58,7 @@
* @author The Apache Directory Project
* @version $Rev$, $Date$
*/
-public class DirectoryPartitionNexusProxy extends DirectoryPartitionNexus
+public class PartitionNexusProxy extends PartitionNexus
{
/** safe to use set of bypass instructions to lookup raw entries */
public static final Collection LOOKUP_BYPASS;
@@ -112,7 +112,7 @@
* @param caller a JNDI {@link Context} object that will call this proxy
* @param service a JNDI service
*/
- public DirectoryPartitionNexusProxy(Context caller, DirectoryService service)
+ public PartitionNexusProxy(Context caller, DirectoryService service)
{
this.caller = caller;
this.service = service;
@@ -136,13 +136,13 @@
}
- public DirectoryPartition getSystemPartition()
+ public Partition getSystemPartition()
{
return this.configuration.getPartitionNexus().getSystemPartition();
}
- public DirectoryPartition getPartition( LdapDN dn ) throws NamingException
+ public Partition getPartition( LdapDN dn ) throws NamingException
{
return this.configuration.getPartitionNexus().getPartition( dn );
}
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Wed Jul 19 20:07:52 2006
@@ -32,7 +32,7 @@
import org.apache.directory.server.core.DirectoryServiceConfiguration;
import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.core.enumeration.SearchResultEnumeration;
-import org.apache.directory.server.core.partition.DirectoryPartition;
+import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.core.partition.Oid;
import org.apache.directory.server.core.partition.impl.btree.gui.PartitionViewer;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
@@ -50,12 +50,12 @@
/**
- * An abstract {@link DirectoryPartition} that uses general BTree operations.
+ * An abstract {@link Partition} that uses general BTree operations.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public abstract class BTreePartition implements DirectoryPartition
+public abstract class BTreePartition implements Partition
{
private static final Logger log = LoggerFactory.getLogger( BTreePartition.class );
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/MutableBTreePartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/MutableBTreePartitionConfiguration.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/MutableBTreePartitionConfiguration.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/MutableBTreePartitionConfiguration.java Wed Jul 19 20:07:52 2006
@@ -24,7 +24,7 @@
import javax.naming.directory.Attributes;
import org.apache.directory.server.core.configuration.PartitionConfiguration;
-import org.apache.directory.server.core.partition.DirectoryPartition;
+import org.apache.directory.server.core.partition.Partition;
/**
@@ -53,7 +53,7 @@
}
- public void setContextPartition( DirectoryPartition partition )
+ public void setContextPartition( Partition partition )
{
super.setContextPartition( partition );
}
Copied: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (from r423455, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDirectoryPartition.java)
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?p2=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java&p1=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDirectoryPartition.java&r1=423455&r2=423731&rev=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDirectoryPartition.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Wed Jul 19 20:07:52 2006
@@ -41,7 +41,7 @@
import org.apache.directory.server.core.DirectoryServiceConfiguration;
import org.apache.directory.server.core.ServerUtils;
import org.apache.directory.server.core.configuration.PartitionConfiguration;
-import org.apache.directory.server.core.partition.DirectoryPartition;
+import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
import org.apache.directory.server.core.partition.impl.btree.BTreePartitionConfiguration;
import org.apache.directory.server.core.partition.impl.btree.Index;
@@ -68,15 +68,15 @@
/**
- * A {@link DirectoryPartition} that stores entries in
+ * A {@link Partition} that stores entries in
* <a href="http://jdbm.sourceforge.net/">JDBM</a> database.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class JdbmDirectoryPartition extends BTreePartition
+public class JdbmPartition extends BTreePartition
{
- private static final Logger log = LoggerFactory.getLogger( JdbmDirectoryPartition.class );
+ private static final Logger log = LoggerFactory.getLogger( JdbmPartition.class );
/** the JDBM record manager used by this database */
private RecordManager recMan;
@@ -123,7 +123,7 @@
/**
* Creates a store based on JDBM B+Trees.
*/
- public JdbmDirectoryPartition()
+ public JdbmPartition()
{
}
@@ -832,9 +832,9 @@
// Start adding the system indices
// Why bother doing a lookup if this is not an alias.
- if ( objectClass.contains( DirectoryPartition.ALIAS_OBJECT ) )
+ if ( objectClass.contains( Partition.ALIAS_OBJECT ) )
{
- AttributeType aliasType = attrRegistry.lookup( DirectoryPartition.ALIAS_ATTRIBUTE );
+ AttributeType aliasType = attrRegistry.lookup( Partition.ALIAS_ATTRIBUTE );
Attribute aliasAttr = ServerUtils.getAttribute( aliasType, entry );
addAliasIndices( id, normName, ( String ) aliasAttr.get() );
}
@@ -891,7 +891,7 @@
AttributeType octype = attrRegistry.lookup( "objectClass" );
Attribute objectClass = ServerUtils.getAttribute( octype, entry );
- if ( objectClass.contains( DirectoryPartition.ALIAS_OBJECT ) )
+ if ( objectClass.contains( Partition.ALIAS_OBJECT ) )
{
dropAliasIndices( id );
}
@@ -1094,7 +1094,7 @@
entryAttrToAddTo.add( mods.get( ii ) );
}
- if ( modsOid.equals( oidRegistry.getOid( DirectoryPartition.ALIAS_ATTRIBUTE ) ) )
+ if ( modsOid.equals( oidRegistry.getOid( Partition.ALIAS_ATTRIBUTE ) ) )
{
String ndnStr = ( String ) ndnIdx.reverseLookup( id );
addAliasIndices( id, new LdapDN( ndnStr ), ( String ) mods.get() );
@@ -1163,7 +1163,7 @@
}
// Aliases->single valued comp/partial attr removal is not relevant here
- if ( modsOid.equals( oidRegistry.getOid( DirectoryPartition.ALIAS_ATTRIBUTE ) ) )
+ if ( modsOid.equals( oidRegistry.getOid( Partition.ALIAS_ATTRIBUTE ) ) )
{
dropAliasIndices( id );
}
@@ -1204,7 +1204,7 @@
}
}
- String aliasAttributeOid = oidRegistry.getOid( DirectoryPartition.ALIAS_ATTRIBUTE );
+ String aliasAttributeOid = oidRegistry.getOid( Partition.ALIAS_ATTRIBUTE );
if ( modsOid.equals( aliasAttributeOid ) )
{
dropAliasIndices( id );
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java Wed Jul 19 20:07:52 2006
@@ -48,9 +48,9 @@
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.ServerLdapContext;
-import org.apache.directory.server.core.partition.DirectoryPartition;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.Partition;
+import org.apache.directory.server.core.partition.PartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
import org.apache.directory.server.core.schema.OidRegistry;
@@ -92,7 +92,7 @@
private static final String REF_ATTR = "ref";
private ReferralLut lut = new ReferralLut();
- private DirectoryPartitionNexus nexus;
+ private PartitionNexus nexus;
private Hashtable env;
private AttributeTypeRegistry attrRegistry;
private OidRegistry oidRegistry;
@@ -278,7 +278,7 @@
return;
}
- Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes referral = invocation.getProxy().lookup( farthest, PartitionNexusProxy.LOOKUP_BYPASS );
AttributeType refsType = attrRegistry.lookup( oidRegistry.getOid( REF_ATTR ) );
Attribute refs = ServerUtils.getAttribute( refsType, referral );
doReferralException( farthest, new LdapDN( normName.getUpName() ), refs );
@@ -315,7 +315,7 @@
return next.compare( normName, oid, value );
}
- Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes referral = invocation.getProxy().lookup( farthest, PartitionNexusProxy.LOOKUP_BYPASS );
Attribute refs = referral.get( REF_ATTR );
doReferralException( farthest, new LdapDN( normName.getUpName() ), refs );
@@ -364,7 +364,7 @@
return;
}
- Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes referral = invocation.getProxy().lookup( farthest, PartitionNexusProxy.LOOKUP_BYPASS );
Attribute refs = referral.get( REF_ATTR );
doReferralException( farthest, new LdapDN( normName.getUpName() ), refs );
}
@@ -430,7 +430,7 @@
else if ( farthestSrc != null )
{
Attributes referral = invocation.getProxy().lookup( farthestSrc,
- DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ PartitionNexusProxy.LOOKUP_BYPASS );
Attribute refs = referral.get( REF_ATTR );
doReferralException( farthestSrc, new LdapDN( oldName.getUpName() ), refs );
}
@@ -497,7 +497,7 @@
else if ( farthestSrc != null )
{
Attributes referral = invocation.getProxy().lookup( farthestSrc,
- DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ PartitionNexusProxy.LOOKUP_BYPASS );
Attribute refs = referral.get( REF_ATTR );
doReferralException( farthestSrc, new LdapDN( oldName.getUpName() ), refs );
}
@@ -568,7 +568,7 @@
if ( farthestSrc != null )
{
Attributes referral = invocation.getProxy().lookup( farthestSrc,
- DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ PartitionNexusProxy.LOOKUP_BYPASS );
Attribute refs = referral.get( REF_ATTR );
doReferralException( farthestSrc, new LdapDN( oldName.getUpName() ), refs );
}
@@ -681,7 +681,7 @@
return;
}
- Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes referral = invocation.getProxy().lookup( farthest, PartitionNexusProxy.LOOKUP_BYPASS );
Attribute refs = referral.get( REF_ATTR );
doReferralException( farthest, new LdapDN( name.getUpName() ), refs );
}
@@ -785,7 +785,7 @@
return;
}
- Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes referral = invocation.getProxy().lookup( farthest, PartitionNexusProxy.LOOKUP_BYPASS );
Attribute refs = referral.get( REF_ATTR );
doReferralException( farthest, new LdapDN( name.getUpName() ), refs );
}
@@ -821,7 +821,7 @@
next.addContextPartition( cfg );
// add referrals immediately after adding the new partition
- DirectoryPartition partition = cfg.getContextPartition();
+ Partition partition = cfg.getContextPartition();
LdapDN suffix = partition.getSuffix();
Invocation invocation = InvocationStack.getInstance().peek();
NamingEnumeration list = invocation.getProxy().search( suffix, env, getReferralFilter(), getControls(),
@@ -909,7 +909,7 @@
{
if ( lut.isReferral( base ) )
{
- Attributes referral = invocation.getProxy().lookup( base, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes referral = invocation.getProxy().lookup( base, PartitionNexusProxy.LOOKUP_BYPASS );
Attribute refs = referral.get( REF_ATTR );
doReferralExceptionOnSearchBase( base, refs, controls.getSearchScope() );
}
@@ -920,7 +920,7 @@
return next.search( base, env, filter, controls );
}
- Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes referral = invocation.getProxy().lookup( farthest, PartitionNexusProxy.LOOKUP_BYPASS );
Attribute refs = referral.get( REF_ATTR );
doReferralExceptionOnSearchBase( farthest, new LdapDN( base.getUpName() ), refs, controls.getSearchScope() );
throw new IllegalStateException( "Should never get here: shutting up compiler" );
@@ -929,7 +929,7 @@
{
if ( lut.isReferral( base ) )
{
- Attributes referral = invocation.getProxy().lookup( base, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes referral = invocation.getProxy().lookup( base, PartitionNexusProxy.LOOKUP_BYPASS );
Attribute refs = referral.get( REF_ATTR );
doReferralExceptionOnSearchBase( base, refs, controls.getSearchScope() );
}
@@ -942,7 +942,7 @@
return new ReferralHandlingEnumeration( srfe, lut, attrRegistry, nexus, controls.getSearchScope(), true );
}
- Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes referral = invocation.getProxy().lookup( farthest, PartitionNexusProxy.LOOKUP_BYPASS );
Attribute refs = referral.get( REF_ATTR );
doReferralExceptionOnSearchBase( farthest, new LdapDN( base.getUpName() ), refs, controls.getSearchScope() );
throw new IllegalStateException( "Should never get here: shutting up compiler" );
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Wed Jul 19 20:07:52 2006
@@ -36,7 +36,7 @@
import org.apache.directory.server.core.interceptor.NextInterceptor;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.shared.ldap.exception.LdapAttributeInUseException;
import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeIdentifierException;
import org.apache.directory.shared.ldap.exception.LdapNamingException;
@@ -84,7 +84,7 @@
/**
* the root nexus to all database partitions
*/
- private DirectoryPartitionNexus nexus;
+ private PartitionNexus nexus;
/**
* a binary attribute tranforming filter: String -> byte[]
@@ -349,14 +349,14 @@
if ( returnAllOperationalAttributes || set.contains( "creatorsname" ) )
{
attr = new LockableAttributeImpl( "creatorsName" );
- attr.add( DirectoryPartitionNexus.ADMIN_PRINCIPAL );
+ attr.add( PartitionNexus.ADMIN_PRINCIPAL );
attrs.put( attr );
}
if ( returnAllOperationalAttributes || set.contains( "modifiersname" ) )
{
attr = new LockableAttributeImpl( "modifiersName" );
- attr.add( DirectoryPartitionNexus.ADMIN_PRINCIPAL );
+ attr.add( PartitionNexus.ADMIN_PRINCIPAL );
attrs.put( attr );
}
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java Wed Jul 19 20:07:52 2006
@@ -26,7 +26,7 @@
import org.apache.directory.server.core.interceptor.NextInterceptor;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
import org.apache.directory.server.core.schema.OidRegistry;
@@ -100,7 +100,7 @@
private DirectoryServiceConfiguration factoryCfg;
private SubtreeSpecificationParser ssParser;
private SubtreeEvaluator evaluator;
- private DirectoryPartitionNexus nexus;
+ private PartitionNexus nexus;
private AttributeTypeRegistry attrRegistry;
private OidRegistry oidRegistry;
Modified: directory/branches/apacheds/optimization/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/branches/apacheds/optimization/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Wed Jul 19 20:07:52 2006
@@ -35,7 +35,7 @@
import org.apache.directory.server.core.DirectoryServiceConfiguration;
import org.apache.directory.server.core.DirectoryServiceListener;
import org.apache.directory.server.core.jndi.DeadContext;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.shared.ldap.aci.ACITuple;
import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
import org.apache.directory.shared.ldap.aci.ProtectedItem;
@@ -139,7 +139,7 @@
null, ENTRY_NAME, null, null, ENTRY, null ).size() );
}
- class MockProxy extends DirectoryPartitionNexusProxy
+ class MockProxy extends PartitionNexusProxy
{
final int count;
Modified: directory/branches/apacheds/optimization/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java (original)
+++ directory/branches/apacheds/optimization/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java Wed Jul 19 20:07:52 2006
@@ -28,7 +28,7 @@
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.DeadContext;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -82,7 +82,7 @@
LdapDN dn = new LdapDN( "ou=system" );
Context ctx = new DeadContext();
DirectoryService ds = new MockDirectoryService();
- DirectoryPartitionNexusProxy proxy = new DirectoryPartitionNexusProxy( ctx, ds );
+ PartitionNexusProxy proxy = new PartitionNexusProxy( ctx, ds );
Invocation i = new Invocation( proxy, ctx, "lookup", new Object[]
{ dn } );
InvocationStack.getInstance().push( i );
@@ -108,7 +108,7 @@
LdapDN dn = new LdapDN( "ou=system" );
Context ctx = new DeadContext();
DirectoryService ds = new MockDirectoryService();
- DirectoryPartitionNexusProxy proxy = new DirectoryPartitionNexusProxy( ctx, ds );
+ PartitionNexusProxy proxy = new PartitionNexusProxy( ctx, ds );
Invocation i = new Invocation( proxy, ctx, "lookup", new Object[]
{ dn }, Collections.singleton( "0" ) );
InvocationStack.getInstance().push( i );
@@ -138,7 +138,7 @@
LdapDN dn = new LdapDN( "ou=system" );
Context ctx = new DeadContext();
DirectoryService ds = new MockDirectoryService();
- DirectoryPartitionNexusProxy proxy = new DirectoryPartitionNexusProxy( ctx, ds );
+ PartitionNexusProxy proxy = new PartitionNexusProxy( ctx, ds );
Collection bypass = new HashSet();
bypass.add( "0" );
bypass.add( "1" );
@@ -172,7 +172,7 @@
LdapDN dn = new LdapDN( "ou=system" );
Context ctx = new DeadContext();
DirectoryService ds = new MockDirectoryService();
- DirectoryPartitionNexusProxy proxy = new DirectoryPartitionNexusProxy( ctx, ds );
+ PartitionNexusProxy proxy = new PartitionNexusProxy( ctx, ds );
Collection bypass = new HashSet();
bypass.add( "0" );
bypass.add( "4" );
@@ -202,7 +202,7 @@
LdapDN dn = new LdapDN( "ou=system" );
Context ctx = new DeadContext();
DirectoryService ds = new MockDirectoryService();
- DirectoryPartitionNexusProxy proxy = new DirectoryPartitionNexusProxy( ctx, ds );
+ PartitionNexusProxy proxy = new PartitionNexusProxy( ctx, ds );
Collection bypass = new HashSet();
bypass.add( "1" );
bypass.add( "3" );
@@ -232,9 +232,9 @@
LdapDN dn = new LdapDN( "ou=system" );
Context ctx = new DeadContext();
DirectoryService ds = new MockDirectoryService();
- DirectoryPartitionNexusProxy proxy = new DirectoryPartitionNexusProxy( ctx, ds );
+ PartitionNexusProxy proxy = new PartitionNexusProxy( ctx, ds );
Invocation i = new Invocation( proxy, ctx, "lookup", new Object[]
- { dn }, DirectoryPartitionNexusProxy.BYPASS_ALL_COLLECTION );
+ { dn }, PartitionNexusProxy.BYPASS_ALL_COLLECTION );
InvocationStack.getInstance().push( i );
try
Modified: directory/branches/apacheds/optimization/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java (original)
+++ directory/branches/apacheds/optimization/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java Wed Jul 19 20:07:52 2006
@@ -30,7 +30,7 @@
import org.apache.directory.server.core.configuration.StartupConfiguration;
import org.apache.directory.server.core.jndi.ServerLdapContext;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.ldap.SessionRegistry;
import org.apache.directory.shared.ldap.codec.util.LdapResultEnum;
import org.apache.directory.shared.ldap.exception.LdapException;
@@ -222,7 +222,7 @@
controls = getSearchControls( req, ids, false );
}
else if ( ( ( ServerLdapContext ) ctx ).getPrincipal().getName()
- .trim().equals( DirectoryPartitionNexus.ADMIN_PRINCIPAL ) )
+ .trim().equals( PartitionNexus.ADMIN_PRINCIPAL ) )
{
controls = getSearchControls( req, ids, true );
}