directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1051105 - in /directory/apacheds/branches/apacheds-AP: jdbm-partition/ jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/bt...
Date Mon, 20 Dec 2010 13:53:28 GMT
Author: elecharny
Date: Mon Dec 20 13:53:27 2010
New Revision: 1051105

URL: http://svn.apache.org/viewvc?rev=1051105&view=rev
Log:
Merged back the modifications made on trunk into the AP branch

Modified:
    directory/apacheds/branches/apacheds-AP/jdbm-partition/   (props changed)
    directory/apacheds/branches/apacheds-AP/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
    directory/apacheds/branches/apacheds-AP/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
    directory/apacheds/branches/apacheds-AP/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
    directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java
    directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java
    directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
    directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/   (props changed)
    directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java   (props changed)
    directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/   (props changed)
    directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java   (props changed)
    directory/apacheds/branches/apacheds-AP/server-config/   (props changed)
    directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java   (props changed)
    directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java
    directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigurationElement.java
    directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
    directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java
    directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java
    directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
    directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/   (props changed)
    directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/config.ldif
    directory/apacheds/branches/apacheds-AP/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java   (props changed)
    directory/apacheds/branches/apacheds-AP/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/   (props changed)
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/GenericIndexTest.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
    directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java

Propchange: directory/apacheds/branches/apacheds-AP/jdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 20 13:53:27 2010
@@ -2,3 +2,4 @@
 /directory/apacheds/branches/apacheds-config/jdbm-partition:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm-partition:980138-980935
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm-partition:1040956-1043765
+/directory/apacheds/trunk/jdbm-partition:1049007-1051102

Modified: directory/apacheds/branches/apacheds-AP/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java (original)
+++ directory/apacheds/branches/apacheds-AP/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Mon Dec 20 13:53:27 2010
@@ -23,6 +23,7 @@ package org.apache.directory.server.core
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.net.URI;
 
 import jdbm.RecordManager;
 import jdbm.helper.MRU;
@@ -289,11 +290,11 @@ public class JdbmIndex<K, O> extends Abs
      *
      * @param wkDirPath optional working directory path
      */
-    public void setWkDirPath( File wkDirPath )
+    public void setWkDirPath( URI wkDirPath )
     {
         //.out.println( "IDX Defining a WorkingDir : " + wkDirPath );
         protect( "wkDirPath" );
-        this.wkDirPath = wkDirPath;
+        this.wkDirPath = new File( wkDirPath );
     }
 
 
@@ -303,9 +304,9 @@ public class JdbmIndex<K, O> extends Abs
      *
      * @return optional working directory path 
      */
-    public File getWkDirPath()
+    public URI getWkDirPath()
     {
-        return wkDirPath;
+        return wkDirPath != null ? wkDirPath.toURI() : null;
     }
 
 

Modified: directory/apacheds/branches/apacheds-AP/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (original)
+++ directory/apacheds/branches/apacheds-AP/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Mon Dec 20 13:53:27 2010
@@ -20,8 +20,6 @@
 package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
-import java.io.File;
-
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.impl.xdbm.AbstractXdbmPartition;
 import org.apache.directory.server.xdbm.Index;
@@ -53,7 +51,7 @@ public class JdbmPartition extends Abstr
 
     protected void doInit() throws Exception
     {
-        store.setPartitionDir( new File( getPartitionPath() ) );
+        store.setPartitionPath( getPartitionPath() );
 
         EvaluatorBuilder<Long> evaluatorBuilder = new EvaluatorBuilder<Long>( store, schemaManager );
         CursorBuilder<Long> cursorBuilder = new CursorBuilder<Long>( store, evaluatorBuilder );
@@ -77,7 +75,7 @@ public class JdbmPartition extends Abstr
         // Normalize the suffix
         suffix.normalize( schemaManager );
         store.setSuffixDn( suffix );
-        store.setPartitionDir( new File( getPartitionPath() ) );
+        store.setPartitionPath( getPartitionPath() );
 
         for ( Index<?, Entry, Long> index : getIndexedAttributes() )
         {

Modified: directory/apacheds/branches/apacheds-AP/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/apacheds/branches/apacheds-AP/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Mon Dec 20 13:53:27 2010
@@ -109,10 +109,10 @@ public class JdbmStore<E> extends Abstra
     {
         super.init( schemaManager );
 
-        partitionDir.mkdirs();
+        getPartitionDir().mkdirs();
 
         // First, check if the file storing the data exists
-        String path = partitionDir.getPath() + File.separator + "master";
+        String path = getPartitionDir().getPath() + File.separator + "master";
         BaseRecordManager base = new BaseRecordManager( path );
         base.disableTransactions();
 
@@ -305,7 +305,7 @@ public class JdbmStore<E> extends Abstra
             
             if ( jdbmIndex.getWkDirPath() == null )
             {
-                jdbmIndex.setWkDirPath( partitionDir );
+                jdbmIndex.setWkDirPath( partitionPath );
             }
         }
         else
@@ -371,8 +371,14 @@ public class JdbmStore<E> extends Abstra
             }
         }
     }
