directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r191455 - in /directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition: ./ store/ store/gui/ store/jdbm/
Date Mon, 20 Jun 2005 12:17:54 GMT
Author: trustin
Date: Mon Jun 20 05:17:51 2005
New Revision: 191455

URL: http://svn.apache.org/viewcvs?rev=191455&view=rev
Log:
Renamed Database to PartitionStore
Renamed DbSearchResult to PartitionStoreSearchResult

Added:
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/PartitionStore.java
      - copied, changed from r191453, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/Database.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/PartitionStoreSearchResult.java
      - copied, changed from r191453, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/DbSearchResult.java
Removed:
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/Database.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/DbSearchResult.java
Modified:
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/AbstractContextPartition.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/ApplicationPartition.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/BackingStore.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/SystemPartition.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/DefaultOptimizer.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/DefaultSearchEngine.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ExpressionEnumerator.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ExpressionEvaluator.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/LeafEvaluator.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEnumerator.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEvaluator.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SearchResultEnumeration.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEnumerator.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEvaluator.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/EntryNode.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/MainFrame.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/PartitionViewer.java
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmDatabase.java

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/AbstractContextPartition.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/AbstractContextPartition.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/AbstractContextPartition.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/AbstractContextPartition.java
Mon Jun 20 05:17:51 2005
@@ -35,7 +35,7 @@
 import org.apache.ldap.common.message.LockableAttributesImpl;
 import org.apache.ldap.common.schema.AttributeType;
 import org.apache.ldap.common.util.ArrayUtils;
-import org.apache.ldap.server.partition.store.Database;
+import org.apache.ldap.server.partition.store.PartitionStore;
 import org.apache.ldap.server.partition.store.SearchEngine;
 import org.apache.ldap.server.partition.store.SearchResultEnumeration;
 import org.apache.ldap.server.partition.store.gui.PartitionViewer;
@@ -108,7 +108,7 @@
      * the database used for this backing store which is also initialized during
      * configuration time
      */
-    private Database db = null;
+    private PartitionStore db = null;
     
     /**
      * the search engine used to search the database
@@ -127,7 +127,7 @@
      * @param db the dedicated database for this backing store
      * @param searchEngine the search engine for this backing store
      */
