You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2010/04/24 20:25:26 UTC

svn commit: r937668 - in /directory/apacheds/trunk: avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/ jdbm-partition/src/main/java/org/apache/director...

Author: seelmann
Date: Sat Apr 24 18:25:25 2010
New Revision: 937668

URL: http://svn.apache.org/viewvc?rev=937668&view=rev
Log:
Renamed get/setName to get/setId, use same method names in Partition and Store

Modified:
    directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
    directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
    directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
    directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
    directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java

Modified: directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java (original)
+++ directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java Sat Apr 24 18:25:25 2010
@@ -86,7 +86,7 @@ public class AvlPartition extends Abstra
         }
 
         // initialize the store
-        store.setName( getId() );
+        store.setId( getId() );
         suffix.normalize( schemaManager.getNormalizerMapping() );
         store.setSuffixDn( suffix.getName() );
 

Modified: directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java (original)
+++ directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java Sat Apr 24 18:25:25 2010
@@ -575,7 +575,7 @@ public class AvlStore<E> extends Abstrac
             return systemIndices.get( id );
         }
 
-        throw new IndexNotFoundException( I18n.err( I18n.ERR_2, id, name ) );
+        throw new IndexNotFoundException( I18n.err( I18n.ERR_2, id, id ) );
     }
 
 
@@ -603,7 +603,7 @@ public class AvlStore<E> extends Abstrac
             return systemIndices.get( id );
         }
 
-        throw new IndexNotFoundException( I18n.err( I18n.ERR_2, id, name ) );
+        throw new IndexNotFoundException( I18n.err( I18n.ERR_2, id, id ) );
     }
 
 
@@ -636,7 +636,7 @@ public class AvlStore<E> extends Abstrac
             return userIndices.get( id );
         }
 
-        throw new IndexNotFoundException( I18n.err( I18n.ERR_3, id, name ) );
+        throw new IndexNotFoundException( I18n.err( I18n.ERR_3, id, id ) );
     }
 
 
@@ -688,7 +688,7 @@ public class AvlStore<E> extends Abstrac
         ALIASED_OBJECT_NAME_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ALIASED_OBJECT_NAME_AT );
 
         // Create the master table (the table containing all the entries)
-        master = new AvlMasterTable<ServerEntry>( name, new LongComparator(), null, false );
+        master = new AvlMasterTable<ServerEntry>( id, new LongComparator(), null, false );
 
         suffixDn.normalize( schemaManager.getNormalizerMapping() );
         // -------------------------------------------------------------------

Modified: directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java (original)
+++ directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java Sat Apr 24 18:25:25 2010
@@ -129,7 +129,7 @@ public class AvlStoreTest
 
         // initialize the store
         store = new AvlStore<ServerEntry>();
-        store.setName( "example" );
+        store.setId( "example" );
         store.setSyncOnWrite( false );
 
         store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
@@ -169,9 +169,9 @@ public class AvlStoreTest
         store.setSubLevelIndex( new AvlIndex<Long, Attributes>( "sublevel" ) );
         assertNotNull( store.getSubLevelIndex() );
 
-        assertNull( store.getName() );
-        store.setName( "foo" );
-        assertEquals( "foo", store.getName() );
+        assertNull( store.getId() );
+        store.setId( "foo" );
+        assertEquals( "foo", store.getId() );
 
         assertNull( store.getNdnIndex() );
         store.setNdnIndex( new AvlIndex<String, Attributes>( "ndn" ) );
@@ -261,10 +261,10 @@ public class AvlStoreTest
         {
         }
 
-        assertNotNull( store.getName() );
+        assertNotNull( store.getId() );
         try
         {
-            store.setName( "foo" );
+            store.setId( "foo" );
             fail();
         }
         catch ( IllegalStateException e )

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Sat Apr 24 18:25:25 2010
@@ -79,7 +79,7 @@ public class JdbmPartition extends Abstr
 
         // initialize the store
         store.setCacheSize( cacheSize );