-    
-    
+
+
+    private File getPartitionDir()
+    {
+        return new File( getPartitionPath() );
+    }
+
+
     /**
      * builds a user defined index on a attribute by browsing all the entries present in master db
      * 

Modified: directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java Mon Dec 20 13:53:27 2010
@@ -119,11 +119,11 @@ public class JdbmIndexTest
             idx.close();
 
             // created by this test
-            File dbFile = new File( idx.getWkDirPath(), idx.getAttribute().getOid() + ".db" );
+            File dbFile = new File( idx.getWkDirPath().getPath(), idx.getAttribute().getOid() + ".db" );
             assertTrue( dbFile.delete() );
 
             // created by TransactionManager, if transactions are not disabled
-            File logFile = new File( idx.getWkDirPath(), idx.getAttribute().getOid() + ".lg" );
+            File logFile = new File( idx.getWkDirPath().getPath(), idx.getAttribute().getOid() + ".lg" );
             
             if ( logFile.exists() )
             {
@@ -138,7 +138,7 @@ public class JdbmIndexTest
     void initIndex() throws Exception
     {
         JdbmIndex<String, Entry> index = new JdbmIndex<String, Entry>();
-        index.setWkDirPath( dbFileDir );
+        index.setWkDirPath( dbFileDir.toURI() );
         initIndex( index );
     }
 
@@ -188,7 +188,7 @@ public class JdbmIndexTest
 
         destroyIndex();
         JdbmIndex<String, Entry> index = new JdbmIndex<String, Entry>( "foo" );
-        index.setWkDirPath( dbFileDir );
+        index.setWkDirPath( dbFileDir.toURI() );
         initIndex( index );
         assertEquals( "foo", idx.getAttributeId() );
     }
@@ -223,29 +223,29 @@ public class JdbmIndexTest
 
         // uninitialized index
         JdbmIndex<String, Entry> jdbmIndex = new JdbmIndex<String, Entry>();
-        jdbmIndex.setWkDirPath( wkdir );
-        assertEquals( "foo", jdbmIndex.getWkDirPath().getName() );
+        jdbmIndex.setWkDirPath( wkdir.toURI() );
+        assertEquals( "foo", new File( jdbmIndex.getWkDirPath() ).getName() );
 
         // initialized index
         initIndex();
         
         try
         {
-            idx.setWkDirPath( wkdir );
+            idx.setWkDirPath( wkdir.toURI() );
             fail( "Should not be able to set wkDirPath after initialization." );
         }
         catch ( Exception e )
         {
         }
         
-        assertEquals( dbFileDir, idx.getWkDirPath() );
+        assertEquals( dbFileDir.toURI(), idx.getWkDirPath() );
 
         destroyIndex();
         jdbmIndex = new JdbmIndex<String, Entry>();
         wkdir.mkdirs();
-        jdbmIndex.setWkDirPath( wkdir );
+        jdbmIndex.setWkDirPath( wkdir.toURI() );
         initIndex( jdbmIndex );
-        assertEquals( wkdir, idx.getWkDirPath() );
+        assertEquals( wkdir.toURI(), idx.getWkDirPath() );
     }
 
 
@@ -576,7 +576,7 @@ public class JdbmIndexTest
         try
         {
             AttributeType noEqMatchAttribute = new AttributeType( "1.1" );
-            jdbmIndex.setWkDirPath( dbFileDir );
+            jdbmIndex.setWkDirPath( dbFileDir.toURI() );
             jdbmIndex.init( schemaManager, noEqMatchAttribute );
             fail( "should not get here" );
         }
@@ -594,7 +594,7 @@ public class JdbmIndexTest
     public void testSingleValuedAttribute() throws Exception
     {
         JdbmIndex<Object, Object> jdbmIndex = new JdbmIndex<Object, Object>();
-        jdbmIndex.setWkDirPath( dbFileDir );
+        jdbmIndex.setWkDirPath( dbFileDir.toURI() );
         jdbmIndex.init( schemaManager, schemaManager.lookupAttributeTypeRegistry( SchemaConstants.CREATORS_NAME_AT ) );
         jdbmIndex.close();
     }

Modified: directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java Mon Dec 20 13:53:27 2010
@@ -119,11 +119,11 @@ public class JdbmRdnIndexTest
             idx.close();
 
             // created by this test
-            File dbFile = new File( idx.getWkDirPath(), idx.getAttribute().getOid() + ".db" );
+            File dbFile = new File( idx.getWkDirPath().getPath(), idx.getAttribute().getOid() + ".db" );
             assertTrue( dbFile.delete() );
 
             // created by TransactionManager, if transactions are not disabled
-            File logFile = new File( idx.getWkDirPath(), idx.getAttribute().getOid() + ".lg" );
+            File logFile = new File( idx.getWkDirPath().getPath(), idx.getAttribute().getOid() + ".lg" );
             
             if ( logFile.exists() )
             {
@@ -138,7 +138,7 @@ public class JdbmRdnIndexTest
     void initIndex() throws Exception
     {
         JdbmRdnIndex<Long> index = new JdbmRdnIndex<Long>();
-        index.setWkDirPath( dbFileDir );
+        index.setWkDirPath( dbFileDir.toURI() );
         initIndex( index );
     }
 
@@ -192,30 +192,30 @@ public class JdbmRdnIndexTest
 
         // uninitialized index
         JdbmRdnIndex<Long> jdbmRdnIndex = new JdbmRdnIndex<Long>();
-        jdbmRdnIndex.setWkDirPath( wkdir );
-        assertEquals( "foo", jdbmRdnIndex.getWkDirPath().getName() );
+        jdbmRdnIndex.setWkDirPath( wkdir.toURI() );
+        assertEquals( "foo", new File( jdbmRdnIndex.getWkDirPath() ).getName() );
 
         // initialized index
         initIndex();
         
         try
         {
-            idx.setWkDirPath( wkdir );
+            idx.setWkDirPath( wkdir.toURI() );
             fail( "Should not be able to set wkDirPath after initialization." );
         }
         catch ( Exception e )
         {
         }
         
-        assertEquals( dbFileDir, idx.getWkDirPath() );
+        assertEquals( dbFileDir.toURI(), idx.getWkDirPath() );
 
         destroyIndex();
         
         jdbmRdnIndex = new JdbmRdnIndex<Long>();
         wkdir.mkdirs();
-        jdbmRdnIndex.setWkDirPath( wkdir );
+        jdbmRdnIndex.setWkDirPath( wkdir.toURI() );
         initIndex( jdbmRdnIndex );
-        assertEquals( wkdir, idx.getWkDirPath() );
+        assertEquals( wkdir.toURI(), idx.getWkDirPath() );
     }
 
 

Modified: directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Mon Dec 20 13:53:27 2010
@@ -150,15 +150,15 @@ public class JdbmStoreTest
         store = new JdbmStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
-        store.setPartitionDir( wkdir );
+        store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
         JdbmIndex ouIndex = new JdbmIndex( SchemaConstants.OU_AT_OID );
-        ouIndex.setWkDirPath( wkdir );
+        ouIndex.setWkDirPath( wkdir.toURI() );
         store.addIndex( ouIndex );
         
         JdbmIndex uidIndex = new JdbmIndex( SchemaConstants.UID_AT_OID );
-        uidIndex.setWkDirPath( wkdir );
+        uidIndex.setWkDirPath( wkdir.toURI() );
         store.addIndex( uidIndex );
 
         StoreUtils.loadExampleData( store, schemaManager );
@@ -204,7 +204,7 @@ public class JdbmStoreTest
         JdbmStore<Entry> store2 = new JdbmStore<Entry>();
         store2.setId( "example2" );
         store2.setCacheSize( 10 );
-        store2.setPartitionDir( wkdir2 );
+        store2.setPartitionPath( wkdir2.toURI() );
         store2.setSyncOnWrite( false );
         store2.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
         store2.addIndex( new JdbmIndex( SchemaConstants.UID_AT_OID ) );
@@ -283,9 +283,9 @@ public class JdbmStoreTest
         store.addIndex( new JdbmIndex<Object, Attributes>( "1.2.3.4" ) );
         assertEquals( 1, store.getUserIndices().size() );
 
-        assertNull( store.getPartitionDir() );
-        store.setPartitionDir( new File( "." ) );
-        assertEquals( new File( "." ), store.getPartitionDir() );
+        assertNull( store.getPartitionPath() );
+        store.setPartitionPath( new File( "." ).toURI() );
+        assertEquals( new File( "." ).toURI(), store.getPartitionPath() );
 
         assertFalse( store.isInitialized() );
         assertTrue( store.isSyncOnWrite() );
@@ -460,10 +460,10 @@ public class JdbmStoreTest
         {
         }
 
-        assertNotNull( store.getPartitionDir() );
+        assertNotNull( store.getPartitionPath() );
         try
         {
-            store.setPartitionDir( new File( "." ) );
+            store.setPartitionPath( new File( "." ).toURI() );
             fail();
         }
         catch ( IllegalStateException e )
@@ -654,7 +654,7 @@ public class JdbmStoreTest
         File testSpecificDir = new File( wkdir, "testConvertIndex" );
         testSpecificDir.mkdirs();
 
-        Index<?, Object, Long> nonJdbmIndex = new GenericIndex<Object, Object, Long>( "ou", 10, testSpecificDir );
+        Index<?, Object, Long> nonJdbmIndex = new GenericIndex<Object, Object, Long>( "ou", 10, testSpecificDir.toURI() );
 
         Method convertIndex = store.getClass().getDeclaredMethod( "convertAndInit", Index.class );
         convertIndex.setAccessible( true );
@@ -933,7 +933,7 @@ public class JdbmStoreTest
         store = new JdbmStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
-        store.setPartitionDir( wkdir );
+        store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
         // do not add ou index this time
         store.addIndex( new JdbmIndex( SchemaConstants.UID_AT_OID ) );

Propchange: directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 20 13:53:27 2010
@@ -6,4 +6,4 @@
 /directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:806623-810034
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,1049007-1051102

Propchange: directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 20 13:53:27 2010
@@ -6,4 +6,4 @@
 /directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:809853-810034
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,1049007-1051102

Propchange: directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 20 13:53:27 2010
@@ -6,4 +6,4 @@
 /directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:806623-810034
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,1049007-1051102

Propchange: directory/apacheds/branches/apacheds-AP/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 20 13:53:27 2010
@@ -6,4 +6,4 @@
 /directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:806623-810034
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1049007-1051102

Propchange: directory/apacheds/branches/apacheds-AP/server-config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 20 13:53:27 2010
@@ -4,3 +4,4 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-config:980138-980938
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-config:1040956-1043765
 /directory/apacheds/branches/server-config-annotations/server-config:1042727-1043868
+/directory/apacheds/trunk/server-config:1049007-1051102

Propchange: directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 20 13:53:27 2010
@@ -8,3 +8,4 @@
 /directory/apacheds/branches/apacheds-subtree/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:965203-965686
 /directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:945827-946347
+/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1049007-1051102

Modified: directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java (original)
+++ directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java Mon Dec 20 13:53:27 2010
@@ -403,6 +403,16 @@ public class ConfigWriter
                                     // Adding the field value to the parent entry
                                     addAttributeTypeValues( attributeTypeForParentEntry, fieldValue, parentEntry );
                                 }
+                                
+                                // Checking if the field is optional and if the default value matches
+                                if ( configurationElement.isOptional() )
+                                {
+                                    if ( configurationElement.defaultValue().equalsIgnoreCase( fieldValue.toString() ) )
+                                    {
+                                        // Skipping the additin of the value
+                                        continue;
+                                    }
+                                }
 
                                 // Adding values to the entry
                                 addAttributeTypeValues( configurationElement.attributeType(), fieldValue, entry );

Modified: directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigurationElement.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigurationElement.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigurationElement.java (original)
+++ directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigurationElement.java Mon Dec 20 13:53:27 2010
@@ -67,4 +67,23 @@ public @interface ConfigurationElement
      *      the string value of the DN of the container.
      */
     String container() default "";
