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 [1/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...
Author: akarasulu
Date: Wed Jul 19 20:07:52 2006
New Revision: 423731
URL: http://svn.apache.org/viewvc?rev=423731&view=rev
Log:
refactoring a few class names so they are consistent
Added:
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
- copied, changed from r423455, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/AbstractDirectoryPartition.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
- copied, changed from r423455, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DefaultDirectoryPartitionNexus.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/Partition.java
- copied, changed from r423455, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartition.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
- copied, changed from r423455, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexus.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
- copied, changed from r423455, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexusProxy.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
- copied, changed from r423455, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDirectoryPartition.java
Removed:
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/AbstractDirectoryPartition.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DefaultDirectoryPartitionNexus.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartition.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexus.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/DirectoryPartitionNexusProxy.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDirectoryPartition.java
Modified:
directory/branches/apacheds/optimization/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java
directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java
directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DirectoryService.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/event/EventService.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/invocation/Invocation.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/MutableBTreePartitionConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
directory/branches/apacheds/optimization/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
directory/branches/apacheds/optimization/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
directory/branches/apacheds/optimization/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java
directory/branches/apacheds/optimization/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java
directory/branches/apacheds/optimization/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java
directory/branches/apacheds/optimization/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
Modified: directory/branches/apacheds/optimization/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java (original)
+++ directory/branches/apacheds/optimization/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java Wed Jul 19 20:07:52 2006
@@ -35,7 +35,7 @@
import javax.naming.ldap.LdapContext;
import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.shared.ldap.ldif.Entry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -111,7 +111,7 @@
*/
protected AbstractPerformanceTest( Class subclass ) throws IOException
{
- super( DirectoryPartitionNexus.ADMIN_PRINCIPAL, "secret" );
+ super( PartitionNexus.ADMIN_PRINCIPAL, "secret" );
this.subclass = subclass;
// Setup the statistics output writer
Modified: directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java (original)
+++ directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java Wed Jul 19 20:07:52 2006
@@ -17,7 +17,7 @@
package org.apache.directory.server.core.authz;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.subtree.SubentryService;
import org.apache.directory.server.core.unit.AbstractTestCase;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -47,7 +47,7 @@
*/
public AbstractAuthorizationITest()
{
- super( DirectoryPartitionNexus.ADMIN_PRINCIPAL, "secret" );
+ super( PartitionNexus.ADMIN_PRINCIPAL, "secret" );
super.configuration.setAccessControlEnabled( true );
}
@@ -64,7 +64,7 @@
*/
public DirContext getContextAsAdmin() throws NamingException
{
- return getContextAsAdmin( DirectoryPartitionNexus.SYSTEM_PARTITION_SUFFIX );
+ return getContextAsAdmin( PartitionNexus.SYSTEM_PARTITION_SUFFIX );
}
@@ -82,7 +82,7 @@
Hashtable env = ( Hashtable ) sysRoot.getEnvironment().clone();
env.put( DirContext.PROVIDER_URL, dn );
env.put( DirContext.SECURITY_AUTHENTICATION, "simple" );
- env.put( DirContext.SECURITY_PRINCIPAL, DirectoryPartitionNexus.ADMIN_PRINCIPAL );
+ env.put( DirContext.SECURITY_PRINCIPAL, PartitionNexus.ADMIN_PRINCIPAL );
env.put( DirContext.SECURITY_CREDENTIALS, "secret" );
return new InitialDirContext( env );
}
@@ -195,7 +195,7 @@
*/
public DirContext getContextAs( Name user, String password ) throws NamingException
{
- return getContextAs( user, password, DirectoryPartitionNexus.SYSTEM_PARTITION_SUFFIX );
+ return getContextAs( user, password, PartitionNexus.SYSTEM_PARTITION_SUFFIX );
}
Modified: directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java (original)
+++ directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java Wed Jul 19 20:07:52 2006
@@ -31,7 +31,7 @@
import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
import org.apache.directory.server.core.configuration.RemovePartitionConfiguration;
import org.apache.directory.server.core.jndi.CoreContextFactory;
-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.unit.AbstractAdminTestCase;
@@ -58,7 +58,7 @@
ctxEntry.put( "objectClass", "top" );
ctxEntry.put( "ou", "removable" );
partitionCfg.setContextEntry( ctxEntry );
- partitionCfg.setContextPartition( new JdbmDirectoryPartition() );
+ partitionCfg.setContextPartition( new JdbmPartition() );
// Test AddContextPartition
AddPartitionConfiguration addCfg = new AddPartitionConfiguration( partitionCfg );
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Wed Jul 19 20:07:52 2006
@@ -37,8 +37,8 @@
import org.apache.directory.server.core.jndi.DeadContext;
import org.apache.directory.server.core.jndi.PropertyKeys;
import org.apache.directory.server.core.jndi.ServerLdapContext;
-import org.apache.directory.server.core.partition.DefaultDirectoryPartitionNexus;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.DefaultPartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
import org.apache.directory.server.core.schema.GlobalRegistries;
import org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries;
@@ -85,7 +85,7 @@
private GlobalRegistries globalRegistries;
/** the root nexus */
- private DefaultDirectoryPartitionNexus partitionNexus;
+ private DefaultPartitionNexus partitionNexus;
/** whether or not server is started for the first time */
private boolean firstStart;
@@ -316,7 +316,7 @@
}
- public DirectoryPartitionNexus getPartitionNexus()
+ public PartitionNexus getPartitionNexus()
{
return partitionNexus;
}
@@ -425,7 +425,7 @@
/*
* If the admin entry is there, then the database was already created
*/
- if ( !partitionNexus.hasEntry( DirectoryPartitionNexus.getAdminName() ) )
+ if ( !partitionNexus.hasEntry( PartitionNexus.getAdminName() ) )
{
firstStart = true;
@@ -437,16 +437,16 @@
objectClass.add( "inetOrgPerson" );
attributes.put( objectClass );
- attributes.put( "uid", DirectoryPartitionNexus.ADMIN_UID );
- attributes.put( "userPassword", DirectoryPartitionNexus.ADMIN_PASSWORD );
+ attributes.put( "uid", PartitionNexus.ADMIN_UID );
+ attributes.put( "userPassword", PartitionNexus.ADMIN_PASSWORD );
attributes.put( "displayName", "Directory Superuser" );
attributes.put( "cn", "system administrator" );
attributes.put( "sn", "administrator" );
- attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", PartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
attributes.put( "displayName", "Directory Superuser" );
- partitionNexus.add(DirectoryPartitionNexus.getAdminName(),
+ partitionNexus.add(PartitionNexus.getAdminName(),
attributes );
}
@@ -469,7 +469,7 @@
attributes.put( objectClass );
attributes.put( "ou", "users" );
- attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", PartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
partitionNexus.add( userDn, attributes );
@@ -493,7 +493,7 @@
attributes.put( objectClass );
attributes.put( "ou", "groups" );
- attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", PartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
partitionNexus.add( groupDn, attributes );
@@ -517,8 +517,8 @@
objectClass.add( "groupOfUniqueNames" );
attributes.put( objectClass );
attributes.put( "cn", "Administrators" );
- attributes.put( "uniqueMember", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
- attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "uniqueMember", PartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", PartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
partitionNexus.add(normName, attributes );
@@ -544,7 +544,7 @@
attributes.put( objectClass );
attributes.put( "ou", "configuration" );
- attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", PartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
partitionNexus.add( configurationDn, attributes );
@@ -568,7 +568,7 @@
attributes.put( objectClass );
attributes.put( "ou", "partitions" );
- attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", PartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
partitionNexus.add( partitionsDn, attributes );
@@ -592,7 +592,7 @@
attributes.put( objectClass );
attributes.put( "ou", "services" );
- attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", PartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
partitionNexus.add( servicesDn, attributes );
@@ -616,7 +616,7 @@
attributes.put( objectClass );
attributes.put( "ou", "interceptors" );
- attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", PartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
partitionNexus.add( interceptorsDn, attributes );
@@ -641,7 +641,7 @@
attributes.put( "objectClass", "extensibleObject" );
attributes.put( "prefNodeName", "sysPrefRoot" );
- attributes.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL );
+ attributes.put( "creatorsName", PartitionNexus.ADMIN_PRINCIPAL );
attributes.put( "createTimestamp", DateUtils.getGeneralizedTime() );
partitionNexus.add( sysPrefRootDn, attributes );
@@ -659,19 +659,19 @@
// Warn if the default password is not changed.
boolean needToChangeAdminPassword = false;
- LdapDN adminDn = new LdapDN( DirectoryPartitionNexus.ADMIN_PRINCIPAL );
+ LdapDN adminDn = new LdapDN( PartitionNexus.ADMIN_PRINCIPAL );
adminDn.normalize( configuration.getGlobalRegistries().getAttributeTypeRegistry().getNormalizerMapping() );
Attributes adminEntry = partitionNexus.lookup( adminDn );
Object userPassword = adminEntry.get( "userPassword" ).get();
if ( userPassword instanceof byte[] )
{
- needToChangeAdminPassword = DirectoryPartitionNexus.ADMIN_PASSWORD.equals( new String(
+ needToChangeAdminPassword = PartitionNexus.ADMIN_PASSWORD.equals( new String(
( byte[] ) userPassword ) );
}
- else if ( userPassword.toString().equals( DirectoryPartitionNexus.ADMIN_PASSWORD ) )
+ else if ( userPassword.toString().equals( PartitionNexus.ADMIN_PASSWORD ) )
{
- needToChangeAdminPassword = DirectoryPartitionNexus.ADMIN_PASSWORD.equals( userPassword.toString() );
+ needToChangeAdminPassword = PartitionNexus.ADMIN_PASSWORD.equals( userPassword.toString() );
}
if ( needToChangeAdminPassword )
@@ -812,7 +812,7 @@
log.debug( "binary ids used: " + binaries );
}
- partitionNexus = new DefaultDirectoryPartitionNexus( new LockableAttributesImpl() );
+ partitionNexus = new DefaultPartitionNexus( new LockableAttributesImpl() );
partitionNexus.init( configuration, null );
interceptorChain = new InterceptorChain();
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java Wed Jul 19 20:07:52 2006
@@ -24,7 +24,7 @@
import org.apache.directory.server.core.configuration.StartupConfiguration;
import org.apache.directory.server.core.interceptor.InterceptorChain;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.schema.GlobalRegistries;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -82,7 +82,7 @@
}
- public DirectoryPartitionNexus getPartitionNexus()
+ public PartitionNexus getPartitionNexus()
{
return parent.getPartitionNexus();
}
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DirectoryService.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DirectoryService.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DirectoryService.java Wed Jul 19 20:07:52 2006
@@ -29,7 +29,7 @@
import org.apache.directory.server.core.configuration.Configuration;
import org.apache.directory.server.core.jndi.AbstractContextFactory;
-import org.apache.directory.server.core.partition.DirectoryPartition;
+import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -100,7 +100,7 @@
/**
- * Calls {@link DirectoryPartition#sync()} for all registered {@link DirectoryPartition}s.
+ * Calls {@link Partition#sync()} for all registered {@link Partition}s.
* @throws NamingException if synchronization failed
*/
public abstract void sync() throws NamingException;
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java Wed Jul 19 20:07:52 2006
@@ -23,7 +23,7 @@
import org.apache.directory.server.core.configuration.StartupConfiguration;
import org.apache.directory.server.core.interceptor.InterceptorChain;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.schema.GlobalRegistries;
@@ -73,10 +73,10 @@
/**
- * Returns the {@link DirectoryPartitionNexus} of the {@link DirectoryService}
+ * Returns the {@link PartitionNexus} of the {@link DirectoryService}
* which bypasses the interceptor chain.
*/
- DirectoryPartitionNexus getPartitionNexus();
+ PartitionNexus getPartitionNexus();
/**
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java Wed Jul 19 20:07:52 2006
@@ -23,12 +23,12 @@
import org.apache.directory.server.core.DirectoryServiceConfiguration;
import org.apache.directory.server.core.configuration.AuthenticatorConfiguration;
import org.apache.directory.server.core.jndi.ServerContext;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.shared.ldap.name.LdapDN;
/**
- * Authenticates users who access {@link DirectoryPartitionNexus}.
+ * Authenticates users who access {@link PartitionNexus}.
* <p>
* {@link Authenticator}s are registered to and configured by
* {@link AuthenticationService} interceptor.
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Wed Jul 19 20:07:52 2006
@@ -33,7 +33,7 @@
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.ServerContext;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -162,7 +162,7 @@
// ---- lookup the principal entry's userPassword attribute
Invocation invocation = InvocationStack.getInstance().peek();
- DirectoryPartitionNexusProxy proxy = invocation.getProxy();
+ PartitionNexusProxy proxy = invocation.getProxy();
Attributes userEntry;
try
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java Wed Jul 19 20:07:52 2006
@@ -31,8 +31,8 @@
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.ServerContext;
import org.apache.directory.server.core.jndi.ServerLdapContext;
-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;
@@ -210,7 +210,7 @@
* @param entry the target entry that access to is being controled
* @throws NamingException if there are problems accessing attribute values
*/
- private void addPerscriptiveAciTuples( DirectoryPartitionNexusProxy proxy, Collection tuples, LdapDN dn,
+ private void addPerscriptiveAciTuples( PartitionNexusProxy proxy, Collection tuples, LdapDN dn,
Attributes entry ) throws NamingException
{
Attribute oc = ServerUtils.getAttribute( objectClassType, entry );
@@ -228,7 +228,7 @@
{
LdapDN parentDn = ( LdapDN ) dn.clone();
parentDn.remove( dn.size() - 1 );
- entry = proxy.lookup( parentDn, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ entry = proxy.lookup( parentDn, PartitionNexusProxy.LOOKUP_BYPASS );
}
Attribute subentries = ServerUtils.getAttribute( acSubentryType, entry );
@@ -290,7 +290,7 @@
* @param entry the target entry that access to is being regulated
* @throws NamingException if there are problems accessing attribute values
*/
- private void addSubentryAciTuples( DirectoryPartitionNexusProxy proxy, Collection tuples, LdapDN dn, Attributes entry )
+ private void addSubentryAciTuples( PartitionNexusProxy proxy, Collection tuples, LdapDN dn, Attributes entry )
throws NamingException
{
// only perform this for subentries
@@ -304,7 +304,7 @@
LdapDN parentDn = ( LdapDN ) dn.clone();
parentDn.remove( dn.size() - 1 );
Attributes administrativeEntry = proxy.lookup( parentDn, new String[]
- { SUBENTRYACI_ATTR }, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ { SUBENTRYACI_ATTR }, PartitionNexusProxy.LOOKUP_BYPASS );
Attribute subentryAci = administrativeEntry.get( SUBENTRYACI_ATTR );
if ( subentryAci == null )
@@ -369,7 +369,7 @@
}
// bypass authz code but manage caches if operation is performed by the admin
- if ( userName.toNormName().equalsIgnoreCase( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
+ if ( userName.toNormName().equalsIgnoreCase( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
{
next.add( normName, entry );
tupleCache.subentryAdded( normName.toNormName(), normName, entry );
@@ -396,7 +396,7 @@
addSubentryAciTuples( invocation.getProxy(), tuples, normName, subentryAttrs );
// check if entry scope permission is granted
- DirectoryPartitionNexusProxy proxy = invocation.getProxy();
+ PartitionNexusProxy proxy = invocation.getProxy();
engine.checkPermission( proxy, userGroups, userName, principal.getAuthenticationLevel(), normName, null, null,
ADD_PERMS, tuples, subentryAttrs );
@@ -426,8 +426,8 @@
{
// Access the principal requesting the operation, and bypass checks if it is the admin
Invocation invocation = InvocationStack.getInstance().peek();
- DirectoryPartitionNexusProxy proxy = invocation.getProxy();
- Attributes entry = proxy.lookup( name, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ PartitionNexusProxy proxy = invocation.getProxy();
+ Attributes entry = proxy.lookup( name, PartitionNexusProxy.LOOKUP_BYPASS );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN userName = principal.getJndiName();
@@ -439,7 +439,7 @@
}
// bypass authz code but manage caches if operation is performed by the admin
- if ( userName.toString().equalsIgnoreCase( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
+ if ( userName.toString().equalsIgnoreCase( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
{
next.delete( name );
tupleCache.subentryDeleted( name, entry );
@@ -466,8 +466,8 @@
{
// Access the principal requesting the operation, and bypass checks if it is the admin
Invocation invocation = InvocationStack.getInstance().peek();
- DirectoryPartitionNexusProxy proxy = invocation.getProxy();
- Attributes entry = proxy.lookup( name, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ PartitionNexusProxy proxy = invocation.getProxy();
+ Attributes entry = proxy.lookup( name, PartitionNexusProxy.LOOKUP_BYPASS );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN userName = principal.getJndiName();
@@ -479,7 +479,7 @@
}
// bypass authz code but manage caches if operation is performed by the admin
- if ( userName.toString().equalsIgnoreCase( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
+ if ( userName.toString().equalsIgnoreCase( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
{
next.modify( name, modOp, mods );
tupleCache.subentryModified( name, modOp, mods, entry );
@@ -531,8 +531,8 @@
{
// Access the principal requesting the operation, and bypass checks if it is the admin
Invocation invocation = InvocationStack.getInstance().peek();
- DirectoryPartitionNexusProxy proxy = invocation.getProxy();
- Attributes entry = proxy.lookup( name, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ PartitionNexusProxy proxy = invocation.getProxy();
+ Attributes entry = proxy.lookup( name, PartitionNexusProxy.LOOKUP_BYPASS );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN userName = principal.getJndiName();
@@ -544,7 +544,7 @@
}
// bypass authz code but manage caches if operation is performed by the admin
- if ( userName.toString().equalsIgnoreCase( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
+ if ( userName.toString().equalsIgnoreCase( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
{
next.modify( name, mods );
tupleCache.subentryModified( name, mods, entry );
@@ -594,12 +594,12 @@
public boolean hasEntry( NextInterceptor next, LdapDN name ) throws NamingException
{
Invocation invocation = InvocationStack.getInstance().peek();
- DirectoryPartitionNexusProxy proxy = invocation.getProxy();
- Attributes entry = proxy.lookup( name, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ PartitionNexusProxy proxy = invocation.getProxy();
+ Attributes entry = proxy.lookup( name, PartitionNexusProxy.LOOKUP_BYPASS );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN userName = principal.getJndiName();
- if ( userName.toNormName().equalsIgnoreCase( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) || !enabled
+ if ( userName.toNormName().equalsIgnoreCase( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) || !enabled
|| name.toString().trim().equals( "" ) ) // no checks on the rootdse
{
return next.hasEntry( name );
@@ -642,7 +642,7 @@
return;
}
- DirectoryPartitionNexusProxy proxy = InvocationStack.getInstance().peek().getProxy();
+ PartitionNexusProxy proxy = InvocationStack.getInstance().peek().getProxy();
LdapDN userName = principal.getJndiName();
Set userGroups = groupCache.getGroups( userName.toNormName() );
Collection tuples = new HashSet();
@@ -671,13 +671,13 @@
public Attributes lookup( NextInterceptor next, LdapDN dn, String[] attrIds ) throws NamingException
{
Invocation invocation = InvocationStack.getInstance().peek();
- DirectoryPartitionNexusProxy proxy = invocation.getProxy();
- Attributes entry = proxy.lookup( dn, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ PartitionNexusProxy proxy = invocation.getProxy();
+ Attributes entry = proxy.lookup( dn, PartitionNexusProxy.LOOKUP_BYPASS );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN principalDn = new LdapDN( principal.getName() );
principalDn.normalize( attrRegistry.getNormalizerMapping() );
- if ( principalDn.toNormName().equalsIgnoreCase( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) || !enabled )
+ if ( principalDn.toNormName().equalsIgnoreCase( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) || !enabled )
{
return next.lookup( dn, attrIds );
}
@@ -690,13 +690,13 @@
public Attributes lookup( NextInterceptor next, LdapDN name ) throws NamingException
{
Invocation invocation = InvocationStack.getInstance().peek();
- DirectoryPartitionNexusProxy proxy = invocation.getProxy();
- Attributes entry = proxy.lookup( name, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ PartitionNexusProxy proxy = invocation.getProxy();
+ Attributes entry = proxy.lookup( name, PartitionNexusProxy.LOOKUP_BYPASS );
LdapPrincipal user = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN principalDn = (LdapDN)user.getJndiName();
principalDn.normalize( attrRegistry.getNormalizerMapping() );
- if ( principalDn.toString().equals( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) || !enabled )
+ if ( principalDn.toString().equals( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) || !enabled )
{
return next.lookup( name );
}
@@ -710,8 +710,8 @@
{
// Access the principal requesting the operation, and bypass checks if it is the admin
Invocation invocation = InvocationStack.getInstance().peek();
- DirectoryPartitionNexusProxy proxy = invocation.getProxy();
- Attributes entry = proxy.lookup( name, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ PartitionNexusProxy proxy = invocation.getProxy();
+ Attributes entry = proxy.lookup( name, PartitionNexusProxy.LOOKUP_BYPASS );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN userName = principal.getJndiName();
LdapDN newName = ( LdapDN ) name.clone();
@@ -726,7 +726,7 @@
}
// bypass authz code but manage caches if operation is performed by the admin
- if ( userName.toString().equalsIgnoreCase( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
+ if ( userName.toString().equalsIgnoreCase( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
{
next.modifyRn( name, newRn, deleteOldRn );
tupleCache.subentryRenamed( name, newName );
@@ -783,8 +783,8 @@
{
// Access the principal requesting the operation, and bypass checks if it is the admin
Invocation invocation = InvocationStack.getInstance().peek();
- DirectoryPartitionNexusProxy proxy = invocation.getProxy();
- Attributes entry = proxy.lookup( oriChildName, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ PartitionNexusProxy proxy = invocation.getProxy();
+ Attributes entry = proxy.lookup( oriChildName, PartitionNexusProxy.LOOKUP_BYPASS );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN userName = principal.getJndiName();
LdapDN newName = ( LdapDN ) newParentName.clone();
@@ -798,7 +798,7 @@
}
// bypass authz code but manage caches if operation is performed by the admin
- if ( userName.toString().equalsIgnoreCase( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
+ if ( userName.toString().equalsIgnoreCase( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
{
next.move( oriChildName, newParentName, newRn, deleteOldRn );
tupleCache.subentryRenamed( oriChildName, newName );
@@ -859,8 +859,8 @@
{
// Access the principal requesting the operation, and bypass checks if it is the admin
Invocation invocation = InvocationStack.getInstance().peek();
- DirectoryPartitionNexusProxy proxy = invocation.getProxy();
- Attributes entry = proxy.lookup( oriChildName, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ PartitionNexusProxy proxy = invocation.getProxy();
+ Attributes entry = proxy.lookup( oriChildName, PartitionNexusProxy.LOOKUP_BYPASS );
LdapDN newName = ( LdapDN ) newParentName.clone();
newName.add( oriChildName.get( oriChildName.size() - 1 ) );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
@@ -874,7 +874,7 @@
}
// bypass authz code but manage caches if operation is performed by the admin
- if ( userName.toString().equalsIgnoreCase( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
+ if ( userName.toString().equalsIgnoreCase( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
{
next.move( oriChildName, newParentName );
tupleCache.subentryRenamed( oriChildName, newName );
@@ -912,7 +912,7 @@
ServerLdapContext ctx = ( ServerLdapContext ) invocation.getCaller();
LdapPrincipal user = ctx.getPrincipal();
NamingEnumeration e = next.list( base );
- if ( user.getName().equalsIgnoreCase( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) || !enabled )
+ if ( user.getName().equalsIgnoreCase( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) || !enabled )
{
return e;
}
@@ -932,7 +932,7 @@
boolean isSubschemaSubentryLookup = subschemaSubentryDn.equals( base.toNormName() );
boolean isRootDSELookup = base.size() == 0 && searchCtls.getSearchScope() == SearchControls.OBJECT_SCOPE;
- if ( principalDn.toNormName().equals( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) || !enabled ||
+ if ( principalDn.toNormName().equals( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) || !enabled ||
isRootDSELookup || isSubschemaSubentryLookup )
{
return e;
@@ -946,12 +946,12 @@
{
// Access the principal requesting the operation, and bypass checks if it is the admin
Invocation invocation = InvocationStack.getInstance().peek();
- DirectoryPartitionNexusProxy proxy = invocation.getProxy();
- Attributes entry = proxy.lookup( name, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ PartitionNexusProxy proxy = invocation.getProxy();
+ Attributes entry = proxy.lookup( name, PartitionNexusProxy.LOOKUP_BYPASS );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN userName = principal.getJndiName();
- if ( userName.toNormName().equals( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) || !enabled )
+ if ( userName.toNormName().equals( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) || !enabled )
{
return next.compare( name, oid, value );
}
@@ -975,10 +975,10 @@
{
// Access the principal requesting the operation, and bypass checks if it is the admin
Invocation invocation = InvocationStack.getInstance().peek();
- DirectoryPartitionNexusProxy proxy = invocation.getProxy();
+ PartitionNexusProxy proxy = invocation.getProxy();
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN userName = principal.getJndiName();
- if ( userName.toString().equalsIgnoreCase( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) || !enabled )
+ if ( userName.toString().equalsIgnoreCase( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) || !enabled )
{
return next.getMatchedName( dn );
}
@@ -992,7 +992,7 @@
// that but if permission is granted then short the process and return the dn
while ( matched.size() > 0 )
{
- entry = proxy.lookup( matched, DirectoryPartitionNexusProxy.GETMATCHEDDN_BYPASS );
+ entry = proxy.lookup( matched, PartitionNexusProxy.GETMATCHEDDN_BYPASS );
Set userGroups = groupCache.getGroups( userName.toString() );
Collection tuples = new HashSet();
addPerscriptiveAciTuples( proxy, tuples, matched, entry );
@@ -1025,7 +1025,7 @@
* tests. If we hasPermission() returns false we immediately short the
* process and return false.
*/
- Attributes entry = invocation.getProxy().lookup( normName, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes entry = invocation.getProxy().lookup( normName, PartitionNexusProxy.LOOKUP_BYPASS );
ServerLdapContext ctx = ( ServerLdapContext ) invocation.getCaller();
LdapDN userDn = ctx.getPrincipal().getJndiName();
Set userGroups = groupCache.getGroups( userDn.toNormName() );
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java Wed Jul 19 20:07:52 2006
@@ -39,14 +39,14 @@
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.ServerContext;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.name.LdapDN;
/**
- * An {@link Interceptor} that controls access to {@link DirectoryPartitionNexus}.
+ * An {@link Interceptor} that controls access to {@link PartitionNexus}.
* If a user tries to perform any operations that requires
* permission he or she doesn't have, {@link NoPermissionException} will be
* thrown and therefore the current invocation chain will terminate.
@@ -97,12 +97,12 @@
// disable this static module if basic access control mechanisms are enabled
enabled = !factoryCfg.getStartupConfiguration().isAccessControlEnabled();
- ADMIN_DN = DirectoryPartitionNexus.getAdminName();
+ ADMIN_DN = PartitionNexus.getAdminName();
- USER_BASE_DN = DirectoryPartitionNexus.getUsersBaseName();
+ USER_BASE_DN = PartitionNexus.getUsersBaseName();
USER_BASE_DN_NORMALIZED = LdapDN.normalize( USER_BASE_DN, oidsMap );
- GROUP_BASE_DN = DirectoryPartitionNexus.getGroupsBaseName();
+ GROUP_BASE_DN = PartitionNexus.getGroupsBaseName();
GROUP_BASE_DN_NORMALIZED = LdapDN.normalize( GROUP_BASE_DN, oidsMap );
}
@@ -215,9 +215,9 @@
throw new LdapNoPermissionException( msg );
}
- if ( !principalDn.toNormName().equals( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
+ if ( !principalDn.toNormName().equals( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
{
- if ( dn.toNormName().equals( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
+ if ( dn.toNormName().equals( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
{
String msg = "User " + principalDn;
msg += " does not have permission to modify the account of the";
@@ -454,7 +454,7 @@
dn = new LdapDN( result.getName() );
dn.normalize( oidsMap );
- boolean isAdmin = principalDn.toNormName().equals( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
+ boolean isAdmin = principalDn.toNormName().equals( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
// Admin user gets full access to all entries
if ( isAdmin )
@@ -483,7 +483,7 @@
}
// Non-admin users cannot read the admin entry
- if ( dn.toNormName().equals( DirectoryPartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
+ if ( dn.toNormName().equals( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED ) )
{
return false;
}
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Wed Jul 19 20:07:52 2006
@@ -18,7 +18,7 @@
import org.apache.directory.server.core.DirectoryServiceConfiguration;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.shared.ldap.filter.BranchNode;
import org.apache.directory.shared.ldap.filter.SimpleNode;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -56,7 +56,7 @@
/** String key for the DN of a group to a Set (HashSet) for the Strings of member DNs */
private final Map groups = new HashMap();
/** a handle on the partition nexus */
- private final DirectoryPartitionNexus nexus;
+ private final PartitionNexus nexus;
/** the env to use for searching */
private final Hashtable env;
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Wed Jul 19 20:07:52 2006
@@ -30,7 +30,7 @@
import javax.naming.directory.SearchResult;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
-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;
@@ -71,7 +71,7 @@
/** a map of strings to ACITuple collections */
private final Map tuples = new HashMap();
/** a handle on the partition nexus */
- private final DirectoryPartitionNexus nexus;
+ private final PartitionNexus nexus;
/** a normalizing ACIItem parser */
private final ACIItemParser aciParser;
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java Wed Jul 19 20:07:52 2006
@@ -26,7 +26,7 @@
import org.apache.directory.server.core.event.Evaluator;
import org.apache.directory.server.core.event.ExpressionEvaluator;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
import org.apache.directory.server.core.schema.OidRegistry;
import org.apache.directory.server.core.subtree.RefinementEvaluator;
@@ -107,7 +107,7 @@
* @param aciTuples {@link org.apache.directory.shared.ldap.aci.ACITuple}s translated from {@link org.apache.directory.shared.ldap.aci.ACIItem}s in the subtree entries
* @throws NamingException if failed to evaluate ACI items
*/
- public void checkPermission( DirectoryPartitionNexusProxy proxy, Collection userGroupNames, LdapDN username,
+ public void checkPermission( PartitionNexusProxy proxy, Collection userGroupNames, LdapDN username,
AuthenticationLevel authenticationLevel, LdapDN entryName, String attrId, Object attrValue,
Collection microOperations, Collection aciTuples, Attributes entry ) throws NamingException
{
@@ -150,7 +150,7 @@
* @param microOperations the {@link org.apache.directory.shared.ldap.aci.MicroOperation}s to perform
* @param aciTuples {@link org.apache.directory.shared.ldap.aci.ACITuple}s translated from {@link org.apache.directory.shared.ldap.aci.ACIItem}s in the subtree entries
*/
- public boolean hasPermission( DirectoryPartitionNexusProxy proxy, Collection userGroupNames, LdapDN userName,
+ public boolean hasPermission( PartitionNexusProxy proxy, Collection userGroupNames, LdapDN userName,
AuthenticationLevel authenticationLevel, LdapDN entryName, String attrId, Object attrValue,
Collection microOperations, Collection aciTuples, Attributes entry ) throws NamingException
{
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java Wed Jul 19 20:07:52 2006
@@ -25,7 +25,7 @@
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
import org.apache.directory.shared.ldap.aci.MicroOperation;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -61,7 +61,7 @@
* @return the collection of filtered tuples
* @throws NamingException if failed to filter the specifiec tuples
*/
- Collection filter( Collection tuples, OperationScope scope, DirectoryPartitionNexusProxy proxy,
+ Collection filter( Collection tuples, OperationScope scope, PartitionNexusProxy proxy,
Collection userGroupNames, LdapDN userName, Attributes userEntry,
AuthenticationLevel authenticationLevel, LdapDN entryName, String attrId,
Object attrValue, Attributes entry, Collection microOperations )
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java Wed Jul 19 20:07:52 2006
@@ -25,7 +25,7 @@
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
-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.name.LdapDN;
@@ -40,7 +40,7 @@
*/
public class HighestPrecedenceFilter implements ACITupleFilter
{
- public Collection filter( Collection tuples, OperationScope scope, DirectoryPartitionNexusProxy proxy,
+ public Collection filter( Collection tuples, OperationScope scope, PartitionNexusProxy proxy,
Collection userGroupNames, LdapDN userName, Attributes userEntry, AuthenticationLevel authenticationLevel,
LdapDN entryName, String attrId, Object attrValue, Attributes entry, Collection microOperations )
throws NamingException
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java Wed Jul 19 20:07:52 2006
@@ -26,7 +26,7 @@
import javax.naming.directory.Attributes;
import javax.naming.directory.SearchControls;
-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;
@@ -56,7 +56,7 @@
}
- public Collection filter( Collection tuples, OperationScope scope, DirectoryPartitionNexusProxy proxy,
+ public Collection filter( Collection tuples, OperationScope scope, PartitionNexusProxy proxy,
Collection userGroupNames, LdapDN userName, Attributes userEntry, AuthenticationLevel authenticationLevel,
LdapDN entryName, String attrId, Object attrValue, Attributes entry, Collection microOperations )
throws NamingException
@@ -125,7 +125,7 @@
}
- private int getImmSubCount( DirectoryPartitionNexusProxy proxy, LdapDN entryName ) throws NamingException
+ private int getImmSubCount( PartitionNexusProxy proxy, LdapDN entryName ) throws NamingException
{
int cnt = 0;
NamingEnumeration e = null;
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java Wed Jul 19 20:07:52 2006
@@ -26,7 +26,7 @@
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
-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;
@@ -43,7 +43,7 @@
*/
public class MaxValueCountFilter implements ACITupleFilter
{
- public Collection filter( Collection tuples, OperationScope scope, DirectoryPartitionNexusProxy proxy,
+ public Collection filter( Collection tuples, OperationScope scope, PartitionNexusProxy proxy,
Collection userGroupNames, LdapDN userName, Attributes userEntry, AuthenticationLevel authenticationLevel,
LdapDN entryName, String attrId, Object attrValue, Attributes entry, Collection microOperations )
throws NamingException
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java Wed Jul 19 20:07:52 2006
@@ -25,7 +25,7 @@
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
-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.MicroOperation;
@@ -42,7 +42,7 @@
*/
public class MicroOperationFilter implements ACITupleFilter
{
- public Collection filter( Collection tuples, OperationScope scope, DirectoryPartitionNexusProxy proxy,
+ public Collection filter( Collection tuples, OperationScope scope, PartitionNexusProxy proxy,
Collection userGroupNames, LdapDN userName, Attributes userEntry, AuthenticationLevel authenticationLevel,
LdapDN entryName, String attrId, Object attrValue, Attributes entry, Collection microOperations )
throws NamingException
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java Wed Jul 19 20:07:52 2006
@@ -26,7 +26,7 @@
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
-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;
@@ -50,7 +50,7 @@
*/
public class MostSpecificProtectedItemFilter implements ACITupleFilter
{
- public Collection filter( Collection tuples, OperationScope scope, DirectoryPartitionNexusProxy proxy,
+ public Collection filter( Collection tuples, OperationScope scope, PartitionNexusProxy proxy,
Collection userGroupNames, LdapDN userName, Attributes userEntry, AuthenticationLevel authenticationLevel,
LdapDN entryName, String attrId, Object attrValue, Attributes entry, Collection microOperations )
throws NamingException
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java Wed Jul 19 20:07:52 2006
@@ -26,7 +26,7 @@
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
-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.UserClass;
@@ -48,7 +48,7 @@
*/
public class MostSpecificUserClassFilter implements ACITupleFilter
{
- public Collection filter( Collection tuples, OperationScope scope, DirectoryPartitionNexusProxy proxy,
+ public Collection filter( Collection tuples, OperationScope scope, PartitionNexusProxy proxy,
Collection userGroupNames, LdapDN userName, Attributes userEntry, AuthenticationLevel authenticationLevel,
LdapDN entryName, String attrId, Object attrValue, Attributes entry, Collection microOperations )
throws NamingException
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java Wed Jul 19 20:07:52 2006
@@ -28,7 +28,7 @@
import org.apache.directory.server.core.ServerUtils;
import org.apache.directory.server.core.event.Evaluator;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
import org.apache.directory.server.core.schema.OidRegistry;
import org.apache.directory.server.core.subtree.RefinementEvaluator;
@@ -67,7 +67,7 @@
}
- public Collection filter( Collection tuples, OperationScope scope, DirectoryPartitionNexusProxy proxy,
+ public Collection filter( Collection tuples, OperationScope scope, PartitionNexusProxy proxy,
Collection userGroupNames, LdapDN userName, Attributes userEntry,
AuthenticationLevel authenticationLevel, LdapDN entryName, String attrId,
Object attrValue, Attributes entry, Collection microOperations )
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java Wed Jul 19 20:07:52 2006
@@ -25,7 +25,7 @@
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.server.core.subtree.SubtreeEvaluator;
import org.apache.directory.shared.ldap.aci.ACITuple;
import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
@@ -54,7 +54,7 @@
}
- public Collection filter( Collection tuples, OperationScope scope, DirectoryPartitionNexusProxy proxy,
+ public Collection filter( Collection tuples, OperationScope scope, PartitionNexusProxy proxy,
Collection userGroupNames, LdapDN userName, Attributes userEntry, AuthenticationLevel authenticationLevel,
LdapDN entryName, String attrId, Object attrValue, Attributes entry, Collection microOperations )
throws NamingException
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java Wed Jul 19 20:07:52 2006
@@ -26,7 +26,7 @@
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
-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;
@@ -43,7 +43,7 @@
*/
public class RestrictedByFilter implements ACITupleFilter
{
- public Collection filter( Collection tuples, OperationScope scope, DirectoryPartitionNexusProxy proxy,
+ public Collection filter( Collection tuples, OperationScope scope, PartitionNexusProxy proxy,
Collection userGroupNames, LdapDN userName, Attributes userEntry, AuthenticationLevel authenticationLevel,
LdapDN entryName, String attrId, Object attrValue, Attributes entry, Collection microOperations )
throws NamingException
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java Wed Jul 19 20:07:52 2006
@@ -25,7 +25,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.subtree.SubentryService;
import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -71,7 +71,7 @@
};
private AttributeTypeRegistry registry = null;
- private DirectoryPartitionNexus nexus = null;
+ private PartitionNexus nexus = null;
public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java Wed Jul 19 20:07:52 2006
@@ -19,13 +19,13 @@
package org.apache.directory.server.core.configuration;
-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;
/**
- * A {@link Configuration} that adds a new {@link DirectoryPartition} to
- * the current {@link DirectoryPartitionNexus}.
+ * A {@link Configuration} that adds a new {@link Partition} to
+ * the current {@link PartitionNexus}.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java Wed Jul 19 20:07:52 2006
@@ -24,7 +24,7 @@
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
-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.BTreePartitionConfiguration;
@@ -56,7 +56,7 @@
}
- public void setContextPartition( DirectoryPartition partition )
+ public void setContextPartition( Partition partition )
{
super.setContextPartition( partition );
}
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java Wed Jul 19 20:07:52 2006
@@ -27,8 +27,8 @@
import javax.naming.directory.Attributes;
import javax.naming.directory.BasicAttributes;
-import org.apache.directory.server.core.partition.DirectoryPartition;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmDirectoryPartition;
+import org.apache.directory.server.core.partition.Partition;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
import org.apache.directory.server.core.schema.MatchingRuleRegistry;
import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -36,7 +36,7 @@
/**
- * A configuration for {@link DirectoryPartition}.
+ * A configuration for {@link Partition}.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
@@ -52,7 +52,7 @@
private String suffix;
private Set indexedAttributes; // Set<String> or <IndexConfiguration>
private Attributes contextEntry = new BasicAttributes( true );
- private DirectoryPartition contextPartition = new JdbmDirectoryPartition();
+ private Partition contextPartition = new JdbmPartition();
/**
@@ -65,7 +65,7 @@
/**
- * Returns user-defined name of the {@link DirectoryPartition} that
+ * Returns user-defined name of the {@link Partition} that
* this configuration configures.
*/
public String getName()
@@ -75,7 +75,7 @@
/**
- * Sets user-defined name of the {@link DirectoryPartition} that
+ * Sets user-defined name of the {@link Partition} that
* this configuration configures.
*/
protected void setName( String name )
@@ -104,18 +104,18 @@
/**
- * Returns the {@link DirectoryPartition} that this configuration configures.
+ * Returns the {@link Partition} that this configuration configures.
*/
- public DirectoryPartition getContextPartition()
+ public Partition getContextPartition()
{
return contextPartition;
}
/**
- * Sets the {@link DirectoryPartition} that this configuration configures.
+ * Sets the {@link Partition} that this configuration configures.
*/
- protected void setContextPartition( DirectoryPartition partition )
+ protected void setContextPartition( Partition partition )
{
if ( partition == null )
{
@@ -126,7 +126,7 @@
/**
- * Returns root entry that will be added to the {@link DirectoryPartition}
+ * Returns root entry that will be added to the {@link Partition}
* after it is initialized.
*/
public Attributes getContextEntry()
@@ -136,7 +136,7 @@
/**
- * Sets root entry that will be added to the {@link DirectoryPartition}
+ * Sets root entry that will be added to the {@link Partition}
* after it is initialized.
*/
protected void setContextEntry( Attributes rootEntry )
@@ -146,7 +146,7 @@
/**
- * Returns the suffix of the {@link DirectoryPartition}.
+ * Returns the suffix of the {@link Partition}.
*/
public String getSuffix()
{
@@ -155,7 +155,7 @@
/**
- * Returns the normalized suffix of the {@link DirectoryPartition}.
+ * Returns the normalized suffix of the {@link Partition}.
*/
public Name getNormalizedSuffix( MatchingRuleRegistry matchingRuleRegistry ) throws NamingException
{
@@ -164,7 +164,7 @@
/**
- * Returns the normalized suffix of the {@link DirectoryPartition}.
+ * Returns the normalized suffix of the {@link Partition}.
*/
public Name getNormalizedSuffix( Normalizer normalizer ) throws NamingException
{
@@ -173,7 +173,7 @@
/**
- * Sets the suffix of the {@link DirectoryPartition}.
+ * Sets the suffix of the {@link Partition}.
*/
protected void setSuffix( String suffix ) throws NamingException
{
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java Wed Jul 19 20:07:52 2006
@@ -21,14 +21,14 @@
import javax.naming.NamingException;
-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.name.LdapDN;
/**
- * A {@link Configuration} that removed the attached {@link DirectoryPartition} in
- * the current {@link DirectoryPartitionNexus}.
+ * A {@link Configuration} that removed the attached {@link Partition} in
+ * the current {@link PartitionNexus}.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java?rev=423731&r1=423730&r2=423731&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java Wed Jul 19 20:07:52 2006
@@ -28,7 +28,7 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.referral.ReferralLut;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.codec.util.LdapURL;
@@ -53,7 +53,7 @@
private final List referrals = new ArrayList();
private final NamingEnumeration underlying;
private final ReferralLut lut;
- private final DirectoryPartitionNexus nexus;
+ private final PartitionNexus nexus;
private final boolean doThrow;
private final int scope;
private SearchResult prefetched;
@@ -65,7 +65,7 @@
private Map normalizerMap;
public ReferralHandlingEnumeration( NamingEnumeration underlying, ReferralLut lut, AttributeTypeRegistry registry,
- DirectoryPartitionNexus nexus, int scope, boolean doThrow ) throws NamingException
+ PartitionNexus nexus, int scope, boolean doThrow ) throws NamingException
{
normalizerMap = registry.getNormalizerMapping();
this.underlying = underlying;