-        store.setName( id );
+        store.setId( id );
 
         // Normalize the suffix
         suffix.normalize( schemaManager.getNormalizerMapping() );

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Sat Apr 24 18:25:25 2010
@@ -191,11 +191,11 @@ public class JdbmStore<E> extends Abstra
         if ( cacheSize < 0 )
         {
             cacheSize = DEFAULT_CACHE_SIZE;
-            LOG.debug( "Using the default entry cache size of {} for {} partition", cacheSize, name );
+            LOG.debug( "Using the default entry cache size of {} for {} partition", cacheSize, id );
         }
         else
         {
-            LOG.debug( "Using the custom configured cache size of {} for {} partition", cacheSize, name );
+            LOG.debug( "Using the custom configured cache size of {} for {} partition", cacheSize, id );
         }
 
         // Now, create the entry cache for this partition
@@ -786,7 +786,7 @@ public class JdbmStore<E> extends Abstra
             return systemIndices.get( id );
         }
 
-        throw new IndexNotFoundException( I18n.err( I18n.ERR_3, id, name ) );
+        throw new IndexNotFoundException( I18n.err( I18n.ERR_3, id, id ) );
     }
 
 
@@ -808,7 +808,7 @@ public class JdbmStore<E> extends Abstra
             return userIndices.get( id );
         }
 
-        throw new IndexNotFoundException( I18n.err( I18n.ERR_3, id, name ) );
+        throw new IndexNotFoundException( I18n.err( I18n.ERR_3, id, id ) );
     }
 
 
@@ -830,7 +830,7 @@ public class JdbmStore<E> extends Abstra
             return systemIndices.get( id );
         }
 
-        throw new IndexNotFoundException( I18n.err( I18n.ERR_2, id, name ) );
+        throw new IndexNotFoundException( I18n.err( I18n.ERR_2, id, id ) );
     }
 
 

Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Sat Apr 24 18:25:25 2010
@@ -130,7 +130,7 @@ public class JdbmStoreTest
 
         // initialize the store
         store = new JdbmStore<ServerEntry>();
-        store.setName( "example" );
+        store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );
@@ -177,7 +177,7 @@ public class JdbmStoreTest
 
         // initialize the 2nd store
         JdbmStore<ServerEntry> store2 = new JdbmStore<ServerEntry>();
-        store2.setName( "example2" );
+        store2.setId( "example2" );
         store2.setCacheSize( 10 );
         store2.setPartitionDir( wkdir2 );
         store2.setSyncOnWrite( false );
@@ -229,9 +229,9 @@ public class JdbmStoreTest
         store.setSubLevelIndex( new JdbmIndex<Long, Attributes>( "sublevel" ) );
         assertNotNull( store.getSubLevelIndex() );
 
-        assertNull( store.getName() );
-        store.setName( "foo" );
-        assertEquals( "foo", store.getName() );
+        assertNull( store.getId() );
+        store.setId( "foo" );
+        assertEquals( "foo", store.getId() );
 
 //        assertNull( store.getNdnIndex() );
 //        store.setNdnIndex( new JdbmIndex<String, Attributes>( "ndn" ) );
@@ -324,10 +324,10 @@ public class JdbmStoreTest
         {
         }
 
-        assertNotNull( store.getName() );
+        assertNotNull( store.getId() );
         try
         {
-            store.setName( "foo" );
+            store.setId( "foo" );
             fail();
         }
         catch ( IllegalStateException e )

Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java Sat Apr 24 18:25:25 2010
@@ -321,9 +321,9 @@ public class LdifStore<E> extends Abstra
     }
 
 
-    public String getName()
+    public String getId()
     {
-        return wrappedStore.getName();
+        return wrappedStore.getId();
     }
 
 
@@ -453,9 +453,9 @@ public class LdifStore<E> extends Abstra
     }
 
 