+
+
+    /**
+     * Returns true if the qualified field is optional.
+     *
+     * @return
+     *      <code>true</code> if the qualified field is optional,
+     *      <code>false</code> if not.
+     */
+    boolean isOptional() default false;
+
+
+    /**
+     * Returns the string value of the default value.
+     *
+     * @return
+     *      the string value of the default value
+     */
+    String defaultValue() default "";
 }

Modified: directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java (original)
+++ directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java Mon Dec 20 13:53:27 2010
@@ -58,7 +58,7 @@ public class DirectoryServiceBean extend
     private int dsMaxPDUSize = 2048;
 
     /** The flag that tells if the password should be returned as a normal attribute or not */
-    @ConfigurationElement(attributeType = "ads-dsPasswordHidden")
+    @ConfigurationElement(attributeType = "ads-dsPasswordHidden", isOptional = true, defaultValue = "false")
     private boolean dsPasswordHidden = false;
 
     /** The delay between two flushes on disk */

Modified: directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java (original)
+++ directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java Mon Dec 20 13:53:27 2010
@@ -41,7 +41,7 @@ public class JdbmIndexBean<K, E> extends
     private int indexCacheSize = DEFAULT_INDEX_CACHE_SIZE;
 
     /** duplicate limit before duplicate keys switch to using a btree for values */
