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 2009/04/09 09:19:36 UTC
svn commit: r763540 - in /directory/apacheds/branches/ldif-partition:
avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/
bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/
core-api/src/main/java/o...
Author: akarasulu
Date: Thu Apr 9 07:19:35 2009
New Revision: 763540
URL: http://svn.apache.org/viewvc?rev=763540&view=rev
Log:
using new initialize() signature for partitions and stores and correcting ambiguity in getSuffix() methods.
Modified:
directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
directory/apacheds/branches/ldif-partition/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java
directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java
directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java
directory/apacheds/branches/ldif-partition/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java
directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
directory/apacheds/branches/ldif-partition/server-xml/src/main/resources/server.xml
directory/apacheds/branches/ldif-partition/server-xml/src/main/resources/serverJdbmPartition.xml
directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java
directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java
Modified: directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java (original)
+++ directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java Thu Apr 9 07:19:35 2009
@@ -24,8 +24,8 @@
import java.util.Set;
import org.apache.directory.server.constants.ApacheSchemaConstants;
-import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.xdbm.XdbmPartition;
import org.apache.directory.server.xdbm.search.impl.CursorBuilder;
@@ -69,9 +69,9 @@
* @{inhertDoc}
*/
@SuppressWarnings("unchecked")
- public void init( DirectoryService core ) throws Exception
+ public void initialize( Registries registries ) throws Exception
{
- setRegistries( core.getRegistries() );
+ setRegistries( registries );
EvaluatorBuilder evaluatorBuilder = new EvaluatorBuilder( getStore(), getRegistries() );
CursorBuilder cursorBuilder = new CursorBuilder( getStore(), evaluatorBuilder );
@@ -157,6 +157,6 @@
getStore().setUserIndices( userIndices );
}
- getStore().init( getRegistries() );
+ getStore().initialize( getRegistries() );
}
}
Modified: directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java (original)
+++ directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java Thu Apr 9 07:19:35 2009
@@ -547,7 +547,7 @@
* {@inheritDoc}
* TODO why this and initRegistries on Store interface ???
*/
- public void init( Registries registries ) throws Exception
+ public void initialize( Registries registries ) throws Exception
{
initRegistries( registries );
Modified: directory/apacheds/branches/ldif-partition/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original)
+++ directory/apacheds/branches/ldif-partition/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Thu Apr 9 07:19:35 2009
@@ -693,7 +693,7 @@
try
{
- store.init( this.registries );
+ store.initialize( this.registries );
LdapDN dn = new LdapDN( ServerDNConstants.OU_SCHEMA_DN );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
ServerEntry rootEntry = new DefaultServerEntry( registries, dn );
Modified: directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java (original)
+++ directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java Thu Apr 9 07:19:35 2009
@@ -24,6 +24,7 @@
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
+import org.apache.directory.server.schema.registries.Registries;
import javax.naming.NameNotFoundException;
@@ -38,7 +39,7 @@
*/
public abstract class AbstractPartition implements Partition
{
- /** {@link DirectoryService} specified at {@link #init(DirectoryService)}. */
+ /** {@link DirectoryService} specified at {@link #initialize(Registries)}. */
protected DirectoryService directoryService;
/** <tt>true</tt> if and only if this partition is initialized. */
protected boolean initialized;
@@ -55,7 +56,7 @@
* {@link #doInit()} returns without any errors. {@link #destroy()} is called automatically
* as a clean-up process if {@link #doInit()} throws an exception.
*/
- public final void init( DirectoryService directoryService ) throws Exception
+ public final void initialize( Registries registries ) throws Exception
{
if ( initialized )
{
@@ -125,7 +126,7 @@
/**
* Returns {@link DirectoryService} that is provided from
- * {@link #init(DirectoryService)}.
+ * {@link #initialize(Registries)}.
* @return return the directory service core
*/
public final DirectoryService getDirectoryService()
Modified: directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java (original)
+++ directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java Thu Apr 9 07:19:35 2009
@@ -20,7 +20,6 @@
package org.apache.directory.server.core.partition;
-import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerSearchResult;
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
@@ -36,6 +35,7 @@
import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
+import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -59,11 +59,10 @@
/**
* Initializes this partition.
- *
- * @param core the directory core for the server.
- * @throws Exception if initialization fails in any way
+ *
+ * @param registries schema registries.
*/
- void init( DirectoryService core ) throws Exception;
+ void initialize( Registries registries ) throws Exception;
/**
Modified: directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java (original)
+++ directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java Thu Apr 9 07:19:35 2009
@@ -35,6 +35,8 @@
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NameNotFoundException;
+
+import java.io.File;
import java.util.Hashtable;
@@ -56,6 +58,7 @@
JdbmPartition partition = new JdbmPartition();
partition.setId( "removable" );
partition.setSuffix( "ou=removable" );
+ partition.setWorkingDirectory( new File( service.getWorkingDirectory(), "removable" ) );
// Test AddContextPartition
service.addPartition( partition );
Modified: directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java (original)
+++ directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java Thu Apr 9 07:19:35 2009
@@ -55,6 +55,8 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
+
+import java.io.File;
import java.util.HashSet;
import java.util.Set;
@@ -85,6 +87,7 @@
JdbmPartition partition = new JdbmPartition();
partition.setId( "apache" );
partition.setSuffix( SUFFIX_DN );
+ partition.setWorkingDirectory( new File( service.getWorkingDirectory(), "apache" ) );
HashSet<JdbmIndex<?, ServerEntry>> indexedAttributes = new HashSet<JdbmIndex<?, ServerEntry>>();
indexedAttributes.add( new JdbmIndex<String,ServerEntry>( "objectClass" ) );
Modified: directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java (original)
+++ directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java Thu Apr 9 07:19:35 2009
@@ -49,6 +49,8 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
+
+import java.io.File;
import java.util.HashSet;
import java.util.Set;
@@ -128,6 +130,7 @@
JdbmPartition partition = new JdbmPartition();
partition.setId( "system" );
partition.setSuffix( "ou=system" );
+ partition.setWorkingDirectory( new File( service.getWorkingDirectory(), "system" ) );
Set<JdbmIndex<?, ServerEntry>> indices = new HashSet<JdbmIndex<?, ServerEntry>>();
indices.addAll( partition.getIndexedAttributes() );
Modified: directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java (original)
+++ directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java Thu Apr 9 07:19:35 2009
@@ -20,6 +20,7 @@
package org.apache.directory.server.core.partition;
+import java.io.File;
import java.util.HashMap;
import org.apache.directory.server.core.DirectoryService;
@@ -88,6 +89,7 @@
JdbmPartition foo = new JdbmPartition();
foo.setId( "foo" );
foo.setSuffix( "dc=foo,dc=com" );
+ foo.setWorkingDirectory( new File( service.getWorkingDirectory(), "foo" ) );
service.addPartition( foo );
JdbmPartition bar = new JdbmPartition();
Modified: directory/apacheds/branches/ldif-partition/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java Thu Apr 9 07:19:35 2009
@@ -44,6 +44,7 @@
import javax.naming.directory.InitialDirContext;
import javax.naming.directory.ModificationItem;
+import java.io.File;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.List;
@@ -158,6 +159,7 @@
JdbmPartition partition = new JdbmPartition();
partition.setId( "example" );
partition.setSuffix( "dc=example,dc=com" );
+ partition.setWorkingDirectory( new File( directoryService.getWorkingDirectory(), "example" ) );
Set<JdbmIndex<?,ServerEntry>> indexedAttrs = new HashSet<JdbmIndex<?,ServerEntry>>();
indexedAttrs.add( new JdbmIndex<String,ServerEntry>( "ou" ) );
Modified: directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java (original)
+++ directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java Thu Apr 9 07:19:35 2009
@@ -69,6 +69,7 @@
import javax.naming.directory.InitialDirContext;
import javax.naming.directory.ModificationItem;
+import java.io.File;
import java.io.IOException;
import java.security.InvalidKeyException;
import java.util.Arrays;
@@ -121,6 +122,7 @@
JdbmPartition partition = new JdbmPartition();
partition.setId( "example" );
partition.setSuffix( "dc=example,dc=com" );
+ partition.setWorkingDirectory( new File( service.getWorkingDirectory(), "example" ) );
Set<JdbmIndex<?,ServerEntry>> indexedAttrs = new HashSet<JdbmIndex<?,ServerEntry>>();
indexedAttrs.add( new JdbmIndex<String,ServerEntry>( "ou" ) );
Modified: directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java (original)
+++ directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java Thu Apr 9 07:19:35 2009
@@ -62,6 +62,7 @@
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
+import java.io.File;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
@@ -110,6 +111,7 @@
JdbmPartition partition = new JdbmPartition();
partition.setId( "example" );
partition.setSuffix( "dc=example,dc=com" );
+ partition.setWorkingDirectory( new File( service.getWorkingDirectory(), "example" ) );
Set<JdbmIndex<?,ServerEntry>> indexedAttrs = new HashSet<JdbmIndex<?,ServerEntry>>();
indexedAttrs.add( new JdbmIndex<String,ServerEntry>( "ou" ) );
Modified: directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java (original)
+++ directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java Thu Apr 9 07:19:35 2009
@@ -20,6 +20,7 @@
package org.apache.directory.server.operations.bind;
+import java.io.File;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
@@ -114,6 +115,7 @@
apache.setCacheSize( 500 );
apache.setSuffix( "dc=aPache,dc=org" );
apache.setId( "apache" );
+ apache.setWorkingDirectory( new File( service.getWorkingDirectory(), "apache" ) );
service.addPartition( apache );
// change the working directory to something that is unique
Modified: directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java (original)
+++ directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java Thu Apr 9 07:19:35 2009
@@ -20,6 +20,7 @@
package org.apache.directory.server.operations.bind;
+import java.io.File;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
@@ -135,6 +136,7 @@
JdbmPartition partition = new JdbmPartition();
partition.setId( "example" );
partition.setSuffix( "dc=example,dc=com" );
+ partition.setWorkingDirectory( new File( service.getWorkingDirectory(), "example" ) );
Set<JdbmIndex<?,ServerEntry>> indexedAttrs = new HashSet<JdbmIndex<?,ServerEntry>>();
indexedAttrs.add( new JdbmIndex<String,ServerEntry>( "ou" ) );
Modified: directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java (original)
+++ directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java Thu Apr 9 07:19:35 2009
@@ -20,6 +20,7 @@
package org.apache.directory.server.operations.modify;
+import java.io.File;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -120,6 +121,7 @@
system.setCacheSize( 500 );
system.setSuffix( "ou=system" );
+ system.setWorkingDirectory( new File( service.getWorkingDirectory(), "system" ) );
// Add indexed attributes for system partition
Set<JdbmIndex<?,ServerEntry>> indexedAttrs = new HashSet<JdbmIndex<?,ServerEntry>>();
Modified: directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java (original)
+++ directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java Thu Apr 9 07:19:35 2009
@@ -55,6 +55,7 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
+import java.io.File;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -167,6 +168,8 @@
system.setCacheSize( 500 );
system.setSuffix( "ou=system" );
+ system.setWorkingDirectory( new File( service.getWorkingDirectory(), "system" ) );
+
// Add indexed attributes for system partition
Set<JdbmIndex<?,ServerEntry>> indexedAttrs = new HashSet<JdbmIndex<?,ServerEntry>>();
Modified: directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java (original)
+++ directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java Thu Apr 9 07:19:35 2009
@@ -168,7 +168,7 @@
schemaPartition.setSuffix( ServerDNConstants.OU_SCHEMA_DN );
DirectoryService directoryService = new DefaultDirectoryService();
- schemaPartition.init( directoryService );
+ schemaPartition.initialize( null );
// --------------------------------------------------------------------
// Initialize schema subsystem and reset registries
Modified: directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java (original)
+++ directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java Thu Apr 9 07:19:35 2009
@@ -158,7 +158,7 @@
schemaPartition.setSuffix( ServerDNConstants.OU_SCHEMA_DN );
DirectoryService directoryService = new DefaultDirectoryService();
- schemaPartition.init( directoryService );
+ schemaPartition.initialize( null );
// --------------------------------------------------------------------
// Initialize schema subsystem and reset registries
Modified: directory/apacheds/branches/ldif-partition/server-xml/src/main/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-xml/src/main/resources/server.xml?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-xml/src/main/resources/server.xml (original)
+++ directory/apacheds/branches/ldif-partition/server-xml/src/main/resources/server.xml Thu Apr 9 07:19:35 2009
@@ -34,7 +34,8 @@
<systemPartition>
<!-- use the following partitionConfiguration to override defaults for -->
<!-- the system partition -->
- <jdbmPartition id="system" cacheSize="100" suffix="ou=system" optimizerEnabled="true" syncOnWrite="true">
+ <jdbmPartition id="system" cacheSize="100" suffix="ou=system" optimizerEnabled="true"
+ workingDirectory="example.com/system" syncOnWrite="true">
<indexedAttributes>
<jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.1" cacheSize="100"/>
<jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.2" cacheSize="100"/>
@@ -55,7 +56,7 @@
<!-- attributes below with OID's which are the system indices, if left -->
<!-- out they will be automatically configured for you with defaults. -->
<jdbmPartition id="example" cacheSize="100" suffix="dc=example,dc=com" optimizerEnabled="true"
- syncOnWrite="true">
+ workingDirectory="example.com/system" syncOnWrite="true">
<indexedAttributes>
<jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.1" cacheSize="100"/>
<jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.2" cacheSize="100"/>
Modified: directory/apacheds/branches/ldif-partition/server-xml/src/main/resources/serverJdbmPartition.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-xml/src/main/resources/serverJdbmPartition.xml?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-xml/src/main/resources/serverJdbmPartition.xml (original)
+++ directory/apacheds/branches/ldif-partition/server-xml/src/main/resources/serverJdbmPartition.xml Thu Apr 9 07:19:35 2009
@@ -33,7 +33,8 @@
<systemPartition>
<!-- use the following partitionConfiguration to override defaults for -->
<!-- the system partition -->
- <jdbmPartition id="system" cacheSize="100" suffix="ou=system" optimizerEnabled="true" syncOnWrite="true">
+ <jdbmPartition id="system" cacheSize="100" suffix="ou=system" optimizerEnabled="true"
+ workingDirectory="example.com/system" syncOnWrite="true">
<indexedAttributes>
<jdbmIndex attributeId="apacheNdn" cacheSize="100"/>
<jdbmIndex attributeId="apacheUpdn" cacheSize="100"/>
@@ -54,7 +55,7 @@
<!-- attributes below with OID's which are the system indices, if left -->
<!-- out they will be automatically configured for you with defaults. -->
<jdbmPartition id="example" cacheSize="100" suffix="dc=example,dc=com" optimizerEnabled="true"
- syncOnWrite="true">
+ workingDirectory="example.com/example" syncOnWrite="true">
<indexedAttributes>
<jdbmIndex attributeId="apacheNdn" cacheSize="100"/>
<jdbmIndex attributeId="apacheUpdn" cacheSize="100"/>
Modified: directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java Thu Apr 9 07:19:35 2009
@@ -151,7 +151,7 @@
* @throws Exception on failure to lookup elements in registries
* @throws Exception on failure to create database files
*/
- void init( Registries registries ) throws Exception;
+ void initialize( Registries registries ) throws Exception;
/**
Modified: directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java?rev=763540&r1=763539&r2=763540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java Thu Apr 9 07:19:35 2009
@@ -68,7 +68,7 @@
AttributeTypeRegistry attributeRegistry = registries.getAttributeTypeRegistry();
- store.init( registries );
+ store.initialize( registries );
// Entry #1
DefaultServerEntry entry = new DefaultServerEntry( registries, suffixDn );