-    public void setName( String name )
+    public void setId( String name )
     {
-        wrappedStore.setName( name );
+        wrappedStore.setId( name );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Sat Apr 24 18:25:25 2010
@@ -41,7 +41,7 @@ public abstract class AbstractStore<E, I
     /** true if initialized */
     protected boolean initialized;
 
-    /** the working directory to use for files */
+    /** the partition directory to use for files */
     protected File partitionDir;
 
     /** true if we sync disks on every write operation */
@@ -50,8 +50,8 @@ public abstract class AbstractStore<E, I
     /** The store cache size */
     protected int cacheSize = DEFAULT_CACHE_SIZE;
 
-    /** The store name */
-    protected String name;
+    /** The store unique identifier */
+    protected String id;
 
     /** A pointer on the schemaManager */
     protected SchemaManager schemaManager;
@@ -111,16 +111,16 @@ public abstract class AbstractStore<E, I
     }
 
 
-    public void setName( String name )
+    public void setId( String id )
     {
-        protect( "name" );
-        this.name = name;
+        protect( "id" );
+        this.id = id;
     }
 
 
-    public String getName()
+    public String getId()
     {
-        return name;
+        return id;
     }
 
 }

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java Sat Apr 24 18:25:25 2010
@@ -153,18 +153,18 @@ public interface Store<E, ID>
 
 
     /**
-     * Sets the store's name.
-     * @param name The store's name
+     * Sets the store's unique identifier.
+     * @param id The store's unique identifier
      */
-    void setName( String name );
+    void setId( String id );
 
 
     /**
-     * Gets the store's name.
+     * Gets the store's unique identifier.
      * 
-     * @return The store's name
+     * @return The store's unique identifier
      */
-    String getName();
+    String getId();
 
 
     /**

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Sat Apr 24 18:25:25 2010
@@ -130,7 +130,7 @@ public class AndCursorTest
 
         // initialize the store
         store = new JdbmStore<ServerEntry>();
-        store.setName( "example" );
+        store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Sat Apr 24 18:25:25 2010
@@ -127,7 +127,7 @@ public class GreaterEqTest
 
         // initialize the store
         store = new JdbmStore<ServerEntry>();
-        store.setName( "example" );
+        store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Sat Apr 24 18:25:25 2010
@@ -127,7 +127,7 @@ public class LessEqTest
 
         // initialize the store
         store = new JdbmStore<ServerEntry>();
-        store.setName( "example" );
+        store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java Sat Apr 24 18:25:25 2010
@@ -126,7 +126,7 @@ public class NestedFilterTest
 
         // initialize the store
         store = new JdbmStore<ServerEntry>();
-        store.setName( "example" );
+        store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Sat Apr 24 18:25:25 2010
@@ -127,7 +127,7 @@ public class NotCursorTest
 
         // initialize the store
         store = new JdbmStore<ServerEntry>();
-        store.setName( "example" );
+        store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Sat Apr 24 18:25:25 2010
@@ -122,7 +122,7 @@ public class OneLevelScopeTest
 
         // initialize the store
         store = new JdbmStore<ServerEntry>();
-        store.setName( "example" );
+        store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( true );

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Sat Apr 24 18:25:25 2010
@@ -129,7 +129,7 @@ public class OrCursorTest
 
         // initialize the store
         store = new JdbmStore<ServerEntry>();
-        store.setName( "example" );
+        store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Sat Apr 24 18:25:25 2010
@@ -115,7 +115,7 @@ public class PresenceTest
 
         // initialize the store
         store = new JdbmStore<ServerEntry>();
-        store.setName( "example" );
+        store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Sat Apr 24 18:25:25 2010
@@ -113,7 +113,7 @@ public class SubstringTest
 
         // initialize the store
         store = new JdbmStore<ServerEntry>();
-        store.setName( "example" );
+        store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=937668&r1=937667&r2=937668&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Sat Apr 24 18:25:25 2010
@@ -122,7 +122,7 @@ public class SubtreeScopeTest
 
         // initialize the store
         store = new JdbmStore<ServerEntry>();
-        store.setName( "example" );
+        store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( true );