-    @ConfigurationElement(attributeType = "ads-indexNumDupLimit")
+    @ConfigurationElement(attributeType = "ads-indexNumDupLimit", isOptional = true, defaultValue = "512")
     private int indexNumDupLimit = DEFAULT_DUPLICATE_LIMIT;
 
     /** The index file name */

Modified: directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java (original)
+++ directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java Mon Dec 20 13:53:27 2010
@@ -49,7 +49,7 @@ public class PasswordPolicyBean extends 
      * holds the number of seconds that must elapse between modifications to the password. 
      * Default value is 0 
      */
-    @ConfigurationElement(attributeType = "ads-pwdMinAge")
+    @ConfigurationElement(attributeType = "ads-pwdMinAge", isOptional = true, defaultValue = "0")
     private int pwdMinAge = 0;
 
     /**
@@ -57,33 +57,33 @@ public class PasswordPolicyBean extends 
      *  Default value is 0, does not expire.  If not 0, the value must be greater than or equal
      *  to the value of the pwdMinAge.
      */
-    @ConfigurationElement(attributeType = "ads-pwdMaxAge")
-    private int pwdMaxAge;
+    @ConfigurationElement(attributeType = "ads-pwdMaxAge", isOptional = true, defaultValue = "0")
+    private int pwdMaxAge = 0;
 
     /**
      *  specifies the maximum number of used passwords stored in the pwdHistory attribute.
      *  Default value is 0, no password history maintained
      */
-    @ConfigurationElement(attributeType = "ads-pwdInHistory")
+    @ConfigurationElement(attributeType = "ads-pwdInHistory", isOptional = true, defaultValue = "0")
     private int pwdInHistory = 0;
 
     /** indicates how the password quality will be verified while being modified or added.
      *  Default value 0, do not check 
      */
-    @ConfigurationElement(attributeType = "ads-pwdCheckQuality")
+    @ConfigurationElement(attributeType = "ads-pwdCheckQuality", isOptional = true, defaultValue = "0")
     private int pwdCheckQuality = 0;
 
     /** this attribute holds the minimum number of characters that must be used in a password. 
      *  Default value 0, no minimum length enforced
      */
-    @ConfigurationElement(attributeType = "ads-pwdMinLength")
+    @ConfigurationElement(attributeType = "ads-pwdMinLength", isOptional = true, defaultValue = "0")
     private int pwdMinLength = 0;
 
     /**
      * this attribute holds the maximum number of characters that may be used in a password.
      * Default value 0, no maximum length enforced
      */
-    @ConfigurationElement(attributeType = "ads-pwdMaxLength")
+    @ConfigurationElement(attributeType = "ads-pwdMaxLength", isOptional = true, defaultValue = "0")
     private int pwdMaxLength = 0;
 
     /**
@@ -91,21 +91,21 @@ public class PasswordPolicyBean extends 
      * messages will be returned to an authenticating user.
      * Default value is 0, never send a warning message.
      */
-    @ConfigurationElement(attributeType = "ads-pwdExpireWarning")
+    @ConfigurationElement(attributeType = "ads-pwdExpireWarning", isOptional = true, defaultValue = "0")
     private int pwdExpireWarning = 0;
 
     /** 
      * the number of times an expired password can be used to authenticate.
      * Default value is 0, do not allow a expired password for authentication.
      */
-    @ConfigurationElement(attributeType = "ads-pwdGraceAuthNLimit")
+    @ConfigurationElement(attributeType = "ads-pwdGraceAuthNLimit", isOptional = true, defaultValue = "0")
     private int pwdGraceAuthNLimit = 0;
 
     /** 
      * specifies the number of seconds the grace authentications are valid
      * Default value is 0, no limit.
      */
-    @ConfigurationElement(attributeType = "ads-pwdGraceExpire")
+    @ConfigurationElement(attributeType = "ads-pwdGraceExpire", isOptional = true, defaultValue = "0")
     private int pwdGraceExpire = 0;
 
     /**
@@ -113,15 +113,15 @@ public class PasswordPolicyBean extends 
      * consecutive failed bind attempts. The maximum number of consecutive
      * failed bind attempts is specified in {@link #pwdMaxFailure}
      */
-    @ConfigurationElement(attributeType = "ads-pwdLockout")
-    private boolean pwdLockout;
+    @ConfigurationElement(attributeType = "ads-pwdLockout", isOptional = true, defaultValue = "false")
+    private boolean pwdLockout = false;
 
     /**
      * the number of seconds that the password cannot be used to authenticate due to 
      * too many failed bind attempts.
      * Default value is 300 seconds.
      */
-    @ConfigurationElement(attributeType = "ads-pwdLockoutDuration")
+    @ConfigurationElement(attributeType = "ads-pwdLockoutDuration", isOptional = true, defaultValue = "300")
     private int pwdLockoutDuration = 300;
 
     /**
@@ -129,26 +129,26 @@ public class PasswordPolicyBean extends 
      * be used to authenticate.
      * Default value is 0, no limit on the number of authentication failures
      */
