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/12 02:26:45 UTC
svn commit: r421053 [1/2] - 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/configuration/
core-unit/src/test/java/org/apache/director...
Author: akarasulu
Date: Tue Jul 11 17:26:43 2006
New Revision: 421053
URL: http://svn.apache.org/viewvc?rev=421053&view=rev
Log:
changes ...
o added a new partition configuration bean (immutable and mutable) for btree
based partition implementations
o renamed some really long file names that did not match pather of config bean
naming:
- mv DirectoryPartitionConfiguration PartitionConfiguration
- mv AddDirectoryParitionConfiguration AddPartitionConfiguration
- mv RemoveDirectoryPartitionConfiguration RemovePartitionConfiguration
- mv MutableDirectoryPartitionConfiguration MutablePartitionConfiguration
o added synchOnWrite property which writes changes immediately instead of
waiting for the synch thread to synchronize dirty pages with disk
Added:
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java
- copied, changed from r420721, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/AddDirectoryPartitionConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java
- copied, changed from r420721, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/MutableDirectoryPartitionConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java
- copied, changed from r420721, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java
- copied, changed from r420721, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/RemoveDirectoryPartitionConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
- copied, changed from r420721, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeDirectoryPartition.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartitionConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/MutableBTreePartitionConfiguration.java
Removed:
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/AddDirectoryPartitionConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/MutableDirectoryPartitionConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/RemoveDirectoryPartitionConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeDirectoryPartition.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/configuration/DirectoryPartitionConfigurationITest.java
directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.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/jndi/AbstractContextFactory.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/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/BTreeSearchResultEnumeration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexConfiguration.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionViewer.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDirectoryPartition.java
directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.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/extended/LaunchDiagnosticUiHandler.java
directory/branches/apacheds/optimization/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java
directory/branches/apacheds/optimization/server-installers/src/main/installers/server.xml
directory/branches/apacheds/optimization/server-main/server.xml
directory/branches/apacheds/optimization/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java
directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/MiscTest.java
directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.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=421053&r1=421052&r2=421053&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 Tue Jul 11 17:26:43 2006
@@ -34,7 +34,7 @@
import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.LdapContext;
-import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
import org.apache.directory.shared.ldap.ldif.Entry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
@@ -144,7 +144,7 @@
attributes.put( "ou", "test" );
// Add apache.org paritition since all work will be done here
- MutableDirectoryPartitionConfiguration partConfig = new MutableDirectoryPartitionConfiguration();
+ MutablePartitionConfiguration partConfig = new MutablePartitionConfiguration();
partConfig.setIndexedAttributes( indexedAttributes );
partConfig.setName( "test" );
partConfig.setSuffix( "ou=test" );
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=421053&r1=421052&r2=421053&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 Tue Jul 11 17:26:43 2006
@@ -27,17 +27,17 @@
import junit.framework.Assert;
-import org.apache.directory.server.core.configuration.AddDirectoryPartitionConfiguration;
-import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration;
-import org.apache.directory.server.core.configuration.RemoveDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.AddPartitionConfiguration;
+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.unit.AbstractAdminTestCase;
/**
- * Tests {@link AddDirectoryPartitionConfiguration} and
- * {@link RemoveDirectoryPartitionConfiguration} works correctly.
+ * Tests {@link AddPartitionConfiguration} and
+ * {@link RemovePartitionConfiguration} works correctly.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
@@ -51,7 +51,7 @@
public void testAddAndRemove() throws Exception
{
- MutableDirectoryPartitionConfiguration partitionCfg = new MutableDirectoryPartitionConfiguration();
+ MutablePartitionConfiguration partitionCfg = new MutablePartitionConfiguration();
partitionCfg.setName( "removable" );
partitionCfg.setSuffix( "ou=removable" );
Attributes ctxEntry = new BasicAttributes( true );
@@ -61,7 +61,7 @@
partitionCfg.setContextPartition( new JdbmDirectoryPartition() );
// Test AddContextPartition
- AddDirectoryPartitionConfiguration addCfg = new AddDirectoryPartitionConfiguration( partitionCfg );
+ AddPartitionConfiguration addCfg = new AddPartitionConfiguration( partitionCfg );
Hashtable env = new Hashtable();
env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
@@ -71,7 +71,7 @@
Assert.assertNotNull( ctx.lookup( "ou=removable" ) );
// Test removeContextPartition
- RemoveDirectoryPartitionConfiguration removeCfg = new RemoveDirectoryPartitionConfiguration( "ou=removable" );
+ RemovePartitionConfiguration removeCfg = new RemovePartitionConfiguration( "ou=removable" );
env.putAll( removeCfg.toJndiEnvironment() );
ctx = new InitialContext( env );
Modified: directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java (original)
+++ directory/branches/apacheds/optimization/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java Tue Jul 11 17:26:43 2006
@@ -22,7 +22,7 @@
import javax.naming.NamingEnumeration;
import javax.naming.directory.*;
-import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
import org.apache.directory.server.core.unit.AbstractAdminTestCase;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
@@ -44,7 +44,7 @@
public void setUp() throws Exception
{
- MutableDirectoryPartitionConfiguration partition = new MutableDirectoryPartitionConfiguration();
+ MutablePartitionConfiguration partition = new MutablePartitionConfiguration();
partition.setName( "apache" );
partition.setSuffix( suffix );
Copied: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java (from r420721, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/AddDirectoryPartitionConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java?p2=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java&p1=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/AddDirectoryPartitionConfiguration.java&r1=420721&r2=421053&rev=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/AddDirectoryPartitionConfiguration.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java Tue Jul 11 17:26:43 2006
@@ -30,14 +30,14 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class AddDirectoryPartitionConfiguration extends Configuration
+public class AddPartitionConfiguration extends Configuration
{
private static final long serialVersionUID = -6690435863387769527L;
- private final DirectoryPartitionConfiguration directoryPartitionConfiguration;
+ private final PartitionConfiguration directoryPartitionConfiguration;
- public AddDirectoryPartitionConfiguration(DirectoryPartitionConfiguration directoryPartitionConfiguration)
+ public AddPartitionConfiguration(PartitionConfiguration directoryPartitionConfiguration)
{
if ( directoryPartitionConfiguration == null )
{
@@ -48,7 +48,7 @@
}
- public DirectoryPartitionConfiguration getDirectoryPartitionConfiguration()
+ public PartitionConfiguration getDirectoryPartitionConfiguration()
{
return directoryPartitionConfiguration;
}
Copied: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java (from r420721, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/MutableDirectoryPartitionConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java?p2=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java&p1=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/MutableDirectoryPartitionConfiguration.java&r1=420721&r2=421053&rev=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/MutableDirectoryPartitionConfiguration.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java Tue Jul 11 17:26:43 2006
@@ -28,17 +28,17 @@
/**
- * A mutable version of {@link DirectoryPartitionConfiguration}.
+ * A mutable version of {@link PartitionConfiguration}.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class MutableDirectoryPartitionConfiguration extends DirectoryPartitionConfiguration
+public class MutablePartitionConfiguration extends PartitionConfiguration
{
/**
* Creates a new instance.
*/
- public MutableDirectoryPartitionConfiguration()
+ public MutablePartitionConfiguration()
{
}
Copied: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java (from r420721, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java?p2=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java&p1=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java&r1=420721&r2=421053&rev=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java Tue Jul 11 17:26:43 2006
@@ -41,11 +41,11 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class DirectoryPartitionConfiguration
+public class PartitionConfiguration
{
/** The name of reserved system partition */
public static final String SYSTEM_PARTITION_NAME = "system";
- public static final int DEFAULT_CACHE_SIZE = 1000;
+ public static final int DEFAULT_CACHE_SIZE = 10000;
private String name;
private int cacheSize = -1;
@@ -58,7 +58,7 @@
/**
* Creates a new instance.
*/
- protected DirectoryPartitionConfiguration()
+ protected PartitionConfiguration()
{
setIndexedAttributes( new HashSet() );
}
Copied: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java (from r420721, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/RemoveDirectoryPartitionConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java?p2=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java&p1=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/RemoveDirectoryPartitionConfiguration.java&r1=420721&r2=421053&rev=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/RemoveDirectoryPartitionConfiguration.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java Tue Jul 11 17:26:43 2006
@@ -33,20 +33,20 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class RemoveDirectoryPartitionConfiguration extends Configuration
+public class RemovePartitionConfiguration extends Configuration
{
private static final long serialVersionUID = -6690435863387769527L;
private final LdapDN suffix;
- public RemoveDirectoryPartitionConfiguration( String suffix ) throws NamingException
+ public RemovePartitionConfiguration( String suffix ) throws NamingException
{
this( new LdapDN( suffix.trim() ) );
}
- public RemoveDirectoryPartitionConfiguration( LdapDN suffix )
+ public RemovePartitionConfiguration( LdapDN suffix )
{
if ( suffix == null )
{
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java Tue Jul 11 17:26:43 2006
@@ -255,7 +255,7 @@
/**
- * Returns {@link DirectoryPartitionConfiguration}s to configure context partitions.
+ * Returns {@link PartitionConfiguration}s to configure context partitions.
*/
public Set getContextPartitionConfigurations()
{
@@ -264,18 +264,18 @@
/**
- * Sets {@link DirectoryPartitionConfiguration}s to configure context partitions.
+ * Sets {@link PartitionConfiguration}s to configure context partitions.
*/
protected void setContextPartitionConfigurations( Set contextParitionConfigurations )
{
Set newSet = ConfigurationUtil.getTypeSafeSet( contextParitionConfigurations,
- DirectoryPartitionConfiguration.class );
+ PartitionConfiguration.class );
Set names = new HashSet();
Iterator i = newSet.iterator();
while ( i.hasNext() )
{
- DirectoryPartitionConfiguration cfg = ( DirectoryPartitionConfiguration ) i.next();
+ PartitionConfiguration cfg = ( PartitionConfiguration ) i.next();
cfg.validate();
String name = cfg.getName();
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java Tue Jul 11 17:26:43 2006
@@ -31,7 +31,7 @@
import org.apache.directory.server.core.DirectoryServiceConfiguration;
import org.apache.directory.server.core.authn.LdapPrincipal;
-import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.core.configuration.InterceptorConfiguration;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.ServerContext;
@@ -200,7 +200,7 @@
}
- public void addContextPartition( NextInterceptor next, DirectoryPartitionConfiguration cfg ) throws NamingException
+ public void addContextPartition( NextInterceptor next, PartitionConfiguration cfg ) throws NamingException
{
next.addContextPartition( cfg );
}
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=421053&r1=421052&r2=421053&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 Tue Jul 11 17:26:43 2006
@@ -28,7 +28,7 @@
import javax.naming.directory.SearchControls;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
-import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+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;
@@ -140,9 +140,9 @@
/**
- * Filters {@link DirectoryPartitionNexus#addContextPartition(DirectoryPartitionConfiguration)} call.
+ * Filters {@link DirectoryPartitionNexus#addContextPartition(PartitionConfiguration)} call.
*/
- void addContextPartition( NextInterceptor next, DirectoryPartitionConfiguration cfg ) throws NamingException;
+ void addContextPartition( NextInterceptor next, PartitionConfiguration cfg ) 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=421053&r1=421052&r2=421053&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 Tue Jul 11 17:26:43 2006
@@ -27,7 +27,7 @@
import javax.naming.directory.SearchControls;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
-import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.core.configuration.InterceptorConfiguration;
import org.apache.directory.server.core.configuration.MutableInterceptorConfiguration;
import org.apache.directory.server.core.invocation.Invocation;
@@ -178,7 +178,7 @@
}
- public void addContextPartition( NextInterceptor next, DirectoryPartitionConfiguration cfg )
+ public void addContextPartition( NextInterceptor next, PartitionConfiguration cfg )
throws NamingException
{
nexus.addContextPartition( cfg );
@@ -628,7 +628,7 @@
}
- public void addContextPartition( DirectoryPartitionConfiguration cfg ) throws NamingException
+ public void addContextPartition( PartitionConfiguration cfg ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
@@ -1454,7 +1454,7 @@
}
- public void addContextPartition( DirectoryPartitionConfiguration cfg ) throws NamingException
+ public void addContextPartition( PartitionConfiguration cfg ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
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=421053&r1=421052&r2=421053&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 Tue Jul 11 17:26:43 2006
@@ -27,7 +27,7 @@
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
-import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -74,9 +74,9 @@
/**
- * Calls the next interceptor's {@link DirectoryPartitionNexus#addContextPartition(DirectoryPartitionConfiguration)}.
+ * Calls the next interceptor's {@link DirectoryPartitionNexus#addContextPartition(PartitionConfiguration)}.
*/
- void addContextPartition( DirectoryPartitionConfiguration cfg ) throws NamingException;
+ void addContextPartition( PartitionConfiguration cfg ) throws NamingException;
/**
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=421053&r1=421052&r2=421053&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 Tue Jul 11 17:26:43 2006
@@ -27,9 +27,9 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.DirectoryServiceListener;
-import org.apache.directory.server.core.configuration.AddDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.AddPartitionConfiguration;
import org.apache.directory.server.core.configuration.Configuration;
-import org.apache.directory.server.core.configuration.RemoveDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.RemovePartitionConfiguration;
import org.apache.directory.server.core.configuration.ShutdownConfiguration;
import org.apache.directory.server.core.configuration.StartupConfiguration;
import org.apache.directory.server.core.configuration.SyncConfiguration;
@@ -102,17 +102,17 @@
{
service.startup( this, env );
}
- else if ( cfg instanceof AddDirectoryPartitionConfiguration )
+ else if ( cfg instanceof AddPartitionConfiguration )
{
new DirectoryPartitionNexusProxy( service.getJndiContext( principal, credential, authentication, "" ),
- service ).addContextPartition( ( ( AddDirectoryPartitionConfiguration ) cfg )
+ service ).addContextPartition( ( ( AddPartitionConfiguration ) cfg )
.getDirectoryPartitionConfiguration() );
}
- else if ( cfg instanceof RemoveDirectoryPartitionConfiguration )
+ else if ( cfg instanceof RemovePartitionConfiguration )
{
Context ctx = service.getJndiContext( principal, credential, authentication, "" );
DirectoryPartitionNexusProxy proxy = new DirectoryPartitionNexusProxy( ctx, service );
- proxy.removeContextPartition( ( ( RemoveDirectoryPartitionConfiguration ) cfg ).getSuffix() );
+ proxy.removeContextPartition( ( ( RemovePartitionConfiguration ) cfg ).getSuffix() );
}
else if ( service == null )
{
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=421053&r1=421052&r2=421053&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 Tue Jul 11 17:26:43 2006
@@ -26,7 +26,7 @@
import javax.naming.directory.SearchControls;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
-import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.core.configuration.InterceptorConfiguration;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
@@ -287,7 +287,7 @@
}
- public void addContextPartition( NextInterceptor next, DirectoryPartitionConfiguration cfg ) throws NamingException
+ public void addContextPartition( NextInterceptor next, PartitionConfiguration cfg ) throws NamingException
{
next.addContextPartition( cfg );
}
Modified: 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/AbstractDirectoryPartition.java?rev=421053&r1=421052&r2=421053&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/AbstractDirectoryPartition.java Tue Jul 11 17:26:43 2006
@@ -29,7 +29,7 @@
import javax.naming.directory.ModificationItem;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
-import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -43,10 +43,10 @@
*/
public abstract class AbstractDirectoryPartition implements DirectoryPartition
{
- /** {@link DirectoryServiceConfiguration} specified at {@link #init(DirectoryServiceConfiguration, DirectoryPartitionConfiguration)}. */
+ /** {@link DirectoryServiceConfiguration} specified at {@link #init(DirectoryServiceConfiguration, PartitionConfiguration)}. */
private DirectoryServiceConfiguration factoryCfg;
- /** {@link DirectoryPartitionConfiguration} specified at {@link #init(DirectoryServiceConfiguration, DirectoryPartitionConfiguration)}. */
- private DirectoryPartitionConfiguration cfg;
+ /** {@link PartitionConfiguration} specified at {@link #init(DirectoryServiceConfiguration, PartitionConfiguration)}. */
+ private PartitionConfiguration cfg;
/** <tt>true</tt> if and only if this partition is initialized. */
private boolean initialized;
/** the normalized suffix DN for this partition */
@@ -65,7 +65,7 @@
* without any errors. {@link #destroy()} is called automatically as a clean-up process
* if {@link #doInit()} throws an exception.
*/
- public final void init( DirectoryServiceConfiguration factoryCfg, DirectoryPartitionConfiguration cfg )
+ public final void init( DirectoryServiceConfiguration factoryCfg, PartitionConfiguration cfg )
throws NamingException
{
if ( initialized )
@@ -144,7 +144,7 @@
/**
* Returns {@link DirectoryServiceConfiguration} that is provided from
- * {@link #init(DirectoryServiceConfiguration, DirectoryPartitionConfiguration)}.
+ * {@link #init(DirectoryServiceConfiguration, PartitionConfiguration)}.
*/
public final DirectoryServiceConfiguration getFactoryConfiguration()
{
@@ -153,10 +153,10 @@
/**
- * Returns {@link DirectoryPartitionConfiguration} that is provided from
- * {@link #init(DirectoryServiceConfiguration, DirectoryPartitionConfiguration)}.
+ * Returns {@link PartitionConfiguration} that is provided from
+ * {@link #init(DirectoryServiceConfiguration, PartitionConfiguration)}.
*/
- public final DirectoryPartitionConfiguration getConfiguration()
+ public final PartitionConfiguration getConfiguration()
{
return cfg;
}
Modified: 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/DefaultDirectoryPartitionNexus.java?rev=421053&r1=421052&r2=421053&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/DefaultDirectoryPartitionNexus.java Tue Jul 11 17:26:43 2006
@@ -41,8 +41,8 @@
import javax.naming.ldap.LdapContext;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
-import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
-import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.PartitionConfiguration;
+import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmDirectoryPartition;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.MultiException;
@@ -172,7 +172,7 @@
}
- public void init( DirectoryServiceConfiguration factoryCfg, DirectoryPartitionConfiguration cfg )
+ public void init( DirectoryServiceConfiguration factoryCfg, PartitionConfiguration cfg )
throws NamingException
{
// NOTE: We ignore ContextPartitionConfiguration parameter here.
@@ -191,7 +191,7 @@
{
while ( i.hasNext() )
{
- DirectoryPartitionConfiguration c = ( DirectoryPartitionConfiguration ) i.next();
+ PartitionConfiguration c = ( PartitionConfiguration ) i.next();
addContextPartition( c );
initializedPartitionCfgs.add( 0, c );
}
@@ -204,7 +204,7 @@
i = initializedPartitionCfgs.iterator();
while ( i.hasNext() )
{
- DirectoryPartitionConfiguration partitionCfg = ( DirectoryPartitionConfiguration ) i.next();
+ PartitionConfiguration partitionCfg = ( PartitionConfiguration ) i.next();
DirectoryPartition partition = partitionCfg.getContextPartition();
i.remove();
try
@@ -225,10 +225,10 @@
}
- private DirectoryPartitionConfiguration initializeSystemPartition() throws NamingException
+ private PartitionConfiguration initializeSystemPartition() throws NamingException
{
// initialize system partition first
- MutableDirectoryPartitionConfiguration systemCfg = new MutableDirectoryPartitionConfiguration();
+ MutablePartitionConfiguration systemCfg = new MutablePartitionConfiguration();
system = new JdbmDirectoryPartition(); // using default implementation.
systemCfg.setName( "system" );
@@ -417,7 +417,7 @@
}
- public synchronized void addContextPartition( DirectoryPartitionConfiguration config ) throws NamingException
+ public synchronized void addContextPartition( PartitionConfiguration config ) throws NamingException
{
DirectoryPartition partition = config.getContextPartition();
Modified: 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/DirectoryPartition.java?rev=421053&r1=421052&r2=421053&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/DirectoryPartition.java Tue Jul 11 17:26:43 2006
@@ -29,7 +29,7 @@
import javax.naming.directory.SearchResult;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
-import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -60,7 +60,7 @@
/**
* Initializes this partition.
*/
- void init( DirectoryServiceConfiguration factoryCfg, DirectoryPartitionConfiguration cfg ) throws NamingException;
+ void init( DirectoryServiceConfiguration factoryCfg, PartitionConfiguration cfg ) throws NamingException;
/**
Modified: 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/DirectoryPartitionNexus.java?rev=421053&r1=421052&r2=421053&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/DirectoryPartitionNexus.java Tue Jul 11 17:26:43 2006
@@ -27,7 +27,7 @@
import javax.naming.directory.Attributes;
import javax.naming.ldap.LdapContext;
-import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.NoOpNormalizer;
import org.apache.directory.shared.ldap.schema.OidNormalizer;
@@ -194,7 +194,7 @@
public abstract boolean compare( LdapDN name, String oid, Object value ) throws NamingException;
- public abstract void addContextPartition( DirectoryPartitionConfiguration config ) throws NamingException;
+ public abstract void addContextPartition( PartitionConfiguration config ) throws NamingException;
public abstract void removeContextPartition( LdapDN suffix ) throws NamingException;
Modified: 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/DirectoryPartitionNexusProxy.java?rev=421053&r1=421052&r2=421053&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/DirectoryPartitionNexusProxy.java Tue Jul 11 17:26:43 2006
@@ -35,7 +35,7 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
-import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.core.enumeration.SearchResultFilter;
import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
import org.apache.directory.server.core.event.EventService;
@@ -126,7 +126,7 @@
}
- public void init( DirectoryServiceConfiguration factoryCfg, DirectoryPartitionConfiguration cfg )
+ public void init( DirectoryServiceConfiguration factoryCfg, PartitionConfiguration cfg )
{
}
@@ -703,13 +703,13 @@
}
- public void addContextPartition( DirectoryPartitionConfiguration config ) throws NamingException
+ public void addContextPartition( PartitionConfiguration config ) throws NamingException
{
addContextPartition( config, null );
}
- public void addContextPartition( DirectoryPartitionConfiguration config, Collection bypass ) throws NamingException
+ public void addContextPartition( PartitionConfiguration config, Collection bypass ) throws NamingException
{
ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
Copied: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (from r420721, directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeDirectoryPartition.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?p2=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java&p1=directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeDirectoryPartition.java&r1=420721&r2=421053&rev=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeDirectoryPartition.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Tue Jul 11 17:26:43 2006
@@ -30,7 +30,7 @@
import javax.naming.directory.SearchControls;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
-import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+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.Oid;
@@ -55,9 +55,9 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public abstract class BTreeDirectoryPartition implements DirectoryPartition
+public abstract class BTreePartition implements DirectoryPartition
{
- private static final Logger log = LoggerFactory.getLogger( BTreeDirectoryPartition.class );
+ private static final Logger log = LoggerFactory.getLogger( BTreePartition.class );
/** ===================================================================
@@ -110,12 +110,12 @@
/**
* Creates a B-tree based context partition.
*/
- protected BTreeDirectoryPartition()
+ protected BTreePartition()
{
}
- public void init( DirectoryServiceConfiguration factoryCfg, DirectoryPartitionConfiguration cfg )
+ public void init( DirectoryServiceConfiguration factoryCfg, PartitionConfiguration cfg )
throws NamingException
{
attributeTypeRegistry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
Added: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartitionConfiguration.java?rev=421053&view=auto
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartitionConfiguration.java (added)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartitionConfiguration.java Tue Jul 11 17:26:43 2006
@@ -0,0 +1,54 @@
+/*
+ * @(#) $Id$
+ *
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.directory.server.core.partition.impl.btree;
+
+
+import org.apache.directory.server.core.configuration.PartitionConfiguration;
+
+
+/**
+ * A partition configuration containing parameters specific to the BTree
+ * based partition implementation.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class BTreePartitionConfiguration extends PartitionConfiguration
+{
+ /**
+ * whether or not to flush to disk immediately as opposed to flushing
+ * on synch requests when a write (delete, add, modify, modifyRdn)
+ * opertations are performed
+ */
+ private boolean synchOnWrite = false;
+
+
+ protected void setSynchOnWrite( boolean synchOnWrite )
+ {
+ this.synchOnWrite = synchOnWrite;
+ }
+
+
+ public boolean isSynchImmediately()
+ {
+ return synchOnWrite;
+ }
+
+
+}
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java Tue Jul 11 17:26:43 2006
@@ -43,7 +43,7 @@
public class BTreeSearchResultEnumeration implements SearchResultEnumeration
{
/** Database used to lookup entries from */
- private BTreeDirectoryPartition partition = null;
+ private BTreePartition partition = null;
/** the attributes to return */
private final String[] attrIds;
/** underlying enumeration over IndexRecords */
@@ -61,7 +61,7 @@
* @param attrIds the returned attributes
* @param underlying the enumeration over IndexRecords
*/
- public BTreeSearchResultEnumeration(String[] attrIds, NamingEnumeration underlying, BTreeDirectoryPartition db,
+ public BTreeSearchResultEnumeration(String[] attrIds, NamingEnumeration underlying, BTreePartition db,
AttributeTypeRegistry registry)
{
this.partition = db;
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java Tue Jul 11 17:26:43 2006
@@ -43,7 +43,7 @@
/** the maximum size for a count Integer.MAX_VALUE as a BigInteger */
private static final BigInteger MAX = BigInteger.valueOf( Integer.MAX_VALUE );
/** the database this optimizer operates on */
- private BTreeDirectoryPartition db;
+ private BTreePartition db;
/**
@@ -51,7 +51,7 @@
*
* @param db the database this optimizer works for.
*/
- public DefaultOptimizer(BTreeDirectoryPartition db)
+ public DefaultOptimizer(BTreePartition db)
{
this.db = db;
}
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java Tue Jul 11 17:26:43 2006
@@ -45,7 +45,7 @@
/** the Optimizer used by this DefaultSearchEngine */
private final Optimizer optimizer;
/** the Database this DefaultSearchEngine operates on */
- private BTreeDirectoryPartition db;
+ private BTreePartition db;
/** Evaluator flyweight used for filter expression assertions */
private ExpressionEvaluator evaluator;
/** Enumerator flyweight that creates enumerations on filter expressions */
@@ -60,7 +60,7 @@
* Creates a DefaultSearchEngine for searching a Database without setting
* up the database.
*/
- public DefaultSearchEngine(BTreeDirectoryPartition db, ExpressionEvaluator evaluator,
+ public DefaultSearchEngine(BTreePartition db, ExpressionEvaluator evaluator,
ExpressionEnumerator enumerator)
{
this.db = db;
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java Tue Jul 11 17:26:43 2006
@@ -43,7 +43,7 @@
public class ExpressionEnumerator implements Enumerator
{
/** The database used by this enumerator */
- private BTreeDirectoryPartition db = null;
+ private BTreePartition db = null;
/** Enumerator flyweight for evaulating filter scope assertions */
private ScopeEnumerator scopeEnumerator;
/** Enumerator flyweight for evaulating filter substring assertions */
@@ -58,7 +58,7 @@
* @param db database used by this enumerator
* @param evaluator
*/
- public ExpressionEnumerator(BTreeDirectoryPartition db, AttributeTypeRegistry attributeTypeRegistry,
+ public ExpressionEnumerator(BTreePartition db, AttributeTypeRegistry attributeTypeRegistry,
ExpressionEvaluator evaluator)
{
this.db = db;
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java Tue Jul 11 17:26:43 2006
@@ -63,7 +63,7 @@
* @param oidRegistry the oid reg used for attrID to oid resolution
* @param attributeTypeRegistry the attribtype reg used for value comparison
*/
- public ExpressionEvaluator(BTreeDirectoryPartition db, OidRegistry oidRegistry,
+ public ExpressionEvaluator(BTreePartition db, OidRegistry oidRegistry,
AttributeTypeRegistry attributeTypeRegistry)
{
ScopeEvaluator scopeEvaluator = null;
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexConfiguration.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexConfiguration.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexConfiguration.java Tue Jul 11 17:26:43 2006
@@ -25,7 +25,7 @@
*/
public class IndexConfiguration
{
- public static final int DEFAULT_INDEX_CACHE_SIZE = 1000;
+ public static final int DEFAULT_INDEX_CACHE_SIZE = 100;
private String attributeId;
private int cacheSize = DEFAULT_INDEX_CACHE_SIZE;
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java Tue Jul 11 17:26:43 2006
@@ -55,7 +55,7 @@
private static final int SUBSTRING_MATCH = 3;
/** Database used to evaluate leaf with */
- private BTreeDirectoryPartition db;
+ private BTreePartition db;
/** Oid Registry used to translate attributeIds to OIDs */
private OidRegistry oidRegistry;
/** AttributeType registry needed for normalizing and comparing values */
@@ -73,7 +73,7 @@
* @param scopeEvaluator
* @param substringEvaluator
*/
- public LeafEvaluator(BTreeDirectoryPartition db, OidRegistry oidRegistry,
+ public LeafEvaluator(BTreePartition db, OidRegistry oidRegistry,
AttributeTypeRegistry attributeTypeRegistry, ScopeEvaluator scopeEvaluator,
SubstringEvaluator substringEvaluator)
{
Added: 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=421053&view=auto
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/MutableBTreePartitionConfiguration.java (added)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/MutableBTreePartitionConfiguration.java Tue Jul 11 17:26:43 2006
@@ -0,0 +1,77 @@
+/*
+ * @(#) $Id$
+ *
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.directory.server.core.partition.impl.btree;
+
+import java.util.Set;
+
+import javax.naming.NamingException;
+import javax.naming.directory.Attributes;
+
+import org.apache.directory.server.core.partition.DirectoryPartition;
+
+
+/**
+ * A mutable form of {@link BTreePartitionConfiguration}.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class MutableBTreePartitionConfiguration extends BTreePartitionConfiguration
+{
+ public void setSynchOnWrite( boolean synchOnWrite )
+ {
+ super.setSynchOnWrite( synchOnWrite );
+ }
+
+
+ public void setName( String name )
+ {
+ super.setName( name );
+ }
+
+
+ public void setIndexedAttributes( Set indexedAttributes )
+ {
+ super.setIndexedAttributes( indexedAttributes );
+ }
+
+
+ public void setContextPartition( DirectoryPartition partition )
+ {
+ super.setContextPartition( partition );
+ }
+
+
+ public void setContextEntry( Attributes rootEntry )
+ {
+ super.setContextEntry( rootEntry );
+ }
+
+
+ public void setSuffix( String suffix ) throws NamingException
+ {
+ super.setSuffix( suffix );
+ }
+
+
+ public void setCacheSize( int cacheSize )
+ {
+ super.setCacheSize( cacheSize );
+ }
+}
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java Tue Jul 11 17:26:43 2006
@@ -37,12 +37,12 @@
public class ScopeEnumerator implements Enumerator
{
/** Database used to enumerate based on scope */
- private BTreeDirectoryPartition db = null;
+ private BTreePartition db = null;
/** Filter scope expression evaluator */
private ScopeEvaluator evaluator = null;
- public ScopeEnumerator(BTreeDirectoryPartition db, ScopeEvaluator evaluator)
+ public ScopeEnumerator(BTreePartition db, ScopeEvaluator evaluator)
{
this.db = db;
this.evaluator = evaluator;
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java Tue Jul 11 17:26:43 2006
@@ -46,7 +46,7 @@
public class ScopeEvaluator implements Evaluator
{
/** Database used to evaluate scope with */
- private BTreeDirectoryPartition db;
+ private BTreePartition db;
/**
@@ -54,7 +54,7 @@
*
* @param db the database used to evaluate scope node
*/
- public ScopeEvaluator(BTreeDirectoryPartition db)
+ public ScopeEvaluator(BTreePartition db)
{
this.db = db;
}
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java Tue Jul 11 17:26:43 2006
@@ -50,7 +50,7 @@
public class SubstringEnumerator implements Enumerator
{
/** Database used */
- private final BTreeDirectoryPartition db;
+ private final BTreePartition db;
/** Evaluator used is an Avalon dependent object */
private final SubstringEvaluator evaluator;
/** the attribute type registry */
@@ -63,7 +63,7 @@
* @param db the database
* @param evaluator a substring evaluator
*/
- public SubstringEnumerator(BTreeDirectoryPartition db, AttributeTypeRegistry attributeTypeRegistry,
+ public SubstringEnumerator(BTreePartition db, AttributeTypeRegistry attributeTypeRegistry,
SubstringEvaluator evaluator)
{
this.db = db;
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java Tue Jul 11 17:26:43 2006
@@ -43,7 +43,7 @@
public class SubstringEvaluator implements Evaluator
{
/** Database used while evaluating candidates */
- private BTreeDirectoryPartition db;
+ private BTreePartition db;
/** Oid Registry used to translate attributeIds to OIDs */
private OidRegistry oidRegistry;
/** AttributeType registry needed for normalizing and comparing values */
@@ -57,7 +57,7 @@
* @param oidRegistry the OID registry for name to OID mapping
* @param attributeTypeRegistry the attributeType registry
*/
- public SubstringEvaluator(BTreeDirectoryPartition db, OidRegistry oidRegistry,
+ public SubstringEvaluator(BTreePartition db, OidRegistry oidRegistry,
AttributeTypeRegistry attributeTypeRegistry)
{
this.db = db;
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java Tue Jul 11 17:26:43 2006
@@ -29,7 +29,7 @@
import javax.naming.directory.Attributes;
import javax.swing.tree.TreeNode;
-import org.apache.directory.server.core.partition.impl.btree.BTreeDirectoryPartition;
+import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
import org.apache.directory.server.core.partition.impl.btree.IndexRecord;
import org.apache.directory.server.core.partition.impl.btree.SearchEngine;
import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -44,20 +44,20 @@
*/
public class EntryNode implements TreeNode
{
- private final BTreeDirectoryPartition partition;
+ private final BTreePartition partition;
private final EntryNode parent;
private final Attributes entry;
private final ArrayList children;
private final BigInteger id;
- public EntryNode(BigInteger id, EntryNode parent, BTreeDirectoryPartition partition, Attributes entry, HashMap map)
+ public EntryNode(BigInteger id, EntryNode parent, BTreePartition partition, Attributes entry, HashMap map)
{
this( id, parent, partition, entry, map, null, null );
}
- public EntryNode(BigInteger id, EntryNode parent, BTreeDirectoryPartition db, Attributes entry, HashMap map,
+ public EntryNode(BigInteger id, EntryNode parent, BTreePartition db, Attributes entry, HashMap map,
ExprNode exprNode, SearchEngine engine)
{
this.partition = db;
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java Tue Jul 11 17:26:43 2006
@@ -59,7 +59,7 @@
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
-import org.apache.directory.server.core.partition.impl.btree.BTreeDirectoryPartition;
+import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
import org.apache.directory.server.core.partition.impl.btree.Index;
import org.apache.directory.server.core.partition.impl.btree.IndexRecord;
import org.apache.directory.server.core.partition.impl.btree.SearchEngine;
@@ -109,7 +109,7 @@
private JMenu indices = new JMenu();
// Non Swing Stuff
- private BTreeDirectoryPartition partition = null;
+ private BTreePartition partition = null;
private boolean doCleanUp = false;
private HashMap nodes = new HashMap();
private EntryNode root = null;
@@ -119,7 +119,7 @@
/**
* Creates new form JFrame
*/
- public PartitionFrame(BTreeDirectoryPartition db, SearchEngine eng) throws NamingException
+ public PartitionFrame(BTreePartition db, SearchEngine eng) throws NamingException
{
partition = db;
this.eng = eng;
@@ -802,7 +802,7 @@
}
- public void buildIndicesMenu( BTreeDirectoryPartition partition )
+ public void buildIndicesMenu( BTreePartition partition )
{
JMenuItem item = null;
Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionViewer.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionViewer.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionViewer.java (original)
+++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionViewer.java Tue Jul 11 17:26:43 2006
@@ -22,7 +22,7 @@
import javax.naming.NamingException;
-import org.apache.directory.server.core.partition.impl.btree.BTreeDirectoryPartition;
+import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
import org.apache.directory.server.core.partition.impl.btree.SearchEngine;
import org.slf4j.Logger;
@@ -40,11 +40,11 @@
private static final Logger log = LoggerFactory.getLogger( PartitionViewer.class );
/** A handle on the atomic partition */
- private BTreeDirectoryPartition partition;
+ private BTreePartition partition;
private SearchEngine eng;
- public PartitionViewer(BTreeDirectoryPartition db, SearchEngine eng)
+ public PartitionViewer(BTreePartition db, SearchEngine eng)
{
this.partition = db;
this.eng = eng;
Modified: 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/JdbmDirectoryPartition.java?rev=421053&r1=421052&r2=421053&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/JdbmDirectoryPartition.java Tue Jul 11 17:26:43 2006
@@ -40,9 +40,9 @@
import org.apache.directory.server.core.DirectoryServiceConfiguration;
import org.apache.directory.server.core.ServerUtils;
-import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.core.partition.DirectoryPartition;
-import org.apache.directory.server.core.partition.impl.btree.BTreeDirectoryPartition;
+import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
import org.apache.directory.server.core.partition.impl.btree.Index;
import org.apache.directory.server.core.partition.impl.btree.IndexAssertion;
import org.apache.directory.server.core.partition.impl.btree.IndexAssertionEnumeration;
@@ -72,7 +72,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class JdbmDirectoryPartition extends BTreeDirectoryPartition
+public class JdbmDirectoryPartition extends BTreePartition
{
private static final Logger log = LoggerFactory.getLogger( JdbmDirectoryPartition.class );
@@ -125,7 +125,7 @@
}
- public synchronized void init( DirectoryServiceConfiguration factoryCfg, DirectoryPartitionConfiguration cfg )
+ public synchronized void init( DirectoryServiceConfiguration factoryCfg, PartitionConfiguration cfg )
throws NamingException
{
oidRegistry = factoryCfg.getGlobalRegistries().getOidRegistry();
@@ -149,7 +149,7 @@
int cacheSize = cfg.getCacheSize();
if ( cacheSize < 0 )
{
- cacheSize = DirectoryPartitionConfiguration.DEFAULT_CACHE_SIZE;
+ cacheSize = PartitionConfiguration.DEFAULT_CACHE_SIZE;
log.warn( "Using the default entry cache size of {} for {} partition",
new Integer( cacheSize ), cfg.getName() );
}
@@ -475,7 +475,7 @@
/**
- * @see org.apache.directory.server.core.partition.impl.btree.BTreeDirectoryPartition#getUserIndex(String)
+ * @see org.apache.directory.server.core.partition.impl.btree.BTreePartition#getUserIndex(String)
*/
public Index getUserIndex( String id ) throws IndexNotFoundException
{
@@ -514,7 +514,7 @@
/**
- * @see BTreeDirectoryPartition#getEntryId(String)
+ * @see BTreePartition#getEntryId(String)
*/
public Index getSystemIndex( String id ) throws IndexNotFoundException
{
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=421053&r1=421052&r2=421053&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 Tue Jul 11 17:26:43 2006
@@ -38,7 +38,7 @@
import org.apache.directory.server.core.DirectoryServiceConfiguration;
import org.apache.directory.server.core.ServerUtils;
-import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.core.configuration.InterceptorConfiguration;
import org.apache.directory.server.core.enumeration.ReferralHandlingEnumeration;
import org.apache.directory.server.core.enumeration.SearchResultFilter;
@@ -816,7 +816,7 @@
}
- public void addContextPartition( NextInterceptor next, DirectoryPartitionConfiguration cfg ) throws NamingException
+ public void addContextPartition( NextInterceptor next, PartitionConfiguration cfg ) throws NamingException
{
next.addContextPartition( cfg );
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=421053&r1=421052&r2=421053&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 Tue Jul 11 17:26:43 2006
@@ -22,7 +22,7 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.DirectoryServiceConfiguration;
import org.apache.directory.server.core.DirectoryServiceListener;
-import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.core.configuration.InterceptorConfiguration;
import org.apache.directory.server.core.configuration.MutableInterceptorConfiguration;
import org.apache.directory.server.core.invocation.Invocation;
@@ -304,7 +304,7 @@
}
- public void addContextPartition( NextInterceptor next, DirectoryPartitionConfiguration cfg )
+ public void addContextPartition( NextInterceptor next, PartitionConfiguration cfg )
throws NamingException
{
interceptors.add( this );
Modified: directory/branches/apacheds/optimization/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java (original)
+++ directory/branches/apacheds/optimization/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java Tue Jul 11 17:26:43 2006
@@ -33,7 +33,7 @@
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.impl.btree.BTreeDirectoryPartition;
+import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
import org.apache.directory.server.core.partition.impl.btree.gui.PartitionFrame;
import org.apache.directory.server.ldap.ExtendedOperationHandler;
import org.apache.directory.server.ldap.LdapProtocolProvider;
@@ -95,9 +95,9 @@
{
LdapDN dn = new LdapDN( ( String ) list.next() );
DirectoryPartition partition = nexus.getPartition( dn );
- if ( partition instanceof BTreeDirectoryPartition )
+ if ( partition instanceof BTreePartition )
{
- BTreeDirectoryPartition btPartition = ( BTreeDirectoryPartition ) partition;
+ BTreePartition btPartition = ( BTreePartition ) partition;
PartitionFrame frame = new PartitionFrame( btPartition, btPartition.getSearchEngine() );
Point pos = getCenteredPosition( frame );
pos.y = launchedWindowCount * 20 + pos.y;
Modified: directory/branches/apacheds/optimization/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java (original)
+++ directory/branches/apacheds/optimization/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java Tue Jul 11 17:26:43 2006
@@ -44,8 +44,8 @@
import junit.framework.TestCase;
-import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
-import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.PartitionConfiguration;
+import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
import org.apache.directory.server.core.configuration.MutableStartupConfiguration;
import org.apache.directory.server.core.configuration.ShutdownConfiguration;
import org.apache.directory.server.core.jndi.CoreContextFactory;
@@ -164,9 +164,9 @@
}
- private DirectoryPartitionConfiguration getExamplePartition() throws NamingException
+ private PartitionConfiguration getExamplePartition() throws NamingException
{
- MutableDirectoryPartitionConfiguration partConfig = new MutableDirectoryPartitionConfiguration();
+ MutablePartitionConfiguration partConfig = new MutablePartitionConfiguration();
partConfig.setName( "example" );
HashSet indices = new HashSet();
@@ -191,9 +191,9 @@
}
- private DirectoryPartitionConfiguration getApachePartition() throws NamingException
+ private PartitionConfiguration getApachePartition() throws NamingException
{
- MutableDirectoryPartitionConfiguration partConfig = new MutableDirectoryPartitionConfiguration();
+ MutablePartitionConfiguration partConfig = new MutablePartitionConfiguration();
partConfig.setName( "apache" );
HashSet indices = new HashSet();