-    public AbstractContextPartition( Database db, SearchEngine searchEngine,
+    public AbstractContextPartition( PartitionStore db, SearchEngine searchEngine,
                                      AttributeType[] indexAttributes )
         throws NamingException
     {
@@ -202,7 +202,7 @@
      *
      * @return the database used
      */
-    public Database getDb()
+    public PartitionStore getDb()
     {
         return db;
     }

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/ApplicationPartition.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/ApplicationPartition.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/ApplicationPartition.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/ApplicationPartition.java
Mon Jun 20 05:17:51 2005
@@ -21,7 +21,7 @@
 import javax.naming.NamingException;
 
 import org.apache.ldap.common.schema.AttributeType;
-import org.apache.ldap.server.partition.store.Database;
+import org.apache.ldap.server.partition.store.PartitionStore;
 import org.apache.ldap.server.partition.store.SearchEngine;
 
 
@@ -59,7 +59,7 @@
      * @throws NamingException on failures while creating this partition
      */
     public ApplicationPartition(
-            Database db, SearchEngine searchEngine, AttributeType[] indexAttributes )
+            PartitionStore db, SearchEngine searchEngine, AttributeType[] indexAttributes
)
         throws NamingException
     {
         super( db, searchEngine, indexAttributes );

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/BackingStore.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/BackingStore.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/BackingStore.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/BackingStore.java
Mon Jun 20 05:17:51 2005
@@ -98,7 +98,7 @@
      *
      * @param base the base distinguished/absolute name for the search/listing
      * @return a NamingEnumeration containing objects of type
-     * {@link org.apache.ldap.server.partition.store.DbSearchResult}
+     * {@link org.apache.ldap.server.partition.store.PartitionStoreSearchResult}
      * @throws NamingException if there are any problems
      */
     NamingEnumeration list( Name base ) throws NamingException;

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/SystemPartition.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/SystemPartition.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/SystemPartition.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/SystemPartition.java
Mon Jun 20 05:17:51 2005
@@ -26,7 +26,7 @@
 import org.apache.ldap.common.schema.AttributeType;
 import org.apache.ldap.common.util.DateUtils;
 import org.apache.ldap.common.util.NamespaceTools;
-import org.apache.ldap.server.partition.store.Database;
+import org.apache.ldap.server.partition.store.PartitionStore;
 import org.apache.ldap.server.partition.store.SearchEngine;
 
 
@@ -161,7 +161,7 @@
      * also contain all system index attribute types - if not the system will
      * not operate correctly.
      */
-    public SystemPartition( Database db, SearchEngine searchEngine,
+    public SystemPartition( PartitionStore db, SearchEngine searchEngine,
                             AttributeType[] indexAttributes )
         throws NamingException
     {

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/DefaultOptimizer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/DefaultOptimizer.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/DefaultOptimizer.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/DefaultOptimizer.java
Mon Jun 20 05:17:51 2005
@@ -43,7 +43,7 @@
     /** the maximum size for a count Integer.MAX_VALUE as a BigInteger */
     private static final BigInteger MAX = BigInteger.valueOf( Integer.MAX_VALUE );
     /** the database this optimizer operates on */
-    private Database db;
+    private PartitionStore db;
     
     
     /**
@@ -51,7 +51,7 @@
      *
      * @param db the database this optimizer works for.
      */
-    public DefaultOptimizer( Database db )
+    public DefaultOptimizer( PartitionStore db )
     {
         this.db = db;
     }

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/DefaultSearchEngine.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/DefaultSearchEngine.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/DefaultSearchEngine.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/DefaultSearchEngine.java
Mon Jun 20 05:17:51 2005
@@ -45,7 +45,7 @@
     /** the Optimizer used by this DefaultSearchEngine */
     private final Optimizer optimizer;
     /** the Database this DefaultSearchEngine operates on */
-    private Database db;
+    private PartitionStore db;
     /** Evaluator flyweight used for filter expression assertions */
     private ExpressionEvaluator evaluator;
     /** Enumerator flyweight that creates enumerations on filter expressions */
@@ -61,7 +61,7 @@
      * Creates a DefaultSearchEngine for searching a Database without setting
      * up the database.
      */
-    public DefaultSearchEngine( Database db,
+    public DefaultSearchEngine( PartitionStore db,
                                 ExpressionEvaluator evaluator,
                                 ExpressionEnumerator enumerator )
     {

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ExpressionEnumerator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ExpressionEnumerator.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ExpressionEnumerator.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ExpressionEnumerator.java
Mon Jun 20 05:17:51 2005
@@ -43,7 +43,7 @@
 public class ExpressionEnumerator implements Enumerator
 {
     /** The database used by this enumerator */
-    private Database db = null;
+    private PartitionStore db = null;
     /** Enumerator flyweight for evaulating filter scope assertions */
     private ScopeEnumerator scopeEnumerator;
     /** Enumerator flyweight for evaulating filter substring assertions */
@@ -58,7 +58,7 @@
      * @param db database used by this enumerator
      * @param evaluator
      */
-    public ExpressionEnumerator( Database db,
+    public ExpressionEnumerator( PartitionStore db,
                                  AttributeTypeRegistry attributeTypeRegistry,
                                  ExpressionEvaluator evaluator )
     {

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ExpressionEvaluator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ExpressionEvaluator.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ExpressionEvaluator.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ExpressionEvaluator.java
Mon Jun 20 05:17:51 2005
@@ -64,7 +64,7 @@
      * @param oidRegistry the oid reg used for attrID to oid resolution
      * @param attributeTypeRegistry the attribtype reg used for value comparison
      */
-    public ExpressionEvaluator( Database db,
+    public ExpressionEvaluator( PartitionStore db,
                                 OidRegistry oidRegistry,
                                 AttributeTypeRegistry attributeTypeRegistry )
     {

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/LeafEvaluator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/LeafEvaluator.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/LeafEvaluator.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/LeafEvaluator.java
Mon Jun 20 05:17:51 2005
@@ -55,7 +55,7 @@
 
 
     /** Database used to evaluate leaf with */
-    private Database db;
+    private PartitionStore db;
     /** Oid Registry used to translate attributeIds to OIDs */
     private OidRegistry oidRegistry;
     /** AttributeType registry needed for normalizing and comparing values */
@@ -73,7 +73,7 @@
      * @param scopeEvaluator
      * @param substringEvaluator
      */
-    public LeafEvaluator( Database db, OidRegistry oidRegistry,
+    public LeafEvaluator( PartitionStore db, OidRegistry oidRegistry,
                           AttributeTypeRegistry attributeTypeRegistry,
                           ScopeEvaluator scopeEvaluator,
                           SubstringEvaluator substringEvaluator )

Copied: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/PartitionStore.java
(from r191453, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/Database.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/PartitionStore.java?p2=directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/PartitionStore.java&p1=directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/Database.java&r1=191453&r2=191455&rev=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/Database.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/PartitionStore.java
Mon Jun 20 05:17:51 2005
@@ -35,7 +35,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface Database
+public interface PartitionStore
 {
     // @todo do these alias constants need to go elsewhere?
     /** The objectClass name for aliases: 'alias' */

Copied: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/PartitionStoreSearchResult.java
(from r191453, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/DbSearchResult.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/PartitionStoreSearchResult.java?p2=directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/PartitionStoreSearchResult.java&p1=directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/DbSearchResult.java&r1=191453&r2=191455&rev=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/DbSearchResult.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/PartitionStoreSearchResult.java
Mon Jun 20 05:17:51 2005
@@ -31,7 +31,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class DbSearchResult extends SearchResult
+public class PartitionStoreSearchResult extends SearchResult
 {
     private static final long serialVersionUID = 3976739172700860977L;
 
@@ -52,7 +52,7 @@
      * @param obj the object if any
      * @param attrs the attributes of the entry
      */
-    public DbSearchResult( BigInteger id, String name, Object obj,
+    public PartitionStoreSearchResult( BigInteger id, String name, Object obj,
         Attributes attrs )
     {
         super( name, obj, attrs );
@@ -69,7 +69,7 @@
      * @param attrs the attributes of the entry
      * @param isRelative whether or not the name is relative to the base
      */
-    public DbSearchResult( BigInteger id, String name, Object obj,
+    public PartitionStoreSearchResult( BigInteger id, String name, Object obj,
         Attributes attrs, boolean isRelative )
     {
         super( name, obj, attrs, isRelative );
@@ -86,7 +86,7 @@
      * @param obj the object if any
      * @param attrs the attributes of the entry
      */
-    public DbSearchResult( BigInteger id, String name, String className,
+    public PartitionStoreSearchResult( BigInteger id, String name, String className,
         Object obj, Attributes attrs )
     {
         super( name, className, obj, attrs );
@@ -104,7 +104,7 @@
      * @param attrs the attributes of the entry
      * @param isRelative whether or not the name is relative to the base
      */
-    public DbSearchResult( BigInteger id, String name, String className,
+    public PartitionStoreSearchResult( BigInteger id, String name, String className,
         Object obj, Attributes attrs, boolean isRelative )
     {
         super( name, className, obj, attrs, isRelative );

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEnumerator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEnumerator.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEnumerator.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEnumerator.java
Mon Jun 20 05:17:51 2005
@@ -37,12 +37,12 @@
 public class ScopeEnumerator implements Enumerator
 {
     /** Database used to enumerate based on scope */
-    private Database db = null;
+    private PartitionStore db = null;
     /** Filter scope expression evaluator */
     private ScopeEvaluator evaluator = null;
 
 
-    public ScopeEnumerator( Database db, ScopeEvaluator evaluator )
+    public ScopeEnumerator( PartitionStore db, ScopeEvaluator evaluator )
     {
         this.db = db;
         this.evaluator = evaluator;

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEvaluator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEvaluator.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEvaluator.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEvaluator.java
Mon Jun 20 05:17:51 2005
@@ -46,7 +46,7 @@
 public class ScopeEvaluator implements Evaluator
 {
     /** Database used to evaluate scope with */
-    private Database db;
+    private PartitionStore db;
 
 
     /**
@@ -54,7 +54,7 @@
      *
      * @param db the database used to evaluate scope node
      */
-    public ScopeEvaluator( Database db )
+    public ScopeEvaluator( PartitionStore db )
     {
         this.db = db;
     }

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SearchResultEnumeration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SearchResultEnumeration.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SearchResultEnumeration.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SearchResultEnumeration.java
Mon Jun 20 05:17:51 2005
@@ -39,7 +39,7 @@
 public class SearchResultEnumeration implements NamingEnumeration
 {
     /** Database used to lookup entries from */
-    private Database db = null;
+    private PartitionStore db = null;
     /** base of search for relative names */
     /** the attributes to return */
     private final String [] attrIds;
@@ -56,7 +56,7 @@
      */
     public SearchResultEnumeration( String [] attrIds, 
                                     NamingEnumeration underlying,
-                                    Database db )
+                                    PartitionStore db )
     {
         this.db = db;
         this.attrIds = attrIds;
@@ -118,7 +118,7 @@
             }
         }
 
-        return new DbSearchResult( rec.getEntryId(), name, null, entry );
+        return new PartitionStoreSearchResult( rec.getEntryId(), name, null, entry );
     }
 
     

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEnumerator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEnumerator.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEnumerator.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEnumerator.java
Mon Jun 20 05:17:51 2005
@@ -49,7 +49,7 @@
 public class SubstringEnumerator implements Enumerator
 {
     /** Database used */
-    private final Database db;
+    private final PartitionStore db;
     /** Evaluator used is an Avalon dependent object */
     private final SubstringEvaluator evaluator;
     /** the attribute type registry */
@@ -62,7 +62,7 @@
      * @param db the database
      * @param evaluator a substring evaluator
      */
-    public SubstringEnumerator( Database db,
+    public SubstringEnumerator( PartitionStore db,
                                 AttributeTypeRegistry attributeTypeRegistry,
                                 SubstringEvaluator evaluator )
     {

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEvaluator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEvaluator.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEvaluator.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEvaluator.java
Mon Jun 20 05:17:51 2005
@@ -41,7 +41,7 @@
 public class SubstringEvaluator implements Evaluator
 {
     /** Database used while evaluating candidates */
-    private Database db;
+    private PartitionStore db;
     /** Oid Registry used to translate attributeIds to OIDs */
     private OidRegistry oidRegistry;
     /** AttributeType registry needed for normalizing and comparing values */
@@ -55,7 +55,7 @@
      * @param oidRegistry the OID registry for name to OID mapping
      * @param attributeTypeRegistry the attributeType registry
      */
-    public SubstringEvaluator( Database db, OidRegistry oidRegistry,
+    public SubstringEvaluator( PartitionStore db, OidRegistry oidRegistry,
                                AttributeTypeRegistry attributeTypeRegistry )
     {
         this.db = db;

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/EntryNode.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/EntryNode.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/EntryNode.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/EntryNode.java
Mon Jun 20 05:17:51 2005
@@ -31,7 +31,7 @@
 
 import org.apache.ldap.common.filter.ExprNode;
 import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.partition.store.Database;
+import org.apache.ldap.server.partition.store.PartitionStore;
 import org.apache.ldap.server.partition.store.IndexRecord;
 import org.apache.ldap.server.partition.store.SearchEngine;
 
@@ -45,21 +45,21 @@
 public class EntryNode
 	implements TreeNode
 {
-    private final Database db;
+    private final PartitionStore db;
     private final EntryNode parent;
 	private final Attributes entry;
     private final ArrayList children;
     private final BigInteger id;
 
 
-    public EntryNode( BigInteger id, EntryNode parent, Database db,
+    public EntryNode( BigInteger id, EntryNode parent, PartitionStore db,
         Attributes entry, HashMap map )
     {
         this( id, parent, db, entry, map, null, null );
     }
 
 
-    public EntryNode( BigInteger id, EntryNode parent, Database db,
+    public EntryNode( BigInteger id, EntryNode parent, PartitionStore db,
         Attributes entry, HashMap map, ExprNode exprNode,
         SearchEngine engine )
     {

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/MainFrame.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/MainFrame.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/MainFrame.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/MainFrame.java
Mon Jun 20 05:17:51 2005
@@ -70,7 +70,7 @@
 import org.apache.ldap.common.message.LockableAttributesImpl;
 import org.apache.ldap.common.name.LdapName;
 import org.apache.ldap.common.util.StringTools;
-import org.apache.ldap.server.partition.store.Database;
+import org.apache.ldap.server.partition.store.PartitionStore;
 import org.apache.ldap.server.partition.store.Index;
 import org.apache.ldap.server.partition.store.IndexRecord;
 import org.apache.ldap.server.partition.store.SearchEngine;
@@ -106,7 +106,7 @@
     private JMenu indices = new JMenu();
 
     // Non Swing Stuff
-    private Database database = null;
+    private PartitionStore database = null;
     private boolean doCleanUp = false;
     private HashMap nodes = new HashMap();
     private EntryNode root = null;
@@ -116,7 +116,7 @@
     /**
      * Creates new form JFrame
      */
-    public MainFrame( Database db, SearchEngine eng )
+    public MainFrame( PartitionStore db, SearchEngine eng )
         throws NamingException
     {
         database = db;
@@ -816,7 +816,7 @@
     }
 
 
-    public void buildIndicesMenu( Database database )
+    public void buildIndicesMenu( PartitionStore database )
     {
         JMenuItem item = null;
         

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/PartitionViewer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/PartitionViewer.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/PartitionViewer.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/PartitionViewer.java
Mon Jun 20 05:17:51 2005
@@ -22,7 +22,7 @@
 
 import javax.naming.NamingException;
 
-import org.apache.ldap.server.partition.store.Database;
+import org.apache.ldap.server.partition.store.PartitionStore;
 import org.apache.ldap.server.partition.store.SearchEngine;
 
 
@@ -35,11 +35,11 @@
 public class PartitionViewer
 {
     /** A handle on the atomic partition */
-    private Database db;
+    private PartitionStore db;
     private SearchEngine eng;
 
 
-    public PartitionViewer( Database db, SearchEngine eng )
+    public PartitionViewer( PartitionStore db, SearchEngine eng )
     {
         this.db = db;
         this.eng = eng;

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmDatabase.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmDatabase.java?rev=191455&r1=191454&r2=191455&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmDatabase.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmDatabase.java
Mon Jun 20 05:17:51 2005
@@ -47,7 +47,7 @@
 import org.apache.ldap.common.schema.AttributeType;
 import org.apache.ldap.common.schema.Normalizer;
 import org.apache.ldap.common.util.NamespaceTools;
-import org.apache.ldap.server.partition.store.Database;
+import org.apache.ldap.server.partition.store.PartitionStore;
 import org.apache.ldap.server.partition.store.Index;
 import org.apache.ldap.server.partition.store.IndexAssertion;
 import org.apache.ldap.server.partition.store.IndexAssertionEnumeration;
@@ -61,7 +61,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class JdbmDatabase implements Database
+public class JdbmDatabase implements PartitionStore
 {
     /** the JDBM record manager used by this database */
     private final RecordManager recMan;
@@ -144,7 +144,7 @@
 
 
     /**
-     * @see Database#addIndexOn(AttributeType)
+     * @see PartitionStore#addIndexOn(AttributeType)
      */
     public void addIndexOn( AttributeType spec ) throws NamingException
     {
@@ -154,7 +154,7 @@
 
     
     /**
-     * @see Database#getExistanceIndex()
+     * @see PartitionStore#getExistanceIndex()
      */
     public Index getExistanceIndex() 
     {
@@ -163,7 +163,7 @@
     
 
     /**
-     * @see Database#setExistanceIndexOn(AttributeType)
+     * @see PartitionStore#setExistanceIndexOn(AttributeType)
      */    
     public void setExistanceIndexOn( AttributeType attrType ) throws NamingException
     {
@@ -179,7 +179,7 @@
 
     
     /**
-     * @see org.apache.ldap.server.partition.store.Database#getHierarchyIndex()
+     * @see org.apache.ldap.server.partition.store.PartitionStore#getHierarchyIndex()
      */
     public Index getHierarchyIndex() 
     {
@@ -188,7 +188,7 @@
     
 
     /**
-     * @see Database#setExistanceIndexOn(AttributeType)
+     * @see PartitionStore#setExistanceIndexOn(AttributeType)
      */
     public void setHierarchyIndexOn( AttributeType attrType ) throws NamingException
     {
@@ -204,7 +204,7 @@
 
     
     /**
-     * @see Database#getAliasIndex()
+     * @see PartitionStore#getAliasIndex()
      */
     public Index getAliasIndex()
     {
@@ -213,7 +213,7 @@
 
 
     /**
-     * @see Database#setAliasIndexOn(AttributeType)
+     * @see PartitionStore#setAliasIndexOn(AttributeType)
      */
     public void setAliasIndexOn( AttributeType attrType ) throws NamingException
     {
@@ -229,7 +229,7 @@
     
 
     /**
-     * @see Database#getOneAliasIndex()
+     * @see PartitionStore#getOneAliasIndex()
      */
     public Index getOneAliasIndex()
     {
@@ -238,7 +238,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#setOneAliasIndexOn(AttributeType)
+     * @see org.apache.ldap.server.partition.store.PartitionStore#setOneAliasIndexOn(AttributeType)
      */
     public void setOneAliasIndexOn( AttributeType attrType ) throws NamingException
     {
@@ -254,7 +254,7 @@
 
 
     /**
-     * @see Database#getSubAliasIndex()
+     * @see PartitionStore#getSubAliasIndex()
      */
     public Index getSubAliasIndex()
     {
@@ -263,7 +263,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#setSubAliasIndexOn(AttributeType)
+     * @see org.apache.ldap.server.partition.store.PartitionStore#setSubAliasIndexOn(AttributeType)
      */
     public void setSubAliasIndexOn( AttributeType attrType ) throws NamingException
     {
@@ -279,7 +279,7 @@
 
 
     /**
-     * @see Database#getUpdnIndex()
+     * @see PartitionStore#getUpdnIndex()
      */
     public Index getUpdnIndex()
     {
@@ -288,7 +288,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#setUpdnIndexOn(AttributeType)
+     * @see org.apache.ldap.server.partition.store.PartitionStore#setUpdnIndexOn(AttributeType)
      */
     public void setUpdnIndexOn( AttributeType attrType ) throws NamingException
     {
@@ -304,7 +304,7 @@
 
     
     /**
-     * @see org.apache.ldap.server.partition.store.Database#getNdnIndex()
+     * @see org.apache.ldap.server.partition.store.PartitionStore#getNdnIndex()
      */
     public Index getNdnIndex() 
     {
@@ -313,7 +313,7 @@
     
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#setNdnIndexOn(AttributeType)
+     * @see org.apache.ldap.server.partition.store.PartitionStore#setNdnIndexOn(AttributeType)
      */
     public void setNdnIndexOn( AttributeType attrType ) throws NamingException
     {
@@ -329,7 +329,7 @@
 
     
     /**
-     * @see org.apache.ldap.server.partition.store.Database#getUserIndices()
+     * @see org.apache.ldap.server.partition.store.PartitionStore#getUserIndices()
      */
     public Iterator getUserIndices()
     {
@@ -338,7 +338,7 @@
 
 
     /**
-     * @see Database#getSystemIndices()
+     * @see PartitionStore#getSystemIndices()
      */
     public Iterator getSystemIndices()
     {
@@ -347,7 +347,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#hasUserIndexOn(String)
+     * @see org.apache.ldap.server.partition.store.PartitionStore#hasUserIndexOn(String)
      */
     public boolean hasUserIndexOn( String attribute )
     {
@@ -357,7 +357,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#hasSystemIndexOn(String)
+     * @see org.apache.ldap.server.partition.store.PartitionStore#hasSystemIndexOn(String)
      */
     public boolean hasSystemIndexOn( String attribute )
     {
@@ -370,7 +370,7 @@
      * @todo replace lookups to use the OID instead of the name.  Also note
      * that the OID registry can be used to go between names and oids.
      * 
-     * @see org.apache.ldap.server.partition.store.Database#getUserIndex(String)
+     * @see org.apache.ldap.server.partition.store.PartitionStore#getUserIndex(String)
      */
     public Index getUserIndex( String attribute ) throws IndexNotFoundException
     {
@@ -396,7 +396,7 @@
      * @todo replace lookups to use the OID instead of the name.  Also note
      * that the OID registry can be used to go between names and oids.
      * 
-     * @see Database#getEntryId(String)
+     * @see PartitionStore#getEntryId(String)
      */
     public Index getSystemIndex( String indexName ) throws IndexNotFoundException
     {
@@ -419,7 +419,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#getEntryId(String)
+     * @see org.apache.ldap.server.partition.store.PartitionStore#getEntryId(String)
      */
     public BigInteger getEntryId( String dn ) throws NamingException
     {
@@ -428,7 +428,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#getEntryDn(java.math.BigInteger)
+     * @see org.apache.ldap.server.partition.store.PartitionStore#getEntryDn(java.math.BigInteger)
      */
     public String getEntryDn( BigInteger id ) throws NamingException
     {
@@ -437,7 +437,7 @@
 
 
     /**
-     * @see Database#getParentId(String)
+     * @see PartitionStore#getParentId(String)
      */
     public BigInteger getParentId( String dn ) throws NamingException
     {
@@ -447,7 +447,7 @@
 
 
     /**
-     * @see Database#getParentId(BigInteger)
+     * @see PartitionStore#getParentId(BigInteger)
      */
     public BigInteger getParentId( BigInteger childId ) throws NamingException
     {
@@ -456,7 +456,7 @@
     
     
     /**
-     * @see org.apache.ldap.server.partition.store.Database#getEntryUpdn(BigInteger)
+     * @see org.apache.ldap.server.partition.store.PartitionStore#getEntryUpdn(BigInteger)
      */
     public String getEntryUpdn( BigInteger id ) throws NamingException
     {
@@ -465,7 +465,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#getEntryUpdn(String)
+     * @see org.apache.ldap.server.partition.store.PartitionStore#getEntryUpdn(String)
      */
     public String getEntryUpdn( String dn ) throws NamingException
     {
@@ -475,7 +475,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#count()
+     * @see org.apache.ldap.server.partition.store.PartitionStore#count()
      */
     public int count() throws NamingException
     {
@@ -668,7 +668,7 @@
 
 
     /**
-     * @see Database#add(String,Name,Attributes)
+     * @see PartitionStore#add(String,Name,Attributes)
      */
     public void add( String updn, Name dn, Attributes entry ) throws NamingException
     {
@@ -745,7 +745,7 @@
 
 
     /**
-     * @see Database#lookup(BigInteger)
+     * @see PartitionStore#lookup(BigInteger)
      */
     public Attributes lookup( BigInteger id ) throws NamingException
     {
@@ -754,7 +754,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#delete(BigInteger)
+     * @see org.apache.ldap.server.partition.store.PartitionStore#delete(BigInteger)
      */
     public void delete( BigInteger id ) throws  NamingException
     {
@@ -800,7 +800,7 @@
 
 
     /**
-     * @see Database#list(java.math.BigInteger)
+     * @see PartitionStore#list(java.math.BigInteger)
      */
     public NamingEnumeration list( BigInteger id ) throws  NamingException
     {
@@ -809,7 +809,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#getChildCount(java.math.BigInteger)
+     * @see org.apache.ldap.server.partition.store.PartitionStore#getChildCount(java.math.BigInteger)
      */
     public int getChildCount( BigInteger id ) throws NamingException
     {
@@ -818,7 +818,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#getSuffix()
+     * @see org.apache.ldap.server.partition.store.PartitionStore#getSuffix()
      */
     public Name getSuffix()
     {
@@ -827,7 +827,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#getSuffixEntry()
+     * @see org.apache.ldap.server.partition.store.PartitionStore#getSuffixEntry()
      */
     public Attributes getSuffixEntry() throws NamingException
     {
@@ -843,7 +843,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#sync()
+     * @see org.apache.ldap.server.partition.store.PartitionStore#sync()
      */
     public void sync() throws NamingException
     {
@@ -907,7 +907,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#close()
+     * @see org.apache.ldap.server.partition.store.PartitionStore#close()
      */
     public synchronized void close() throws NamingException
     {
@@ -1016,7 +1016,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#isClosed()
+     * @see org.apache.ldap.server.partition.store.PartitionStore#isClosed()
      */
     public boolean isClosed()
     {
@@ -1025,7 +1025,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#setProperty(String, String)
+     * @see org.apache.ldap.server.partition.store.PartitionStore#setProperty(String, String)
      */
     public void setProperty( String propertyName, String propertyValue )
         throws NamingException
@@ -1035,7 +1035,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#getProperty(String)
+     * @see org.apache.ldap.server.partition.store.PartitionStore#getProperty(String)
      */
     public String getProperty( String propertyName ) throws NamingException
     {
@@ -1044,7 +1044,7 @@
 
 
     /**
-     * @see Database#getIndices(java.math.BigInteger)
+     * @see PartitionStore#getIndices(java.math.BigInteger)
      */
     public Attributes getIndices( BigInteger id ) throws  NamingException
     {
@@ -1244,7 +1244,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#modify(javax.naming.Name, int,
+     * @see org.apache.ldap.server.partition.store.PartitionStore#modify(javax.naming.Name,
int,
      * javax.naming.directory.Attributes)
      */
     public void modify( Name dn, int modOp, Attributes mods ) throws NamingException
@@ -1298,7 +1298,7 @@
     
 
     /**
-     * @see Database#modify(javax.naming.Name,
+     * @see PartitionStore#modify(javax.naming.Name,
      * javax.naming.directory.ModificationItem[])
      */
     public void modify( Name dn, ModificationItem [] mods ) throws NamingException
@@ -1347,7 +1347,7 @@
      * @param deleteOldRdn whether or not to remove the old Rdn attr/val
      * @throws NamingException if there are any errors propagating the name 
      *        changes.
-     * @see org.apache.ldap.server.partition.store.Database#modifyRdn(javax.naming.Name,
+     * @see org.apache.ldap.server.partition.store.PartitionStore#modifyRdn(javax.naming.Name,
      * String, boolean)
      */
     public void modifyRdn( Name dn, String newRdn, boolean deleteOldRdn )
@@ -1511,7 +1511,7 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.store.Database#move(javax.naming.Name,
+     * @see org.apache.ldap.server.partition.store.PartitionStore#move(javax.naming.Name,
      * javax.naming.Name, String, boolean)
      */
     public void move( Name oldChildDn, Name newParentDn, String newRdn,
@@ -1535,7 +1535,7 @@
      * @param newParentDn the normalized dn of the new parent for the child
      * @throws NamingException if something goes wrong
      *
-     * @see Database#move(javax.naming.Name,
+     * @see PartitionStore#move(javax.naming.Name,
      * javax.naming.Name)
      */
     public void move( Name oldChildDn, Name newParentDn ) throws NamingException



Mime
View raw message