-    @ConfigurationElement(attributeType = "ads-pwdMaxFailure")
-    private int pwdMaxFailure;
+    @ConfigurationElement(attributeType = "ads-pwdMaxFailure", isOptional = true, defaultValue = "0")
+    private int pwdMaxFailure = 0;
 
     /**
      * the number of seconds after which the password failures are purged from the failure counter.
      * Default value is 0, reset all pwdFailureTimes after a successful authentication.
      */
-    @ConfigurationElement(attributeType = "ads-pwdFailureCountInterval")
-    private int pwdFailureCountInterval;
+    @ConfigurationElement(attributeType = "ads-pwdFailureCountInterval", isOptional = true, defaultValue = "0")
+    private int pwdFailureCountInterval = 0;
 
     /** 
      * flag to indicate if the password must be changed by the user after they bind to the 
      * directory after a password is set or reset by a password administrator.
      * Default value is false, no need to change the password by user.
      */
-    @ConfigurationElement(attributeType = "ads-pwdMustChange")
+    @ConfigurationElement(attributeType = "ads-pwdMustChange", isOptional = true, defaultValue = "false")
     private boolean pwdMustChange = false;
 
     /** indicates whether users can change their own passwords. Default value is true, allow change */
-    @ConfigurationElement(attributeType = "ads-pwdAllowUserChange")
+    @ConfigurationElement(attributeType = "ads-pwdAllowUserChange", isOptional = true, defaultValue = "true")
     private boolean pwdAllowUserChange = true;
 
     /**
@@ -156,26 +156,26 @@ public class PasswordPolicyBean extends 
      *  new password when being changed.
      *  Default value is false.
      */
-    @ConfigurationElement(attributeType = "ads-pwdSafeModify")
+    @ConfigurationElement(attributeType = "ads-pwdSafeModify", isOptional = true, defaultValue = "false")
     private boolean pwdSafeModify = false;
 
     /** 
      * the number of seconds to delay responding to the first failed authentication attempt
      * Default value 0, no delay.
      */
-    @ConfigurationElement(attributeType = "ads-pwdMinDelay")
+    @ConfigurationElement(attributeType = "ads-pwdMinDelay", isOptional = true, defaultValue = "0")
     private int pwdMinDelay = 0;
 
     /** the maximum number of seconds to delay when responding to a failed authentication attempt.*/
-    @ConfigurationElement(attributeType = "ads-pwdMaxDelay")
-    private int pwdMaxDelay;
+    @ConfigurationElement(attributeType = "ads-pwdMaxDelay", isOptional = true, defaultValue = "0")
+    private int pwdMaxDelay = 0;
 
     /** 
      * the number of seconds an account may remain unused before it becomes locked
      * Default value is 0, no check for idle time.
      */
-    @ConfigurationElement(attributeType = "ads-pwdMaxIdle")
-    private int pwdMaxIdle;
+    @ConfigurationElement(attributeType = "ads-pwdMaxIdle", isOptional = true, defaultValue = "0")
+    private int pwdMaxIdle = 0;
 
 
     public String getPwdAttribute()

Modified: directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java (original)
+++ directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java Mon Dec 20 13:53:27 2010
@@ -49,15 +49,15 @@ public class TransportBean extends AdsBa
     private int systemPort = -1;
 
     /** A flag set if SSL is enabled */
-    @ConfigurationElement(attributeType = "ads-transportEnableSsl")
+    @ConfigurationElement(attributeType = "ads-transportEnableSsl", isOptional = true, defaultValue = "false")
     private boolean transportEnableSsl = false;
 
     /** The number of threads to use for the IoAcceptor executor */
-    @ConfigurationElement(attributeType = "ads-transportNbThreads")
+    @ConfigurationElement(attributeType = "ads-transportNbThreads", isOptional = true, defaultValue = "3")
     private int transportNbThreads = DEFAULT_NB_THREADS;
 
     /** The backlog for the transport services */
-    @ConfigurationElement(attributeType = "ads-transportBackLog")
+    @ConfigurationElement(attributeType = "ads-transportBackLog", isOptional = true, defaultValue = "50")
     private int transportBackLog = DEFAULT_BACKLOG_NB;
 
 

Propchange: directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 20 13:53:27 2010
@@ -11,3 +11,4 @@
 /directory/apacheds/branches/apacheds-subtree/server-config/src/main/resources:965203-965686
 /directory/apacheds/branches/server-config-annotations/server-config/src/main/resources:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347
+/directory/apacheds/trunk/server-config/src/main/resources:1049007-1051102

Modified: directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/config.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/config.ldif?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/config.ldif (original)
+++ directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/config.ldif Mon Dec 20 13:53:27 2010
@@ -78,6 +78,9 @@ ads-interceptororder: 2
 ads-interceptorclassname: org.apache.directory.server.core.authn.AuthenticationInterceptor
 ads-interceptorid: authenticationInterceptor
 ads-enabled: TRUE
+ads-authenticators: anonymousauthenticator
+ads-authenticators: simpleauthenticator
+ads-authenticators: strongauthenticator
 
 dn: ou=authenticators,ads-interceptorId=authenticationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
 ou: authenticators
@@ -528,7 +531,6 @@ objectclass: top
 
 dn: ads-transportId=tcp,ou=transports,ads-serverId=changePasswordServer,ou=servers,ads-directoryServiceId=default,ou=config
 ads-systemport: 60464
-ads-transportbacklog: 50
 ads-transportnbthreads: 2
 ads-transportid: tcp
 objectclass: ads-transport
@@ -539,7 +541,6 @@ ads-enabled: TRUE
 
 dn: ads-transportId=udp,ou=transports,ads-serverId=changePasswordServer,ou=servers,ads-directoryServiceId=default,ou=config
 ads-systemport: 60464
