You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2005/06/20 14:19:35 UTC
svn commit: r191456 - in /directory/apacheds/branches/db_refactor/core/src: main/java/org/apache/ldap/server/jndi/ main/java/org/apache/ldap/server/partition/store/jdbm/ test/org/apache/ldap/server/authz/

Author: trustin
Date: Mon Jun 20 05:19:35 2005
New Revision: 191456

URL: http://svn.apache.org/viewcvs?rev=191456&view=rev
Log:
Renamed JdbmDatabase to JdbmPartitionStore

Added:
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmPartitionStore.java
      - copied, changed from r191455, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmDatabase.java
Removed:
    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/jndi/DefaultContextFactoryConfiguration.java
    directory/apacheds/branches/db_refactor/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java
    directory/apacheds/branches/db_refactor/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsNonAdminTest.java

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java?rev=191456&r1=191455&r2=191456&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java Mon Jun 20 05:19:35 2005
@@ -49,12 +49,12 @@
 import org.apache.ldap.server.partition.PartitionNexus;
 import org.apache.ldap.server.partition.RootNexus;
 import org.apache.ldap.server.partition.SystemPartition;
-import org.apache.ldap.server.partition.store.Database;
+import org.apache.ldap.server.partition.store.PartitionStore;
 import org.apache.ldap.server.partition.store.DefaultSearchEngine;
 import org.apache.ldap.server.partition.store.ExpressionEnumerator;
 import org.apache.ldap.server.partition.store.ExpressionEvaluator;
 import org.apache.ldap.server.partition.store.SearchEngine;
-import org.apache.ldap.server.partition.store.jdbm.JdbmDatabase;
+import org.apache.ldap.server.partition.store.jdbm.JdbmPartitionStore;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
 import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
 import org.apache.ldap.server.schema.GlobalRegistries;
@@ -514,7 +514,7 @@
         LdapName suffix = new LdapName();
         suffix.add( SystemPartition.SUFFIX );
 
-        Database db = new JdbmDatabase( suffix, suffix, workDir.getPath() );
+        PartitionStore db = new JdbmPartitionStore( suffix, suffix, workDir.getPath() );
         AttributeTypeRegistry attributeTypeRegistry = bootstrapRegistries .getAttributeTypeRegistry();
         OidRegistry oidRegistry = bootstrapRegistries.getOidRegistry();
         ExpressionEvaluator evaluator = new ExpressionEvaluator( db, oidRegistry, attributeTypeRegistry );
@@ -578,7 +578,7 @@
             Name upSuffix = new LdapName( cfg.getSuffix() );
             Normalizer dnNorm = reg.lookup( "distinguishedNameMatch" ) .getNormalizer();
             Name normSuffix = new LdapName( ( String ) dnNorm.normalize( cfg.getSuffix() ) );
-            Database db = new JdbmDatabase( upSuffix, normSuffix, partitionWorkDir.getPath() );
+            PartitionStore db = new JdbmPartitionStore( upSuffix, normSuffix, partitionWorkDir.getPath() );
 
             // ----------------------------------------------------------------
             // create the search engine using db, enumerators and evaluators

Copied: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmPartitionStore.java (from r191455, 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/JdbmPartitionStore.java?p2=directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmPartitionStore.java&p1=directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmDatabase.java&r1=191455&r2=191456&rev=191456&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/JdbmPartitionStore.java Mon Jun 20 05:19:35 2005
@@ -61,7 +61,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class JdbmDatabase implements PartitionStore
+public class JdbmPartitionStore implements PartitionStore
 {
     /** the JDBM record manager used by this database */
     private final RecordManager recMan;
@@ -110,7 +110,7 @@
      * @param wkdirPath the path to the working directory where the db resides
      * @throws NamingException if db cannot be created
      */
-    public JdbmDatabase ( final Name upSuffix, final Name normSuffix, final String wkdirPath )
+    public JdbmPartitionStore ( final Name upSuffix, final Name normSuffix, final String wkdirPath )
         throws NamingException
     {
         this.upSuffix = upSuffix;

Modified: directory/apacheds/branches/db_refactor/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java?rev=191456&r1=191455&r2=191456&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java Mon Jun 20 05:19:35 2005
@@ -28,7 +28,7 @@
 import org.apache.ldap.common.exception.LdapNoPermissionException;
 import org.apache.ldap.common.message.LockableAttributesImpl;
 import org.apache.ldap.server.AbstractAdminTestCase;
-import org.apache.ldap.server.partition.store.DbSearchResult;
+import org.apache.ldap.server.partition.store.PartitionStoreSearchResult;
 
 
 /**
@@ -110,7 +110,7 @@
 
         while ( list.hasMore() )
         {
-            DbSearchResult result = ( DbSearchResult ) list.next();
+            PartitionStoreSearchResult result = ( PartitionStoreSearchResult ) list.next();
 
             set.add( result.getName() );
         }

Modified: directory/apacheds/branches/db_refactor/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsNonAdminTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsNonAdminTest.java?rev=191456&r1=191455&r2=191456&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsNonAdminTest.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsNonAdminTest.java Mon Jun 20 05:19:35 2005
@@ -28,7 +28,7 @@
 import org.apache.ldap.common.exception.LdapNoPermissionException;
 import org.apache.ldap.common.message.LockableAttributesImpl;
 import org.apache.ldap.server.AbstractNonAdminTestCase;
-import org.apache.ldap.server.partition.store.DbSearchResult;
+import org.apache.ldap.server.partition.store.PartitionStoreSearchResult;
 
 
 /**
@@ -110,7 +110,7 @@
                 "(objectClass=*)", controls );
         while ( list.hasMore() )
         {
-            DbSearchResult result = ( DbSearchResult ) list.next();
+            PartitionStoreSearchResult result = ( PartitionStoreSearchResult ) list.next();
             set.add( result.getName() );
         }