directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r307079 [2/2] - in /directory/apacheds/trunk/core/src: main/java/org/apache/ldap/server/authn/ main/java/org/apache/ldap/server/authz/ main/java/org/apache/ldap/server/collective/ main/java/org/apache/ldap/server/configuration/ main/java/or...
Date Fri, 07 Oct 2005 10:39:16 GMT
Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java (from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java&r1=307049&r2=307079&rev=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java Fri Oct  7 03:38:21 2005
@@ -58,10 +58,10 @@
 import org.apache.ldap.common.util.DateUtils;
 import org.apache.ldap.common.util.NamespaceTools;
 import org.apache.ldap.common.util.SingletonEnumeration;
-import org.apache.ldap.server.configuration.ContextPartitionConfiguration;
-import org.apache.ldap.server.configuration.MutableContextPartitionConfiguration;
+import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
+import org.apache.ldap.server.configuration.MutableDirectoryPartitionConfiguration;
 import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
-import org.apache.ldap.server.partition.impl.btree.jdbm.JdbmContextPartition;
+import org.apache.ldap.server.partition.impl.btree.jdbm.JdbmDirectoryPartition;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -74,9 +74,9 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class DefaultContextPartitionNexus extends ContextPartitionNexus
+public class DefaultDirectoryPartitionNexus extends DirectoryPartitionNexus
 {
-    private static final Logger log = LoggerFactory.getLogger( DefaultContextPartitionNexus.class );
+    private static final Logger log = LoggerFactory.getLogger( DefaultDirectoryPartitionNexus.class );
 
     /** the vendorName string proudly set to: Apache Software Foundation*/
     private static final String ASF = "Apache Software Foundation";
@@ -96,7 +96,7 @@
     private ContextFactoryConfiguration factoryCfg;
 
     /** the system backend */
-    private ContextPartition system;
+    private DirectoryPartition system;
 
     /** the backends keyed by normalized suffix strings */
     private HashMap partitions = new HashMap();
@@ -113,7 +113,7 @@
      *
      * @see <a href="http://www.faqs.org/rfcs/rfc3045.html">Vendor Information</a>
      */
-    public DefaultContextPartitionNexus( Attributes rootDSE )
+    public DefaultDirectoryPartitionNexus( Attributes rootDSE )
     {
         // setup that root DSE
         this.rootDSE = rootDSE;
@@ -147,7 +147,7 @@
     }
 
 
-    public void init( ContextFactoryConfiguration factoryCfg, ContextPartitionConfiguration cfg ) throws NamingException
+    public void init( ContextFactoryConfiguration factoryCfg, DirectoryPartitionConfiguration cfg ) throws NamingException
     {
         // NOTE: We ignore ContextPartitionConfiguration parameter here.
         if( initialized )
@@ -165,7 +165,7 @@
         {
             while( i.hasNext() )
             {
-                ContextPartitionConfiguration c = ( ContextPartitionConfiguration ) i.next();
+                DirectoryPartitionConfiguration c = ( DirectoryPartitionConfiguration ) i.next();
                 addContextPartition( c );
                 initializedPartitionCfgs.add( 0, c );
             }
@@ -178,9 +178,9 @@
                 i = initializedPartitionCfgs.iterator();
                 while( i.hasNext() )
                 {
-                    ContextPartitionConfiguration partitionCfg = 
-                        ( ContextPartitionConfiguration ) i.next();
-                    ContextPartition partition = partitionCfg.getContextPartition();
+                    DirectoryPartitionConfiguration partitionCfg = 
+                        ( DirectoryPartitionConfiguration ) i.next();
+                    DirectoryPartition partition = partitionCfg.getContextPartition();
                     i.remove();
                     try
                     {
@@ -202,13 +202,13 @@
     }
 
 
-    private ContextPartitionConfiguration initializeSystemPartition() throws NamingException
+    private DirectoryPartitionConfiguration initializeSystemPartition() throws NamingException
     {
         // initialize system partition first
-        MutableContextPartitionConfiguration systemCfg = new MutableContextPartitionConfiguration();
-        system = new JdbmContextPartition(); // using default implementation.
+        MutableDirectoryPartitionConfiguration systemCfg = new MutableDirectoryPartitionConfiguration();
+        system = new JdbmDirectoryPartition(); // using default implementation.
         systemCfg.setName( "system" );
-        systemCfg.setSuffix( ContextPartitionNexus.SYSTEM_PARTITION_SUFFIX );
+        systemCfg.setSuffix( DirectoryPartitionNexus.SYSTEM_PARTITION_SUFFIX );
         systemCfg.setContextPartition( system );
         
         // Add indexed attributes for system partition
@@ -228,11 +228,11 @@
         objectClassAttr.add( "top" );
         objectClassAttr.add( "organizationalUnit" );
         systemEntry.put( objectClassAttr );
-        systemEntry.put( "creatorsName", ContextPartitionNexus.ADMIN_PRINCIPAL ) ;
+        systemEntry.put( "creatorsName", DirectoryPartitionNexus.ADMIN_PRINCIPAL ) ;
         systemEntry.put( "createTimestamp", DateUtils.getGeneralizedTime() ) ;
         systemEntry.put(
-                NamespaceTools.getRdnAttribute( ContextPartitionNexus.SYSTEM_PARTITION_SUFFIX ),
-                NamespaceTools.getRdnValue( ContextPartitionNexus.SYSTEM_PARTITION_SUFFIX ) ) ;
+                NamespaceTools.getRdnAttribute( DirectoryPartitionNexus.SYSTEM_PARTITION_SUFFIX ),
+                NamespaceTools.getRdnValue( DirectoryPartitionNexus.SYSTEM_PARTITION_SUFFIX ) ) ;
         systemCfg.setContextEntry( systemEntry );
 
         system.init( factoryCfg, systemCfg );
@@ -285,7 +285,7 @@
 
 
     /**
-     * @see ContextPartition#sync()
+     * @see DirectoryPartition#sync()
      */
     public void sync() throws NamingException
     {
@@ -295,7 +295,7 @@
 
         while ( list.hasNext() )
         {
-            ContextPartition partition = ( ContextPartition ) list.next();
+            DirectoryPartition partition = ( DirectoryPartition ) list.next();
 
             try
             {
@@ -333,7 +333,7 @@
 
     public boolean compare( Name name, String oid, Object value ) throws NamingException
     {
-        ContextPartition partition = getBackend( name );
+        DirectoryPartition partition = getBackend( name );
         AttributeTypeRegistry registry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
 
         // complain if we do not recognize the attribute being compared
@@ -379,13 +379,13 @@
     }
 
 
-    public synchronized void addContextPartition( ContextPartitionConfiguration config ) throws NamingException
+    public synchronized void addContextPartition( DirectoryPartitionConfiguration config ) throws NamingException
     {
-        ContextPartition partition = config.getContextPartition();
+        DirectoryPartition partition = config.getContextPartition();
 
         // Turn on default indices
-        MutableContextPartitionConfiguration mcfg =
-            new MutableContextPartitionConfiguration();
+        MutableDirectoryPartitionConfiguration mcfg =
+            new MutableDirectoryPartitionConfiguration();
         mcfg.setName( config.getName() );
         mcfg.setSuffix( config.getSuffix() );
         mcfg.setContextEntry( config.getContextEntry() );
@@ -418,7 +418,7 @@
     public synchronized void removeContextPartition( Name suffix ) throws NamingException
     {
         String key = suffix.toString();
-        ContextPartition partition = (ContextPartition) partitions.get( key );
+        DirectoryPartition partition = (DirectoryPartition) partitions.get( key );
         if( partition == null )
         {
             throw new NameNotFoundException( "No partition with suffix: " + key );
@@ -432,13 +432,13 @@
         partition.destroy();
     }
     
-    public ContextPartition getSystemPartition()
+    public DirectoryPartition getSystemPartition()
     {
         return system;
     }
 
     /**
-     * @see ContextPartitionNexus#getLdapContext()
+     * @see DirectoryPartitionNexus#getLdapContext()
      */
     public LdapContext getLdapContext() 
     {
@@ -447,7 +447,7 @@
 
 
     /**
-     * @see ContextPartitionNexus#getMatchedName(javax.naming.Name, boolean)
+     * @see DirectoryPartitionNexus#getMatchedName(javax.naming.Name, boolean)
      */
     public Name getMatchedName( Name dn, boolean normalized ) throws NamingException
     {
@@ -474,18 +474,18 @@
 
 
     /**
-     * @see org.apache.ldap.server.partition.ContextPartitionNexus#getSuffix(javax.naming.Name, boolean)
+     * @see org.apache.ldap.server.partition.DirectoryPartitionNexus#getSuffix(javax.naming.Name, boolean)
      */
     public Name getSuffix( Name dn, boolean normalized ) throws NamingException
     {
-        ContextPartition backend = getBackend( dn );
+        DirectoryPartition backend = getBackend( dn );
 
         return backend.getSuffix( normalized );
     }
 
 
     /**
-     * @see org.apache.ldap.server.partition.ContextPartitionNexus#listSuffixes(boolean)
+     * @see org.apache.ldap.server.partition.DirectoryPartitionNexus#listSuffixes(boolean)
      */
     public Iterator listSuffixes( boolean normalized ) throws NamingException
     {
@@ -511,7 +511,7 @@
      * @param partition ContextPartition component to unregister with this
      * BackendNexus.
      */
-    private void unregister( ContextPartition partition ) throws NamingException
+    private void unregister( DirectoryPartition partition ) throws NamingException
     {
         Attribute namingContexts = rootDSE.get( NAMINGCTXS_ATTR );
         namingContexts.remove( partition.getSuffix( false ).toString() );
@@ -525,11 +525,11 @@
     
     
     /**
-     * @see ContextPartition#delete(javax.naming.Name)
+     * @see DirectoryPartition#delete(javax.naming.Name)
      */
     public void delete( Name dn ) throws NamingException
     {
-        ContextPartition backend = getBackend( dn );
+        DirectoryPartition backend = getBackend( dn );
 
         backend.delete( dn );
     }
@@ -542,52 +542,52 @@
      * here so backend implementors do not have to worry about performing these
      * kinds of checks.
      *
-     * @see org.apache.ldap.server.partition.ContextPartition#add(String, Name, Attributes)
+     * @see org.apache.ldap.server.partition.DirectoryPartition#add(String, Name, Attributes)
      */
     public void add( String updn, Name dn, Attributes an_entry ) throws NamingException
     {
-        ContextPartition backend = getBackend( dn );
+        DirectoryPartition backend = getBackend( dn );
 
         backend.add( updn, dn, an_entry );
     }
 
 
     /**
-     * @see ContextPartition#modify(Name, int,Attributes)
+     * @see DirectoryPartition#modify(Name, int,Attributes)
      */
     public void modify( Name dn, int modOp, Attributes mods ) throws NamingException
     {
-        ContextPartition backend = getBackend( dn );
+        DirectoryPartition backend = getBackend( dn );
 
         backend.modify( dn, modOp, mods );
     }
 
 
     /**
-     * @see ContextPartition#modify(javax.naming.Name,
+     * @see DirectoryPartition#modify(javax.naming.Name,
      * javax.naming.directory.ModificationItem[])
      */
     public void modify( Name dn, ModificationItem[] mods ) throws NamingException
     {
-        ContextPartition backend = getBackend( dn );
+        DirectoryPartition backend = getBackend( dn );
 
         backend.modify( dn, mods );
     }
 
     
     /**
-     * @see ContextPartition#list(javax.naming.Name)
+     * @see DirectoryPartition#list(javax.naming.Name)
      */
     public NamingEnumeration list( Name base ) throws NamingException
     {
-        ContextPartition backend = getBackend( base );
+        DirectoryPartition backend = getBackend( base );
 
         return backend.list( base );
     }
     
 
     /**
-     * @see ContextPartition#search(Name, Map, ExprNode, SearchControls)
+     * @see DirectoryPartition#search(Name, Map, ExprNode, SearchControls)
      */
     public NamingEnumeration search( Name base, Map env, ExprNode filter, SearchControls searchCtls )
             throws NamingException
@@ -644,14 +644,14 @@
             throw new LdapNameNotFoundException();
         }
 
-        ContextPartition backend = getBackend( base );
+        DirectoryPartition backend = getBackend( base );
 
         return backend.search( base, env, filter, searchCtls );
     }
 
 
     /**
-     * @see ContextPartition#lookup(javax.naming.Name)
+     * @see DirectoryPartition#lookup(javax.naming.Name)
      */
     public Attributes lookup( Name dn )  throws NamingException
     {
@@ -664,14 +664,14 @@
             return retval;
         }
 
-        ContextPartition backend = getBackend( dn );
+        DirectoryPartition backend = getBackend( dn );
 
         return backend.lookup( dn );
     }
 
 
     /**
-     * @see org.apache.ldap.server.partition.ContextPartition#lookup(javax.naming.Name, String[])
+     * @see org.apache.ldap.server.partition.DirectoryPartition#lookup(javax.naming.Name, String[])
      */
     public Attributes lookup( Name dn, String[] attrIds )  throws NamingException
     {
@@ -695,14 +695,14 @@
             return retval;
         }
 
-        ContextPartition backend = getBackend( dn );
+        DirectoryPartition backend = getBackend( dn );
 
         return backend.lookup( dn, attrIds );
     }
 
 
     /**
-     * @see ContextPartition#hasEntry(javax.naming.Name)
+     * @see DirectoryPartition#hasEntry(javax.naming.Name)
      */
     public boolean hasEntry( Name dn ) throws NamingException
     {
@@ -711,14 +711,14 @@
             return true;
         }
 
-        ContextPartition backend = getBackend( dn );
+        DirectoryPartition backend = getBackend( dn );
 
         return backend.hasEntry( dn );
     }
 
     
     /**
-     * @see ContextPartition#isSuffix(javax.naming.Name)
+     * @see DirectoryPartition#isSuffix(javax.naming.Name)
      */
     public boolean isSuffix( Name dn )
     {
@@ -727,35 +727,35 @@
 
     
     /**
-     * @see ContextPartition#modifyRn(Name, String, boolean)
+     * @see DirectoryPartition#modifyRn(Name, String, boolean)
      */
     public void modifyRn( Name dn, String newRdn, boolean deleteOldRdn ) throws NamingException
     {
-        ContextPartition backend = getBackend( dn );
+        DirectoryPartition backend = getBackend( dn );
 
         backend.modifyRn( dn, newRdn, deleteOldRdn );
     }
     
     
     /**
-     * @see ContextPartition#move(Name, Name)
+     * @see DirectoryPartition#move(Name, Name)
      */
     public void move( Name oriChildName, Name newParentName ) throws NamingException
     {
-        ContextPartition backend = getBackend( oriChildName );
+        DirectoryPartition backend = getBackend( oriChildName );
 
         backend.move( oriChildName, newParentName );
     }
     
     
     /**
-     * @see ContextPartition#move(javax.naming.Name,
+     * @see DirectoryPartition#move(javax.naming.Name,
      * javax.naming.Name, java.lang.String, boolean)
      */
     public void move( Name oldChildDn, Name newParentDn, String newRdn,
         boolean deleteOldRdn ) throws NamingException
     {
-        ContextPartition backend = getBackend( oldChildDn );
+        DirectoryPartition backend = getBackend( oldChildDn );
 
         backend.move( oldChildDn, newParentDn, newRdn, deleteOldRdn );
     }
@@ -773,7 +773,7 @@
      * @return the backend partition associated with the normalized dn
      * @throws NamingException if the name cannot be resolved to a backend
      */
-    private ContextPartition getBackend( Name dn ) throws NamingException
+    private DirectoryPartition getBackend( Name dn ) throws NamingException
     {
         Name clonedDn = ( Name ) dn.clone();
 
@@ -781,7 +781,7 @@
         {
             if ( partitions.containsKey( clonedDn.toString() ) )
             {
-                return ( ContextPartition ) partitions.get( clonedDn.toString() );
+                return ( DirectoryPartition ) partitions.get( clonedDn.toString() );
             }
             
             clonedDn.remove( clonedDn.size() - 1 );

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java (from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/ContextPartition.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/ContextPartition.java&r1=307049&r2=307079&rev=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/ContextPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java Fri Oct  7 03:38:21 2005
@@ -29,14 +29,14 @@
 import javax.naming.directory.SearchResult;
 
 import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.configuration.ContextPartitionConfiguration;
+import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
 import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
 
 
 /**
  * An interfaces that bridges between underlying JNDI entries and JNDI
  * {@link Context} API.  DIT (Directory Information Tree) consists one or
- * above {@link ContextPartition}s whose parent is {@link ContextPartitionNexus},
+ * above {@link DirectoryPartition}s whose parent is {@link DirectoryPartitionNexus},
  * and all of them are mapped to different
  * base suffix.  Each partition contains entries whose name ends with that
  * base suffix.
@@ -44,7 +44,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface ContextPartition
+public interface DirectoryPartition
 {
     /** The objectClass name for aliases: 'alias' */
     String ALIAS_OBJECT = "alias";
@@ -58,7 +58,7 @@
     /**
      * Initializes this partition.
      */
-    void init( ContextFactoryConfiguration factoryCfg, ContextPartitionConfiguration cfg ) throws NamingException;
+    void init( ContextFactoryConfiguration factoryCfg, DirectoryPartitionConfiguration cfg ) throws NamingException;
     
     
     /**

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexus.java (from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/ContextPartitionNexus.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexus.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexus.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/ContextPartitionNexus.java&r1=307049&r2=307079&rev=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/ContextPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexus.java Fri Oct  7 03:38:21 2005
@@ -25,11 +25,11 @@
 import javax.naming.ldap.LdapContext;
 
 import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.configuration.ContextPartitionConfiguration;
+import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
 
 
 /**
- * A root {@link ContextPartition} that contains all other partitions, and
+ * A root {@link DirectoryPartition} that contains all other partitions, and
  * routes all operations to the child partition that matches to its base suffixes.
  * It also provides some extended operations such as accessing rootDSE and
  * listing base suffixes.
@@ -37,7 +37,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public abstract class ContextPartitionNexus implements ContextPartition
+public abstract class DirectoryPartitionNexus implements DirectoryPartition
 {
     /** the default user principal or DN */
     public final static String ADMIN_PRINCIPAL = "uid=admin,ou=system";
@@ -147,11 +147,11 @@
      */
     public abstract boolean compare( Name name, String oid, Object value ) throws NamingException;
 
-    public abstract void addContextPartition( ContextPartitionConfiguration config ) throws NamingException;
+    public abstract void addContextPartition( DirectoryPartitionConfiguration config ) throws NamingException;
     
     public abstract void removeContextPartition( Name suffix ) throws NamingException;
 
-    public abstract ContextPartition getSystemPartition();
+    public abstract DirectoryPartition getSystemPartition();
 
     /**
      * Gets the most significant Dn that exists within the server for any Dn.
@@ -184,7 +184,7 @@
 
     /**
      * Gets an iteration over the Name suffixes of the Backends managed by this
-     * {@link ContextPartitionNexus}.
+     * {@link DirectoryPartitionNexus}.
      *
      * @param normalized if true the returned Iterator contains normalized Dn
      * but, if false, it returns the original user provided distinguished names

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java (from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeContextPartition.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeContextPartition.java&r1=307049&r2=307079&rev=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeContextPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java Fri Oct  7 03:38:21 2005
@@ -36,10 +36,10 @@
 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.configuration.ContextPartitionConfiguration;
+import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
 import org.apache.ldap.server.enumeration.SearchResultEnumeration;
 import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
-import org.apache.ldap.server.partition.ContextPartition;
+import org.apache.ldap.server.partition.DirectoryPartition;
 import org.apache.ldap.server.partition.Oid;
 import org.apache.ldap.server.partition.impl.btree.gui.PartitionViewer;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
@@ -47,12 +47,12 @@
 
 
 /**
- * An abstract {@link ContextPartition} that uses general BTree operations.
+ * An abstract {@link DirectoryPartition} that uses general BTree operations.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public abstract class BTreeContextPartition implements ContextPartition
+public abstract class BTreeDirectoryPartition implements DirectoryPartition
 {
     /** ===================================================================
 
@@ -105,12 +105,12 @@
     /**
      * Creates a B-tree based context partition.
      */
-    protected BTreeContextPartition()
+    protected BTreeDirectoryPartition()
     {
     }
     
 
-    public void init( ContextFactoryConfiguration factoryCfg, ContextPartitionConfiguration cfg ) throws NamingException
+    public void init( ContextFactoryConfiguration factoryCfg, DirectoryPartitionConfiguration cfg ) throws NamingException
     {
         attributeTypeRegistry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
         OidRegistry oidRegistry = factoryCfg.getGlobalRegistries().getOidRegistry();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeSearchResultEnumeration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeSearchResultEnumeration.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeSearchResultEnumeration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeSearchResultEnumeration.java Fri Oct  7 03:38:21 2005
@@ -43,7 +43,7 @@
 public class BTreeSearchResultEnumeration implements SearchResultEnumeration
 {
     /** Database used to lookup entries from */
-    private BTreeContextPartition partition = null;
+    private BTreeDirectoryPartition partition = null;
     /** the attributes to return */
     private final String [] attrIds;
     /** underlying enumeration over IndexRecords */
@@ -62,7 +62,7 @@
      */
     public BTreeSearchResultEnumeration( String [] attrIds, 
                                     NamingEnumeration underlying,
-                                    BTreeContextPartition db,
+                                    BTreeDirectoryPartition db,
                                     AttributeTypeRegistry registry )
     {
         this.partition = db;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DefaultOptimizer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DefaultOptimizer.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DefaultOptimizer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DefaultOptimizer.java Fri Oct  7 03:38:21 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 BTreeContextPartition db;
+    private BTreeDirectoryPartition db;
     
     
     /**
@@ -51,7 +51,7 @@
      *
      * @param db the database this optimizer works for.
      */
-    public DefaultOptimizer( BTreeContextPartition db )
+    public DefaultOptimizer( BTreeDirectoryPartition db )
     {
         this.db = db;
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DefaultSearchEngine.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DefaultSearchEngine.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DefaultSearchEngine.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DefaultSearchEngine.java Fri Oct  7 03:38:21 2005
@@ -45,7 +45,7 @@
     /** the Optimizer used by this DefaultSearchEngine */
     private final Optimizer optimizer;
     /** the Database this DefaultSearchEngine operates on */
-    private BTreeContextPartition db;
+    private BTreeDirectoryPartition 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( BTreeContextPartition db,
+    public DefaultSearchEngine( BTreeDirectoryPartition db,
                                 ExpressionEvaluator evaluator,
                                 ExpressionEnumerator enumerator )
     {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ExpressionEnumerator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ExpressionEnumerator.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ExpressionEnumerator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ExpressionEnumerator.java Fri Oct  7 03:38:21 2005
@@ -43,7 +43,7 @@
 public class ExpressionEnumerator implements Enumerator
 {
     /** The database used by this enumerator */
-    private BTreeContextPartition db = null;
+    private BTreeDirectoryPartition 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( BTreeContextPartition db,
+    public ExpressionEnumerator( BTreeDirectoryPartition db,
                                  AttributeTypeRegistry attributeTypeRegistry,
                                  ExpressionEvaluator evaluator )
     {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ExpressionEvaluator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ExpressionEvaluator.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ExpressionEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ExpressionEvaluator.java Fri Oct  7 03:38:21 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( BTreeContextPartition db,
+    public ExpressionEvaluator( BTreeDirectoryPartition db,
                                 OidRegistry oidRegistry,
                                 AttributeTypeRegistry attributeTypeRegistry )
     {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/LeafEvaluator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/LeafEvaluator.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/LeafEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/LeafEvaluator.java Fri Oct  7 03:38:21 2005
@@ -55,7 +55,7 @@
 
 
     /** Database used to evaluate leaf with */
-    private BTreeContextPartition db;
+    private BTreeDirectoryPartition 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( BTreeContextPartition db, OidRegistry oidRegistry,
+    public LeafEvaluator( BTreeDirectoryPartition db, OidRegistry oidRegistry,
                           AttributeTypeRegistry attributeTypeRegistry,
                           ScopeEvaluator scopeEvaluator,
                           SubstringEvaluator substringEvaluator )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ScopeEnumerator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ScopeEnumerator.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ScopeEnumerator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ScopeEnumerator.java Fri Oct  7 03:38:21 2005
@@ -37,12 +37,12 @@
 public class ScopeEnumerator implements Enumerator
 {
     /** Database used to enumerate based on scope */
-    private BTreeContextPartition db = null;
+    private BTreeDirectoryPartition db = null;
     /** Filter scope expression evaluator */
     private ScopeEvaluator evaluator = null;
 
 
-    public ScopeEnumerator( BTreeContextPartition db, ScopeEvaluator evaluator )
+    public ScopeEnumerator( BTreeDirectoryPartition db, ScopeEvaluator evaluator )
     {
         this.db = db;
         this.evaluator = evaluator;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ScopeEvaluator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ScopeEvaluator.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ScopeEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ScopeEvaluator.java Fri Oct  7 03:38:21 2005
@@ -46,7 +46,7 @@
 public class ScopeEvaluator implements Evaluator
 {
     /** Database used to evaluate scope with */
-    private BTreeContextPartition db;
+    private BTreeDirectoryPartition db;
 
 
     /**
@@ -54,7 +54,7 @@
      *
      * @param db the database used to evaluate scope node
      */
-    public ScopeEvaluator( BTreeContextPartition db )
+    public ScopeEvaluator( BTreeDirectoryPartition db )
     {
         this.db = db;
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SubstringEnumerator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SubstringEnumerator.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SubstringEnumerator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SubstringEnumerator.java Fri Oct  7 03:38:21 2005
@@ -49,7 +49,7 @@
 public class SubstringEnumerator implements Enumerator
 {
     /** Database used */
-    private final BTreeContextPartition db;
+    private final BTreeDirectoryPartition 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( BTreeContextPartition db,
+    public SubstringEnumerator( BTreeDirectoryPartition db,
                                 AttributeTypeRegistry attributeTypeRegistry,
                                 SubstringEvaluator evaluator )
     {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SubstringEvaluator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SubstringEvaluator.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SubstringEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SubstringEvaluator.java Fri Oct  7 03:38:21 2005
@@ -41,7 +41,7 @@
 public class SubstringEvaluator implements Evaluator
 {
     /** Database used while evaluating candidates */
-    private BTreeContextPartition db;
+    private BTreeDirectoryPartition 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( BTreeContextPartition db, OidRegistry oidRegistry,
+    public SubstringEvaluator( BTreeDirectoryPartition db, OidRegistry oidRegistry,
                                AttributeTypeRegistry attributeTypeRegistry )
     {
         this.db = db;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryNode.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryNode.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryNode.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryNode.java Fri Oct  7 03:38:21 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.impl.btree.BTreeContextPartition;
+import org.apache.ldap.server.partition.impl.btree.BTreeDirectoryPartition;
 import org.apache.ldap.server.partition.impl.btree.IndexRecord;
 import org.apache.ldap.server.partition.impl.btree.SearchEngine;
 
@@ -45,21 +45,21 @@
 public class EntryNode
 	implements TreeNode
 {
-    private final BTreeContextPartition partition;
+    private final BTreeDirectoryPartition partition;
     private final EntryNode parent;
 	private final Attributes entry;
     private final ArrayList children;
     private final BigInteger id;
 
 
-    public EntryNode( BigInteger id, EntryNode parent, BTreeContextPartition partition,
+    public EntryNode( BigInteger id, EntryNode parent, BTreeDirectoryPartition partition,
         Attributes entry, HashMap map )
     {
         this( id, parent, partition, entry, map, null, null );
     }
 
 
-    public EntryNode( BigInteger id, EntryNode parent, BTreeContextPartition db,
+    public EntryNode( BigInteger id, EntryNode parent, BTreeDirectoryPartition db,
         Attributes entry, HashMap map, ExprNode exprNode,
         SearchEngine engine )
     {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/MainFrame.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/MainFrame.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/MainFrame.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/MainFrame.java Fri Oct  7 03:38:21 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.impl.btree.BTreeContextPartition;
+import org.apache.ldap.server.partition.impl.btree.BTreeDirectoryPartition;
 import org.apache.ldap.server.partition.impl.btree.Index;
 import org.apache.ldap.server.partition.impl.btree.IndexRecord;
 import org.apache.ldap.server.partition.impl.btree.SearchEngine;
@@ -110,7 +110,7 @@
     private JMenu indices = new JMenu();
 
     // Non Swing Stuff
-    private BTreeContextPartition partition = null;
+    private BTreeDirectoryPartition partition = null;
     private boolean doCleanUp = false;
     private HashMap nodes = new HashMap();
     private EntryNode root = null;
@@ -120,7 +120,7 @@
     /**
      * Creates new form JFrame
      */
-    public MainFrame( BTreeContextPartition db, SearchEngine eng )
+    public MainFrame( BTreeDirectoryPartition db, SearchEngine eng )
         throws NamingException
     {
         partition = db;
@@ -835,7 +835,7 @@
     }
 
 
-    public void buildIndicesMenu( BTreeContextPartition partition )
+    public void buildIndicesMenu( BTreeDirectoryPartition partition )
     {
         JMenuItem item = null;
         

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/PartitionViewer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/PartitionViewer.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/PartitionViewer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/PartitionViewer.java Fri Oct  7 03:38:21 2005
@@ -22,7 +22,7 @@
 
 import javax.naming.NamingException;
 
-import org.apache.ldap.server.partition.impl.btree.BTreeContextPartition;
+import org.apache.ldap.server.partition.impl.btree.BTreeDirectoryPartition;
 import org.apache.ldap.server.partition.impl.btree.SearchEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,11 +39,11 @@
     private static final Logger log = LoggerFactory.getLogger(PartitionViewer.class);
 
     /** A handle on the atomic partition */
-    private BTreeContextPartition partition;
+    private BTreeDirectoryPartition partition;
     private SearchEngine eng;
 
 
-    public PartitionViewer( BTreeContextPartition db, SearchEngine eng )
+    public PartitionViewer( BTreeDirectoryPartition db, SearchEngine eng )
     {
         this.partition = db;
         this.eng = eng;

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java (from r307049, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmContextPartition.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmContextPartition.java&r1=307049&r2=307079&rev=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmContextPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java Fri Oct  7 03:38:21 2005
@@ -47,10 +47,10 @@
 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.configuration.ContextPartitionConfiguration;
+import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
 import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
-import org.apache.ldap.server.partition.ContextPartition;
-import org.apache.ldap.server.partition.impl.btree.BTreeContextPartition;
+import org.apache.ldap.server.partition.DirectoryPartition;
+import org.apache.ldap.server.partition.impl.btree.BTreeDirectoryPartition;
 import org.apache.ldap.server.partition.impl.btree.Index;
 import org.apache.ldap.server.partition.impl.btree.IndexAssertion;
 import org.apache.ldap.server.partition.impl.btree.IndexAssertionEnumeration;
@@ -61,15 +61,15 @@
 
 
 /**
- * A {@link ContextPartition} that stores entries in
+ * A {@link DirectoryPartition} that stores entries in
  * <a href="http://jdbm.sourceforge.net/">JDBM</a> database.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class JdbmContextPartition extends BTreeContextPartition
+public class JdbmDirectoryPartition extends BTreeDirectoryPartition
 {
-    private static final Logger log = LoggerFactory.getLogger( JdbmContextPartition.class );
+    private static final Logger log = LoggerFactory.getLogger( JdbmDirectoryPartition.class );
 
     /** the JDBM record manager used by this database */
     private RecordManager recMan;
@@ -113,11 +113,11 @@
     /**
      * Creates a store based on JDBM B+Trees.
      */
-    public JdbmContextPartition()
+    public JdbmDirectoryPartition()
     {
     }
 
-    public synchronized void init( ContextFactoryConfiguration factoryCfg, ContextPartitionConfiguration cfg ) throws NamingException
+    public synchronized void init( ContextFactoryConfiguration factoryCfg, DirectoryPartitionConfiguration cfg ) throws NamingException
     {
         this.upSuffix = new LdapName( cfg.getSuffix() );
         this.normSuffix = cfg.getNormalizedSuffix( factoryCfg.getGlobalRegistries().getMatchingRuleRegistry() );
@@ -459,7 +459,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.impl.btree.BTreeContextPartition#getUserIndex(String)
+     * @see org.apache.ldap.server.partition.impl.btree.BTreeDirectoryPartition#getUserIndex(String)
      */
     public Index getUserIndex( String attribute ) throws IndexNotFoundException
     {
@@ -485,7 +485,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 BTreeContextPartition#getEntryId(String)
+     * @see BTreeDirectoryPartition#getEntryId(String)
      */
     public Index getSystemIndex( String indexName ) throws IndexNotFoundException
     {
@@ -775,9 +775,9 @@
         // Start adding the system indices
         // Why bother doing a lookup if this is not an alias.
 
-        if ( entry.get( "objectClass" ).contains( ContextPartition.ALIAS_OBJECT ) )
+        if ( entry.get( "objectClass" ).contains( DirectoryPartition.ALIAS_OBJECT ) )
         {
-            addAliasIndices( id, dn, ( String ) entry.get( ContextPartition.ALIAS_ATTRIBUTE ).get() );
+            addAliasIndices( id, dn, ( String ) entry.get( DirectoryPartition.ALIAS_ATTRIBUTE ).get() );
         }
         
         ndnIdx.add( dn.toString(), id );
@@ -821,7 +821,7 @@
         BigInteger parentId = getParentId( id );
         NamingEnumeration attrs = entry.getIDs();
         
-        if ( entry.get( "objectClass" ).contains( ContextPartition.ALIAS_OBJECT ) )
+        if ( entry.get( "objectClass" ).contains( DirectoryPartition.ALIAS_OBJECT ) )
         {
             dropAliasIndices( id );
         }
@@ -1014,7 +1014,7 @@
             entryAttrToAddTo.add( mods.get( ii ) );
         }
 
-        if ( mods.getID().equals( ContextPartition.ALIAS_ATTRIBUTE ) )
+        if ( mods.getID().equals( DirectoryPartition.ALIAS_ATTRIBUTE ) )
         {
             String ndnStr = ( String ) ndnIdx.reverseLookup( id );
             addAliasIndices( id, new LdapName( ndnStr ), 
@@ -1076,7 +1076,7 @@
         }
 
         // Aliases->single valued comp/partial attr removal is not relevant here
-        if ( mods.getID().equals( ContextPartition.ALIAS_ATTRIBUTE ) )
+        if ( mods.getID().equals( DirectoryPartition.ALIAS_ATTRIBUTE ) )
         {
             dropAliasIndices( id );
         }
@@ -1116,7 +1116,7 @@
             }
         }
 
-        if ( mods.getID().equals( ContextPartition.ALIAS_ATTRIBUTE ) )
+        if ( mods.getID().equals( DirectoryPartition.ALIAS_ATTRIBUTE ) )
         {
             dropAliasIndices( id );
         }
@@ -1124,7 +1124,7 @@
         // Automatically replaces old attributes with new modified ones
         entry.put( mods );
         
-        if ( mods.getID().equals( ContextPartition.ALIAS_ATTRIBUTE ) )
+        if ( mods.getID().equals( DirectoryPartition.ALIAS_ATTRIBUTE ) )
         {
             String ndnStr = ( String ) ndnIdx.reverseLookup( id );
             addAliasIndices( id, new LdapName( ndnStr ), 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java Fri Oct  7 03:38:21 2005
@@ -58,7 +58,7 @@
 import org.apache.ldap.server.interceptor.NextInterceptor;
 import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
 import org.apache.ldap.server.jndi.ServerLdapContext;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,7 +81,7 @@
     /**
      * the root nexus to all database partitions
      */
-    private ContextPartitionNexus nexus;
+    private DirectoryPartitionNexus nexus;
 
     /**
      * a binary attribute tranforming filter: String -> byte[]
@@ -326,14 +326,14 @@
         if ( returnAllOperationalAttributes || set.contains( "creatorsname" ) )
         {
             attr = new LockableAttributeImpl( attrs, "creatorsName" );
-            attr.add( ContextPartitionNexus.ADMIN_PRINCIPAL );
+            attr.add( DirectoryPartitionNexus.ADMIN_PRINCIPAL );
             attrs.put( attr );
         }
 
         if ( returnAllOperationalAttributes || set.contains( "modifiersname" ) )
         {
             attr = new LockableAttributeImpl( attrs, "modifiersName" );
-            attr.add( ContextPartitionNexus.ADMIN_PRINCIPAL );
+            attr.add( DirectoryPartitionNexus.ADMIN_PRINCIPAL );
             attrs.put( attr );
         }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java Fri Oct  7 03:38:21 2005
@@ -24,7 +24,7 @@
 import org.apache.ldap.server.invocation.InvocationStack;
 import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
 import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.partition.ContextPartitionNexus;
+import org.apache.ldap.server.partition.DirectoryPartitionNexus;
 import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
 import org.apache.ldap.common.message.SubentryRequestControl;
 import org.apache.ldap.common.message.ResultCodeEnum;
@@ -114,7 +114,7 @@
     private DnParser dnParser;
     private SubtreeSpecificationParser ssParser;
     private SubtreeEvaluator evaluator;
-    private ContextPartitionNexus nexus;
+    private DirectoryPartitionNexus nexus;
 
 
     public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException

Modified: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/support/MaxImmSubFilterTest.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/support/MaxImmSubFilterTest.java Fri Oct  7 03:38:21 2005
@@ -43,7 +43,7 @@
 import org.apache.ldap.common.aci.ProtectedItem;
 import org.apache.ldap.common.filter.ExprNode;
 import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.configuration.ContextPartitionConfiguration;
+import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
 import org.apache.ldap.server.interceptor.NextInterceptor;
 
 /**
@@ -203,7 +203,7 @@
             return null;
         }
 
-        public void addContextPartition( ContextPartitionConfiguration cfg ) throws NamingException
+        public void addContextPartition( DirectoryPartitionConfiguration cfg ) throws NamingException
         {
         }
 

Copied: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/configuration/DirectoryPartitionConfigurationTest.java (from r307049, directory/apacheds/trunk/core/src/test/org/apache/ldap/server/configuration/ContextPartitionConfigurationTest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/test/org/apache/ldap/server/configuration/DirectoryPartitionConfigurationTest.java?p2=directory/apacheds/trunk/core/src/test/org/apache/ldap/server/configuration/DirectoryPartitionConfigurationTest.java&p1=directory/apacheds/trunk/core/src/test/org/apache/ldap/server/configuration/ContextPartitionConfigurationTest.java&r1=307049&r2=307079&rev=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/org/apache/ldap/server/configuration/ContextPartitionConfigurationTest.java (original)
+++ directory/apacheds/trunk/core/src/test/org/apache/ldap/server/configuration/DirectoryPartitionConfigurationTest.java Fri Oct  7 03:38:21 2005
@@ -29,37 +29,37 @@
 
 import org.apache.ldap.server.AbstractAdminTestCase;
 import org.apache.ldap.server.jndi.CoreContextFactory;
-import org.apache.ldap.server.partition.impl.btree.jdbm.JdbmContextPartition;
+import org.apache.ldap.server.partition.impl.btree.jdbm.JdbmDirectoryPartition;
 
 
 /**
- * Tests {@link AddContextPartitionConfiguration} and
- * {@link RemoveContextPartitionConfiguration} works correctly.
+ * Tests {@link AddDirectoryPartitionConfiguration} and
+ * {@link RemoveDirectoryPartitionConfiguration} works correctly.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ContextPartitionConfigurationTest extends AbstractAdminTestCase
+public class DirectoryPartitionConfigurationTest extends AbstractAdminTestCase
 {
-    public ContextPartitionConfigurationTest()
+    public DirectoryPartitionConfigurationTest()
     {
     }
 
     public void testAddAndRemove() throws Exception
     {
-        MutableContextPartitionConfiguration partitionCfg =
-            new MutableContextPartitionConfiguration();
+        MutableDirectoryPartitionConfiguration partitionCfg =
+            new MutableDirectoryPartitionConfiguration();
         partitionCfg.setName( "removable" );
         partitionCfg.setSuffix( "ou=removable" );
         Attributes ctxEntry = new BasicAttributes( true );
         ctxEntry.put( "objectClass", "top" );
         ctxEntry.put( "ou", "removable" );
         partitionCfg.setContextEntry( ctxEntry );
-        partitionCfg.setContextPartition( new JdbmContextPartition() );
+        partitionCfg.setContextPartition( new JdbmDirectoryPartition() );
         
         // Test AddContextPartition
-        AddContextPartitionConfiguration addCfg =
-            new AddContextPartitionConfiguration( partitionCfg );
+        AddDirectoryPartitionConfiguration addCfg =
+            new AddDirectoryPartitionConfiguration( partitionCfg );
         
         Hashtable env = new Hashtable();
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
@@ -69,8 +69,8 @@
         Assert.assertNotNull( ctx.lookup( "ou=removable" ) );
         
         // Test removeContextPartition
-        RemoveContextPartitionConfiguration removeCfg =
-            new RemoveContextPartitionConfiguration( "ou=removable" );
+        RemoveDirectoryPartitionConfiguration removeCfg =
+            new RemoveDirectoryPartitionConfiguration( "ou=removable" );
         env.putAll( removeCfg.toJndiEnvironment() );
         
         ctx = new InitialContext( env );

Modified: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/MixedCaseTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/MixedCaseTest.java?rev=307079&r1=307078&r2=307079&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/MixedCaseTest.java (original)
+++ directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/MixedCaseTest.java Fri Oct  7 03:38:21 2005
@@ -23,7 +23,7 @@
 import javax.naming.directory.*;
 
 import org.apache.ldap.server.AbstractAdminTestCase;
-import org.apache.ldap.server.configuration.MutableContextPartitionConfiguration;
+import org.apache.ldap.server.configuration.MutableDirectoryPartitionConfiguration;
 import org.apache.ldap.common.exception.LdapNameNotFoundException;
 
 import java.util.HashSet;
@@ -43,7 +43,7 @@
     public void setUp() throws Exception
     {
 
-        MutableContextPartitionConfiguration partition = new MutableContextPartitionConfiguration();
+        MutableDirectoryPartitionConfiguration partition = new MutableDirectoryPartitionConfiguration();
         partition.setName( "apache" );
         partition.setSuffix( suffix );
 



Mime
View raw message