-ads-transportbacklog: 50
 ads-transportnbthreads: 2
 ads-transportid: udp
 objectclass: ads-transport
@@ -663,7 +664,6 @@ objectclass: top
 
 dn: ads-transportid=tcp,ou=transports,ads-serverId=kerberosServer,ou=servers,ads-directoryServiceId=default,ou=config
 ads-systemport: 60088
-ads-transportbacklog: 50
 ads-transportnbthreads: 4
 ads-transportaddress: 0.0.0.0
 ads-transportid: tcp
@@ -675,7 +675,6 @@ ads-enabled: TRUE
 
 dn: ads-transportid=udp,ou=transports,ads-serverId=kerberosServer,ou=servers,ads-directoryServiceId=default,ou=config
 ads-systemport: 60088
-ads-transportbacklog: 50
 ads-transportnbthreads: 4
 ads-transportaddress: 0.0.0.0
 ads-transportid: udp
@@ -721,8 +720,6 @@ objectclass: top
 
 dn: ads-transportid=ldap,ou=transports,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
 ads-systemport: 10389
-ads-transportenablessl: FALSE
-ads-transportbacklog: 50
 ads-transportnbthreads: 8
 ads-transportaddress: 0.0.0.0
 ads-transportid: ldap

Propchange: directory/apacheds/branches/apacheds-AP/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 20 13:53:27 2010
@@ -10,3 +10,4 @@
 /directory/apacheds/branches/cidit/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:900288-900681
 /directory/apacheds/branches/server-config-annotations/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:945827-946347
+/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1049007-1051102

Modified: directory/apacheds/branches/apacheds-AP/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java Mon Dec 20 13:53:27 2010
@@ -42,6 +42,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
 import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
@@ -55,7 +56,7 @@ import org.junit.runner.RunWith;
 
 
 /**
- * Test class for ConfigPartitionReader
+ * Test class for ConfigWriter
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -104,10 +105,10 @@ public class ConfigWriterTest
 
 
     @Test
-    public void testConfigReader() throws Exception
+    public void testConfigWriter() throws Exception
     {
         // Extracting of the config file
-        File configDir = new File( workDir, "configReader" ); // could be any directory, cause the config is now in a single file
+        File configDir = new File( workDir, "configWriter" ); // could be any directory, cause the config is now in a single file
         String configFile = LdifConfigExtractor.extractSingleFileConfig( configDir, "config.ldif", true );
 
         // Creating of the config partition
@@ -158,17 +159,6 @@ public class ConfigWriterTest
 
             // Comparing DNs
             assertTrue( originalConfigEntry.getDn().getNormName().equals( generatedConfigEntry.getDn().getNormName() ) );
-
-            // Comparing attributes
-            Iterator<EntryAttribute> attributesIterator = originalConfigEntry.iterator();
-            while ( attributesIterator.hasNext() )
-            {
-                EntryAttribute originalEntryAttribute = ( EntryAttribute ) attributesIterator.next();
-                assertTrue( generatedConfigEntry.contains( originalEntryAttribute ) );
-
-                EntryAttribute generatedEntryAttribute = generatedConfigEntry.get( originalEntryAttribute.getId() );
-                assertTrue( originalEntryAttribute.equals( generatedEntryAttribute ) );
-            }
         }
 
         // Destroying the config partition

Propchange: directory/apacheds/branches/apacheds-AP/xdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 20 13:53:27 2010
@@ -2,3 +2,4 @@
 /directory/apacheds/branches/apacheds-config/xdbm-partition:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-partition:980138-980938
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-partition:1040956-1043765
+/directory/apacheds/trunk/xdbm-partition:1049007-1051100

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Mon Dec 20 13:53:27 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.server.xdbm;
 
 
-import java.io.File;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -80,8 +80,8 @@ public abstract class AbstractStore<E, I
     /** true if initialized */
     protected boolean initialized;
 
-    /** the partition directory to use for files */
-    protected File partitionDir;
+    /** the partition path to use for files */
+    protected URI partitionPath;
 
     /** true if we sync disks on every write operation */
     protected boolean isSyncOnWrite = true;
@@ -172,16 +172,16 @@ public abstract class AbstractStore<E, I
     }
 
 
-    public void setPartitionDir( File partitionDir )
+    public void setPartitionPath( URI partitionPath )
     {
-        protect( "partitionDir" );
-        this.partitionDir = partitionDir;
+        protect( "partitionPath" );
+        this.partitionPath = partitionPath;
     }
 
 
-    public File getPartitionDir()
+    public URI getPartitionPath()
     {
-        return partitionDir;
+        return partitionPath;
     }
 
 
@@ -304,70 +304,70 @@ public abstract class AbstractStore<E, I
         if ( getPresenceIndex() == null )
         {
             Index<String, E, ID> index = new GenericIndex<String, E, ID>( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID ) ;
-            index.setWkDirPath( partitionDir );
+            index.setWkDirPath( partitionPath );
             addIndex( index );
         }
 
         if ( getOneLevelIndex() == null )
         {
             Index<ID, E, ID> index = new GenericIndex<ID, E, ID>( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID );
-            index.setWkDirPath( partitionDir );
+            index.setWkDirPath( partitionPath );
             addIndex( index );
         }
 
         if ( getSubLevelIndex() == null )
         {
             Index<ID, E, ID> index = new GenericIndex<ID, E, ID>( ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID );
-            index.setWkDirPath( partitionDir );
+            index.setWkDirPath( partitionPath );
             addIndex( index );
         }
 
         if ( getRdnIndex() == null )
         {
             Index<ParentIdAndRdn<ID>, E, ID> index = new GenericIndex<ParentIdAndRdn<ID>, E, ID>( ApacheSchemaConstants.APACHE_RDN_AT_OID );
-            index.setWkDirPath( partitionDir );
+            index.setWkDirPath( partitionPath );
             addIndex( index );
         }
 
         if ( getAliasIndex() == null )
         {
             Index<String, E, ID> index = new GenericIndex<String, E, ID>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID );
-            index.setWkDirPath( partitionDir );
+            index.setWkDirPath( partitionPath );
             addIndex( index );
         }
 
         if ( getOneAliasIndex() == null )
         {
             Index<ID, E, ID> index = new GenericIndex<ID, E, ID>( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID );
-            index.setWkDirPath( partitionDir );
+            index.setWkDirPath( partitionPath );
             addIndex( index );
         }
 
         if ( getSubAliasIndex() == null )
         {
             Index<ID, E, ID> index = new GenericIndex<ID, E, ID>( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID );
-            index.setWkDirPath( partitionDir );
+            index.setWkDirPath( partitionPath );
             addIndex( index );
         }
 
         if ( getObjectClassIndex() == null )
         {
             Index<String, E, ID> index = new GenericIndex<String, E, ID>( SchemaConstants.OBJECT_CLASS_AT_OID );
-            index.setWkDirPath( partitionDir );
+            index.setWkDirPath( partitionPath );
             addIndex( index );
         }
 
         if ( getEntryUuidIndex() == null )
         {
             Index<String, E, ID> index = new GenericIndex<String, E, ID>( SchemaConstants.ENTRY_UUID_AT_OID );
-            index.setWkDirPath( partitionDir );
+            index.setWkDirPath( partitionPath );
             addIndex( index );
         }
 
         if ( getEntryCsnIndex() == null )
         {
             Index<String, E, ID> index = new GenericIndex<String, E, ID>( SchemaConstants.ENTRY_CSN_AT_OID );
-            index.setWkDirPath( partitionDir );
+            index.setWkDirPath( partitionPath );
             addIndex( index );
         }
 

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java Mon Dec 20 13:53:27 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.server.xdbm;
 
 
-import java.io.File;
+import java.net.URI;
 
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
 public class GenericIndex<K, O, ID> extends AbstractIndex<K, O, ID>
 {
     /** Index working directory */
-    protected File wkDirPath;
+    protected URI wkDirPath;
 
 
     /**
@@ -68,7 +68,7 @@ public class GenericIndex<K, O, ID> exte
      * @param cacheSize the cache size
      * @param wkDirPath the working directory
      */
-    public GenericIndex( String attributeId, int cacheSize, File wkDirPath )
+    public GenericIndex( String attributeId, int cacheSize, URI wkDirPath )
     {
         super( attributeId );
         this.cacheSize = cacheSize;
@@ -220,7 +220,7 @@ public class GenericIndex<K, O, ID> exte
     }
 
 
-    public File getWkDirPath()
+    public URI getWkDirPath()
     {
         return wkDirPath;
     }
@@ -268,7 +268,7 @@ public class GenericIndex<K, O, ID> exte
     }
 
 
-    public void setWkDirPath( File wkDirPath )
+    public void setWkDirPath( URI wkDirPath )
     {
         this.wkDirPath = wkDirPath;
     }

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java Mon Dec 20 13:53:27 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.server.xdbm;
 
 
-import java.io.File;
+import java.net.URI;
 
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -88,7 +88,7 @@ public interface Index<K, O, ID>
      *
      * @param wkDirPath optional working directory path
      */
-    void setWkDirPath( File wkDirPath );
+    void setWkDirPath( URI wkDirPath );
 
 
     /**
@@ -97,7 +97,7 @@ public interface Index<K, O, ID>
      *
      * @return optional working directory path
      */
-    File getWkDirPath();
+    URI getWkDirPath();
 
 
     /**

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java Mon Dec 20 13:53:27 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.server.xdbm;
 
 
-import java.io.File;
+import java.net.URI;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -119,19 +119,19 @@ public interface Store<E, ID extends Com
 
 
     /**
-     * Sets the partition directory (working directory) for the store.
+     * Sets the partition path (working directory) for the store.
      * 
-     * @param partitionDir the new partition directory
+     * @param partitionDir the new partition path
      */
-    void setPartitionDir( File partitionDir );
+    void setPartitionPath( URI partitionPath );
 
 
     /**
-     * Gets the partition directory (working directory) for the store.
+     * Gets the partition path (working directory) for the store.
      * 
-     * @return The current partition directory (working directory) for the store
+     * @return The current partition path (working directory) for the store
      */
-    File getPartitionDir();
+    URI getPartitionPath();
 
 
     /**

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java Mon Dec 20 13:53:27 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.server.xdbm.impl.avl;
 
 
-import java.io.File;
+import java.net.URI;
 
 import org.apache.directory.server.core.partition.impl.btree.IndexCursorAdaptor;
 import org.apache.directory.server.core.partition.impl.btree.LongComparator;
@@ -415,7 +415,7 @@ public class AvlIndex<K, O> extends Abst
     /**
      * throws UnsupportedOperationException cause it is a in-memory index
      */
-    public void setWkDirPath( File wkDirPath )
+    public void setWkDirPath( URI wkDirPath )
     {
         throw new UnsupportedOperationException( I18n.err( I18n.ERR_213 ) );
     }
@@ -424,7 +424,7 @@ public class AvlIndex<K, O> extends Abst
     /**
      * this method always returns null for AvlIndex cause this is a in-memory index.
      */
-    public File getWkDirPath()
+    public URI getWkDirPath()
     {
         return null;
     }

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java Mon Dec 20 13:53:27 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.server.xdbm.impl.avl;
 
 
-import java.io.File;
+import java.net.URI;
 
 import org.apache.directory.server.constants.ApacheSchemaConstants;
 import org.apache.directory.server.core.partition.impl.btree.LongComparator;
@@ -133,7 +133,7 @@ public class AvlStore<E> extends Abstrac
      * always returns null, cause this is a in-memory store
      */
     @Override
-    public File getPartitionDir()
+    public URI getPartitionPath()
     {
         // returns null always
         return null;

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/GenericIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/GenericIndexTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/GenericIndexTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/GenericIndexTest.java Mon Dec 20 13:53:27 2010
@@ -46,7 +46,7 @@ public class GenericIndexTest
     public void setUp()
     {
         String tmpDir = System.getProperty( "java.io.tmpdir" );
-        index = new GenericIndex<String, Long, Long>( "cn", 42, new File( tmpDir ) );
+        index = new GenericIndex<String, Long, Long>( "cn", 42, new File( tmpDir ).toURI() );
     }
 
 
@@ -75,11 +75,11 @@ public class GenericIndexTest
     {
         File tmpDir = new File(System.getProperty( "java.io.tmpdir" ));
 
-        index = new GenericIndex<String, Long, Long>( "cn", 42, tmpDir );
+        index = new GenericIndex<String, Long, Long>( "cn", 42, tmpDir.toURI() );
         assertEquals( "cn", index.getAttributeId() );
         assertEquals( 42, index.getCacheSize() );
         assertNotNull( index.getWkDirPath() );
-        assertEquals( tmpDir.getPath(), index.getWkDirPath().getPath() );
+        assertEquals( tmpDir.toURI().getPath(), index.getWkDirPath().getPath() );
     }
 
 
@@ -111,9 +111,9 @@ public class GenericIndexTest
         File tmpDir = new File( System.getProperty( "java.io.tmpdir" ));
         File zzzDir = new File( tmpDir, "zzz"  );
 
-        index.setWkDirPath( zzzDir );
+        index.setWkDirPath( zzzDir.toURI() );
         assertNotNull( index.getWkDirPath() );
-        assertEquals( zzzDir.getPath(), index.getWkDirPath().getPath() );
+        assertEquals( zzzDir, new File( index.getWkDirPath() ) );
         index.setWkDirPath( null );
         assertNull( index.getWkDirPath() );
     }

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java Mon Dec 20 13:53:27 2010
@@ -161,7 +161,7 @@ public class AvlRdnIndexTest
     {
         // uninitialized index
         AvlRdnIndex AvlRdnIndex = new AvlRdnIndex();
-        AvlRdnIndex.setWkDirPath( new File( dbFileDir, "foo" ) );
+        AvlRdnIndex.setWkDirPath( new File( dbFileDir, "foo" ).toURI() );
     }
 
 

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java Mon Dec 20 13:53:27 2010
@@ -204,9 +204,9 @@ public class AvlStoreTest
         store.addIndex( new AvlIndex<Object, Attributes>( "1.2.3.4" ) );
         assertEquals( 1, store.getUserIndices().size() );
 
-        assertNull( store.getPartitionDir() );
-        store.setPartitionDir( new File( "." ) );
-        assertNull( store.getPartitionDir() );
+        assertNull( store.getPartitionPath() );
+        store.setPartitionPath( new File( "." ).toURI() );
+        assertNull( store.getPartitionPath() );
 
         assertFalse( store.isInitialized() );
         assertFalse( store.isSyncOnWrite() );
@@ -382,7 +382,7 @@ public class AvlStoreTest
         {
         }
 
-        assertNull( store.getPartitionDir() );
+        assertNull( store.getPartitionPath() );
         assertTrue( store.isInitialized() );
         assertFalse( store.isSyncOnWrite() );
 
@@ -558,7 +558,7 @@ public class AvlStoreTest
     @Test
     public void testConvertIndex() throws Exception
     {
-        Index nonAvlIndex = new GenericIndex( "ou", 10, new File( "." ) );
+        Index nonAvlIndex = new GenericIndex( "ou", 10, new File( "." ).toURI() );
 
         Method convertIndex = store.getClass().getDeclaredMethod( "convertAndInit", Index.class );
         convertIndex.setAccessible( true );

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Mon Dec 20 13:53:27 2010
@@ -131,7 +131,7 @@ public class AndCursorTest
         store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
-        store.setPartitionDir( wkdir );
+        store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
         store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Mon Dec 20 13:53:27 2010
@@ -131,7 +131,7 @@ public class GreaterEqTest
         store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
-        store.setPartitionDir( wkdir );
+        store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
         store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Mon Dec 20 13:53:27 2010
@@ -131,7 +131,7 @@ public class LessEqTest
         store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
-        store.setPartitionDir( wkdir );
+        store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
         store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java Mon Dec 20 13:53:27 2010
@@ -129,7 +129,7 @@ public class NestedFilterTest
         store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
-        store.setPartitionDir( wkdir );
+        store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
         store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Mon Dec 20 13:53:27 2010
@@ -128,7 +128,7 @@ public class NotCursorTest
         store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
-        store.setPartitionDir( wkdir );
+        store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
         store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Mon Dec 20 13:53:27 2010
@@ -123,7 +123,7 @@ public class OneLevelScopeTest
         store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
-        store.setPartitionDir( wkdir );
+        store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( true );
 
         store.addIndex( new AvlIndex<String, Entry>( SchemaConstants.OU_AT_OID ) );

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Mon Dec 20 13:53:27 2010
@@ -130,7 +130,7 @@ public class OrCursorTest
         store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
-        store.setPartitionDir( wkdir );
+        store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
         store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Mon Dec 20 13:53:27 2010
@@ -118,7 +118,7 @@ public class PresenceTest
         store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
-        store.setPartitionDir( wkdir );
+        store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
         store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Mon Dec 20 13:53:27 2010
@@ -114,7 +114,7 @@ public class SubstringTest
         store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
-        store.setPartitionDir( wkdir );
+        store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
         store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );

Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=1051105&r1=1051104&r2=1051105&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Mon Dec 20 13:53:27 2010
@@ -123,7 +123,7 @@ public class SubtreeScopeTest
         store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
-        store.setPartitionDir( wkdir );
+        store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( true );
 
         store.addIndex( new AvlIndex<String, Entry>( SchemaConstants.OU_AT_OID ) );



Mime
View raw message