directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r124522 - in incubator/directory/server/trunk/core/src/main/java/org/apache: eve eve/db ldap/server/db ldap/server/db/gui ldap/server/db/jdbm ldap/server/jndi ldap/server/jndi/ibs
Date Fri, 07 Jan 2005 15:56:58 GMT
Author: akarasulu
Date: Fri Jan  7 07:56:56 2005
New Revision: 124522

URL: http://svn.apache.org/viewcvs?view=rev&rev=124522
Log:
moving db and sub pkgs to new org.apache.ldap.server pkg
Added:
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/
      - copied from r124518, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Database.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Database.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DbSearchResult.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DefaultOptimizer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultSearchEngine.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DefaultSearchEngine.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DisjunctionEnumeration.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DisjunctionEnumeration.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DupsEnumeration.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DupsEnumeration.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Enumerator.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Enumerator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Evaluator.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Evaluator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEnumerator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEvaluator.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEvaluator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Index.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Index.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertion.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexAssertion.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertionEnumeration.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexAssertionEnumeration.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexComparator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexEnumeration.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexEnumeration.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexNotFoundException.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexNotFoundException.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexRecord.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexRecord.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/KeyOnlyComparator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/LeafEvaluator.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/LeafEvaluator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/MasterTable.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/MasterTable.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/NoDupsEnumeration.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/NoDupsEnumeration.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Optimizer.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Optimizer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ResultFilteringEnumeration.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ResultFilteringEnumeration.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEnumerator.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ScopeEnumerator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEvaluator.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ScopeEvaluator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchEngine.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SearchEngine.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultEnumeration.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SearchResultEnumeration.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultFilter.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SearchResultFilter.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEnumerator.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEnumerator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEvaluator.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEvaluator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Table.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Table.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Tuple.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Tuple.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleBrowser.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleBrowser.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleComparator.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleComparator.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleEnumeration.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleEnumeration.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleRenderer.java
      - copied, changed from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleRenderer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/
      - copied from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/
      - copied from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/package.html
      - copied unchanged from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/package.html
Removed:
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/
Modified:
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/AbstractContextPartition.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/ApplicationPartition.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/BackingStore.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/eve/SystemPartition.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/ASTNode.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryNode.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/PartitionViewer.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmIndex.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTable.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTupleBrowser.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterService.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/LookupFilter.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/OperationalAttributeService.java
   incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/AbstractContextPartition.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/AbstractContextPartition.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/AbstractContextPartition.java&r1=124521&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/AbstractContextPartition.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/AbstractContextPartition.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/AbstractContextPartition.java	Fri Jan  7 07:56:56 2005
@@ -36,10 +36,12 @@
 import org.apache.ldap.common.exception.LdapContextNotEmptyException;
 import org.apache.ldap.common.exception.LdapNameNotFoundException;
 
-import org.apache.eve.db.Database;
-import org.apache.eve.db.SearchEngine;
-import org.apache.eve.db.SearchResultEnumeration;
-import org.apache.eve.db.gui.PartitionViewer;
+import org.apache.ldap.server.db.Database;
+import org.apache.ldap.server.db.SearchEngine;
+import org.apache.ldap.server.db.SearchEngine;
+import org.apache.ldap.server.db.SearchResultEnumeration;
+import org.apache.ldap.server.db.SearchResultEnumeration;
+import org.apache.ldap.server.db.gui.PartitionViewer;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/ApplicationPartition.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/ApplicationPartition.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/ApplicationPartition.java&r1=124521&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/ApplicationPartition.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/ApplicationPartition.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/ApplicationPartition.java	Fri Jan  7 07:56:56 2005
@@ -17,8 +17,9 @@
 package org.apache.eve;
 
 
-import org.apache.eve.db.Database;
-import org.apache.eve.db.SearchEngine;
+import org.apache.ldap.server.db.Database;
+import org.apache.ldap.server.db.SearchEngine;
+import org.apache.ldap.server.db.SearchEngine;
 import org.apache.ldap.common.schema.AttributeType;
 
 import javax.naming.Name ;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/BackingStore.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/BackingStore.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/BackingStore.java&r1=124521&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/BackingStore.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/BackingStore.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/BackingStore.java	Fri Jan  7 07:56:56 2005
@@ -99,7 +99,7 @@
      *
      * @param base the base distinguished/absolute name for the search/listing
      * @return a NamingEnumeration containing objects of type
-     * {@link org.apache.eve.db.DbSearchResult}
+     * {@link org.apache.ldap.server.db.DbSearchResult}
      * @throws NamingException if there are any problems
      */
     NamingEnumeration list( Name base ) throws NamingException;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/eve/SystemPartition.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/eve/SystemPartition.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/SystemPartition.java&r1=124521&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/SystemPartition.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/SystemPartition.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/eve/SystemPartition.java	Fri Jan  7 07:56:56 2005
@@ -27,8 +27,9 @@
 import org.apache.ldap.common.schema.AttributeType;
 import org.apache.ldap.common.message.LockableAttributesImpl ;
 
-import org.apache.eve.db.Database;
-import org.apache.eve.db.SearchEngine;
+import org.apache.ldap.server.db.Database;
+import org.apache.ldap.server.db.SearchEngine;
+import org.apache.ldap.server.db.SearchEngine;
 
 
 /**

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Database.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Database.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Database.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Database.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Database.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Database.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Database.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.util.Iterator;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DbSearchResult.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DbSearchResult.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DbSearchResult.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.math.BigInteger;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DefaultOptimizer.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DefaultOptimizer.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DefaultOptimizer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.util.ArrayList;
@@ -30,6 +30,7 @@
 import org.apache.ldap.common.filter.BranchNode;
 import org.apache.ldap.common.filter.PresenceNode;
 import org.apache.ldap.common.filter.AssertionNode;
+import org.apache.ldap.server.db.Database;
 
 
 /**

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultSearchEngine.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DefaultSearchEngine.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultSearchEngine.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DefaultSearchEngine.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultSearchEngine.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DefaultSearchEngine.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultSearchEngine.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.util.Map;
@@ -31,6 +31,8 @@
 import org.apache.ldap.common.filter.BranchNode;
 import org.apache.ldap.common.filter.AbstractExprNode;
 import org.apache.ldap.common.message.DerefAliasesEnum;
+import org.apache.ldap.server.db.Database;
+import org.apache.ldap.server.db.DefaultOptimizer;
 
 
 /**

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DisjunctionEnumeration.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DisjunctionEnumeration.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DisjunctionEnumeration.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DisjunctionEnumeration.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DisjunctionEnumeration.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DisjunctionEnumeration.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DisjunctionEnumeration.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.util.Map;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DupsEnumeration.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DupsEnumeration.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DupsEnumeration.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DupsEnumeration.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DupsEnumeration.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/DupsEnumeration.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/DupsEnumeration.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.util.TreeSet;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Enumerator.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Enumerator.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Enumerator.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Enumerator.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Enumerator.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Enumerator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Enumerator.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import javax.naming.NamingException;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Evaluator.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Evaluator.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Evaluator.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Evaluator.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Evaluator.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Evaluator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Evaluator.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import javax.naming.NamingException;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEnumerator.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEnumerator.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEnumerator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import javax.naming.NamingException;
@@ -31,6 +31,9 @@
 import org.apache.ldap.common.NotImplementedException;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.db.Database;
+import org.apache.ldap.server.db.DisjunctionEnumeration;
+import org.apache.ldap.server.db.Enumerator;
 
 import java.util.ArrayList;
 import java.math.BigInteger;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEvaluator.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEvaluator.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEvaluator.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEvaluator.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEvaluator.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ExpressionEvaluator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEvaluator.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.util.Iterator;
@@ -27,6 +27,8 @@
 
 import org.apache.ldap.server.schema.OidRegistry;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.db.Database;
+import org.apache.ldap.server.db.Evaluator;
 
 
 /**
@@ -98,7 +100,7 @@
 
 
     /**
-     * @see org.apache.eve.db.Evaluator#evaluate(ExprNode, IndexRecord)
+     * @see org.apache.ldap.server.db.Evaluator#evaluate(ExprNode, IndexRecord)
      */
     public boolean evaluate( ExprNode node, IndexRecord record )
         throws NamingException

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Index.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Index.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Index.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Index.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Index.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Index.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Index.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.math.BigInteger;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertion.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexAssertion.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertion.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexAssertion.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertion.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexAssertion.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertion.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import javax.naming.NamingException;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertionEnumeration.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexAssertionEnumeration.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertionEnumeration.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexAssertionEnumeration.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertionEnumeration.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexAssertionEnumeration.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexAssertionEnumeration.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.util.Map;
@@ -24,6 +24,8 @@
 import javax.naming.NamingException;
 import javax.naming.NamingEnumeration;
 
+import org.apache.ldap.server.db.IndexAssertion;
+
 
 /**
  * A prefetching NamingEnumeration over an underlying NamingEnumeration which 
@@ -83,7 +85,7 @@
      * @throws NamingException TODO
      */
     public IndexAssertionEnumeration( NamingEnumeration underlying,
-        IndexAssertion assertion, boolean enableDupCheck ) 
+        IndexAssertion assertion, boolean enableDupCheck )
         throws NamingException
     {
         this.underlying = underlying;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexComparator.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexComparator.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexComparator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import org.apache.ldap.common.util.BigIntegerComparator;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexEnumeration.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexEnumeration.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexEnumeration.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexEnumeration.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexEnumeration.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexEnumeration.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexEnumeration.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.util.NoSuchElementException;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexNotFoundException.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexNotFoundException.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexNotFoundException.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexNotFoundException.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexNotFoundException.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexNotFoundException.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexNotFoundException.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import javax.naming.NamingException;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexRecord.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexRecord.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexRecord.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexRecord.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexRecord.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/IndexRecord.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/IndexRecord.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.math.BigInteger;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/KeyOnlyComparator.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/KeyOnlyComparator.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/KeyOnlyComparator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.io.Serializable;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/LeafEvaluator.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/LeafEvaluator.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/LeafEvaluator.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/LeafEvaluator.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/LeafEvaluator.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/LeafEvaluator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/LeafEvaluator.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.math.BigInteger;
@@ -39,6 +39,10 @@
 import org.apache.ldap.server.schema.OidRegistry;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
 import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.ldap.server.db.Database;
+import org.apache.ldap.server.db.Evaluator;
+import org.apache.ldap.server.db.Index;
+import org.apache.ldap.server.db.IndexRecord;
 
 
 /**
@@ -102,7 +106,7 @@
 
 
     /**
-     * @see org.apache.eve.db.Evaluator#evaluate(ExprNode, IndexRecord)
+     * @see org.apache.ldap.server.db.Evaluator#evaluate(ExprNode, IndexRecord)
      */
     public boolean evaluate( ExprNode node, IndexRecord record ) throws NamingException
     {
@@ -233,7 +237,7 @@
      * @return the ava evaluation on the perspective candidate
      * @throws NamingException if there is a database access failure
      */
-    private boolean evalPresence( String attrId, IndexRecord rec ) 
+    private boolean evalPresence( String attrId, IndexRecord rec )
         throws NamingException
     {
         if ( db.hasUserIndexOn( attrId ) )

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/MasterTable.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/MasterTable.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/MasterTable.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/MasterTable.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/MasterTable.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/MasterTable.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/MasterTable.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.math.BigInteger;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/NoDupsEnumeration.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/NoDupsEnumeration.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/NoDupsEnumeration.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/NoDupsEnumeration.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/NoDupsEnumeration.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/NoDupsEnumeration.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/NoDupsEnumeration.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.util.NoSuchElementException;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Optimizer.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Optimizer.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Optimizer.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Optimizer.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Optimizer.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Optimizer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Optimizer.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import javax.naming.NamingException;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ResultFilteringEnumeration.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ResultFilteringEnumeration.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ResultFilteringEnumeration.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ResultFilteringEnumeration.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ResultFilteringEnumeration.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ResultFilteringEnumeration.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ResultFilteringEnumeration.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.util.List;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEnumerator.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ScopeEnumerator.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEnumerator.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ScopeEnumerator.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEnumerator.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ScopeEnumerator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEnumerator.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.math.BigInteger;
@@ -26,6 +26,7 @@
 import org.apache.ldap.common.filter.ExprNode;
 import org.apache.ldap.common.filter.ScopeNode;
 import org.apache.ldap.common.util.SingletonEnumeration;
+import org.apache.ldap.server.db.*;
 
 
 /**
@@ -56,7 +57,7 @@
      * @param node the scope node 
      * @return the candidates that are within scope
      * @throws NamingException if any system indices fail
-     * @see Enumerator#enumerate(ExprNode)
+     * @see org.apache.ldap.server.db.Enumerator#enumerate(ExprNode)
      */
     public NamingEnumeration enumerate( ExprNode node ) throws NamingException
     {
@@ -202,7 +203,7 @@
          * Returns true if the candidate with id is a descendant of the base, 
          * false otherwise.
          * 
-         * @see IndexAssertion#assertCandidate(IndexRecord)
+         * @see org.apache.ldap.server.db.IndexAssertion#assertCandidate(IndexRecord)
          */
         public boolean assertCandidate( IndexRecord record ) throws NamingException
         {

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEvaluator.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ScopeEvaluator.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEvaluator.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ScopeEvaluator.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEvaluator.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/ScopeEvaluator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/ScopeEvaluator.java	Fri Jan  7 07:56:56 2005
@@ -212,7 +212,7 @@
  *
  * Created on Oct 9, 2003
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.math.BigInteger;
@@ -223,6 +223,10 @@
 import org.apache.ldap.common.filter.ExprNode;
 import org.apache.ldap.common.filter.ScopeNode;
 import org.apache.ldap.common.message.DerefAliasesEnum;
+import org.apache.ldap.server.db.Database;
+import org.apache.ldap.server.db.Evaluator;
+import org.apache.ldap.server.db.Index;
+import org.apache.ldap.server.db.IndexRecord;
 
 
 /**
@@ -249,7 +253,7 @@
 
 
     /**
-     * @see org.apache.eve.db.Evaluator#evaluate(ExprNode, IndexRecord)
+     * @see org.apache.ldap.server.db.Evaluator#evaluate(ExprNode, org.apache.ldap.server.db.IndexRecord)
      */
     public boolean evaluate( ExprNode node, IndexRecord record )
         throws NamingException

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchEngine.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SearchEngine.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchEngine.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SearchEngine.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchEngine.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SearchEngine.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchEngine.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.util.Map;
@@ -26,6 +26,7 @@
 import javax.naming.directory.SearchControls;
 
 import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.server.db.Optimizer;
 
 
 /**

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultEnumeration.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SearchResultEnumeration.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultEnumeration.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SearchResultEnumeration.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultEnumeration.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SearchResultEnumeration.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultEnumeration.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import javax.naming.NamingException;
@@ -23,6 +23,9 @@
 import javax.naming.directory.Attributes;
 
 import org.apache.ldap.common.message.LockableAttributesImpl;
+import org.apache.ldap.server.db.Database;
+import org.apache.ldap.server.db.DbSearchResult;
+import org.apache.ldap.server.db.IndexRecord;
 
 
 /**

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultFilter.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SearchResultFilter.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultFilter.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SearchResultFilter.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultFilter.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SearchResultFilter.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SearchResultFilter.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import javax.naming.NamingException;
@@ -26,7 +26,7 @@
 /**
  * A filter is used to modify search results while they are being returned from
  * naming enumerations containing DbSearchResults.  These filters are used in
- * conjunction with a {@link ResultFilteringEnumeration}.  Multiple filters can
+ * conjunction with a {@link org.apache.ldap.server.db.ResultFilteringEnumeration}.  Multiple filters can
  * be applied one after the other and hence they are stackable.
  *
  * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEnumerator.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEnumerator.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEnumerator.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEnumerator.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEnumerator.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEnumerator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEnumerator.java	Fri Jan  7 07:56:56 2005
@@ -212,7 +212,7 @@
  *
  * Created on Oct 13, 2003
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import javax.naming.NamingException;
@@ -227,6 +227,7 @@
 import org.apache.ldap.common.schema.AttributeType;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.db.*;
 
 
 /**

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEvaluator.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEvaluator.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEvaluator.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEvaluator.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEvaluator.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/SubstringEvaluator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/SubstringEvaluator.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import javax.naming.NamingException;
@@ -34,6 +34,10 @@
 import org.apache.ldap.server.schema.OidRegistry;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
 import org.apache.ldap.server.schema.OidRegistry;
+import org.apache.ldap.server.db.Database;
+import org.apache.ldap.server.db.Evaluator;
+import org.apache.ldap.server.db.Index;
+import org.apache.ldap.server.db.IndexRecord;
 
 
 /**
@@ -69,7 +73,7 @@
 
 
     /**
-     * @see org.apache.eve.db.Evaluator#evaluate(ExprNode, IndexRecord)
+     * @see org.apache.ldap.server.db.Evaluator#evaluate(ExprNode, IndexRecord)
      */
     public boolean evaluate( ExprNode node, IndexRecord record )
         throws NamingException

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Table.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Table.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Table.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Table.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Table.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Table.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Table.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import javax.naming.NamingException;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Tuple.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Tuple.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Tuple.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Tuple.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Tuple.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/Tuple.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/Tuple.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 /**

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleBrowser.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleBrowser.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleBrowser.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleBrowser.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleBrowser.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleBrowser.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleBrowser.java	Fri Jan  7 07:56:56 2005
@@ -14,10 +14,12 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import javax.naming.NamingException;
+
+import org.apache.ldap.server.db.Tuple;
 
 
 /**

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleComparator.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleComparator.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleComparator.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleComparator.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleComparator.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleComparator.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleComparator.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.io.Serializable;

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleEnumeration.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleEnumeration.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleEnumeration.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleEnumeration.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleEnumeration.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleEnumeration.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleEnumeration.java	Fri Jan  7 07:56:56 2005
@@ -14,12 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 import java.util.Iterator;
 
 import javax.naming.NamingEnumeration;
+
+import org.apache.ldap.server.db.Tuple;
 
 
 /**

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleRenderer.java (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleRenderer.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleRenderer.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleRenderer.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleRenderer.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/TupleRenderer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/TupleRenderer.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db;
+package org.apache.ldap.server.db;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/ASTNode.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/ASTNode.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/ASTNode.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/ASTNode.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/ASTNode.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/ASTNode.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.gui;
+package org.apache.ldap.server.db.gui;
 
 
 import java.util.ArrayList;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/AboutDialog.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/AboutDialog.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.gui;
+package org.apache.ldap.server.db.gui;
 
 
 import java.awt.*;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/AddEntryDialog.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/AddEntryDialog.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.gui;
+package org.apache.ldap.server.db.gui;
 
 
 import java.awt.Frame;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/AnnotatedFilterTreeDialog.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/AnnotatedFilterTreeDialog.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.gui ;
+package org.apache.ldap.server.db.gui ;
 
 
 import javax.swing.JDialog ;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/AttributesTableModel.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/AttributesTableModel.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.gui;
+package org.apache.ldap.server.db.gui;
 
 
 import java.util.ArrayList;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/EntryDialog.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/EntryDialog.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.gui ;
+package org.apache.ldap.server.db.gui ;
 
 
 import java.awt.Frame ;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryNode.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryNode.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/EntryNode.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryNode.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/EntryNode.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryNode.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.gui;
+package org.apache.ldap.server.db.gui;
 
 
 import java.math.BigInteger;
@@ -33,9 +33,10 @@
 
 import org.apache.ldap.common.filter.ExprNode;
 import org.apache.ldap.common.name.LdapName;
-import org.apache.eve.db.Database;
-import org.apache.eve.db.SearchEngine;
-import org.apache.eve.db.IndexRecord;
+import org.apache.ldap.server.db.Database;
+import org.apache.ldap.server.db.SearchEngine;
+import org.apache.ldap.server.db.IndexRecord;
+import org.apache.ldap.server.db.*;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/FilterDialog.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/FilterDialog.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.gui ;
+package org.apache.ldap.server.db.gui ;
 
 
 import javax.swing.JLabel ;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/IndexDialog.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/IndexDialog.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.gui ;
+package org.apache.ldap.server.db.gui ;
 
 
 import java.awt.Frame ;  
@@ -39,10 +39,11 @@
 
 import org.apache.ldap.common.util.StringTools ;
 import org.apache.ldap.common.util.ExceptionUtils;
+import org.apache.ldap.server.db.Index;
 
 import org.apache.regexp.RE ;
-import org.apache.eve.db.Index;
-import org.apache.eve.db.IndexRecord;
+import org.apache.ldap.server.db.Index;
+import org.apache.ldap.server.db.IndexRecord;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/MainFrame.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/MainFrame.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.gui;
+package org.apache.ldap.server.db.gui;
 
 
 import java.io.File;
@@ -74,11 +74,13 @@
 import org.apache.ldap.common.filter.FilterParserImpl;
 import org.apache.ldap.common.message.DerefAliasesEnum;
 import org.apache.ldap.common.message.LockableAttributesImpl;
+import org.apache.ldap.server.db.gui.*;
 
-import org.apache.eve.db.Database;
-import org.apache.eve.db.IndexRecord;
-import org.apache.eve.db.Index;
-import org.apache.eve.db.SearchEngine;
+import org.apache.ldap.server.db.Database;
+import org.apache.ldap.server.db.IndexRecord;
+import org.apache.ldap.server.db.Index;
+import org.apache.ldap.server.db.*;
+import org.apache.ldap.server.db.SearchEngine;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/PartitionViewer.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/PartitionViewer.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/PartitionViewer.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/PartitionViewer.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/PartitionViewer.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/PartitionViewer.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.gui ;
+package org.apache.ldap.server.db.gui ;
 
 
 import java.awt.Toolkit ;
@@ -22,8 +22,10 @@
 
 import javax.naming.NamingException;
 
-import org.apache.eve.db.SearchEngine;
-import org.apache.eve.db.Database;
+import org.apache.ldap.server.db.SearchEngine;
+import org.apache.ldap.server.db.Database;
+import org.apache.ldap.server.db.SearchEngine;
+import org.apache.ldap.server.db.gui.MainFrame;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/SearchResultDialog.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/gui/SearchResultDialog.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.gui ;
+package org.apache.ldap.server.db.gui ;
 
 
 import javax.swing.JDialog ;
@@ -34,6 +34,8 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.ListSelectionModel;
 import java.math.BigInteger;
+
+import org.apache.ldap.server.db.gui.MainFrame;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmDatabase.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmDatabase.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.jdbm;
+package org.apache.ldap.server.db.jdbm;
 
 
 import java.math.BigInteger;
@@ -47,6 +47,7 @@
 import org.apache.ldap.common.schema.Normalizer;
 import org.apache.ldap.common.util.NamespaceTools;
 import org.apache.ldap.common.message.LockableAttributesImpl;
+import org.apache.ldap.server.db.*;
 
 import org.apache.eve.db.*;
 
@@ -171,7 +172,7 @@
 
     
     /**
-     * @see Database#getHeirarchyIndex()
+     * @see org.apache.ldap.server.db.Database#getHeirarchyIndex()
      */
     public Index getHeirarchyIndex() 
     {
@@ -230,7 +231,7 @@
 
 
     /**
-     * @see Database#setOneAliasIndexOn(AttributeType)
+     * @see org.apache.ldap.server.db.Database#setOneAliasIndexOn(AttributeType)
      */
     public void setOneAliasIndexOn( AttributeType attrType ) throws NamingException
     {
@@ -255,7 +256,7 @@
 
 
     /**
-     * @see Database#setSubAliasIndexOn(AttributeType)
+     * @see org.apache.ldap.server.db.Database#setSubAliasIndexOn(AttributeType)
      */
     public void setSubAliasIndexOn( AttributeType attrType ) throws NamingException
     {
@@ -280,7 +281,7 @@
 
 
     /**
-     * @see Database#setUpdnIndexOn(AttributeType)
+     * @see org.apache.ldap.server.db.Database#setUpdnIndexOn(AttributeType)
      */
     public void setUpdnIndexOn( AttributeType attrType ) throws NamingException
     {
@@ -296,7 +297,7 @@
 
     
     /**
-     * @see Database#getNdnIndex()
+     * @see org.apache.ldap.server.db.Database#getNdnIndex()
      */
     public Index getNdnIndex() 
     {
@@ -305,7 +306,7 @@
     
 
     /**
-     * @see Database#setNdnIndexOn(AttributeType)
+     * @see org.apache.ldap.server.db.Database#setNdnIndexOn(AttributeType)
      */
     public void setNdnIndexOn( AttributeType attrType ) throws NamingException
     {
@@ -321,7 +322,7 @@
 
     
     /**
-     * @see Database#getUserIndices()
+     * @see org.apache.ldap.server.db.Database#getUserIndices()
      */
     public Iterator getUserIndices()
     {
@@ -339,7 +340,7 @@
 
 
     /**
-     * @see Database#hasUserIndexOn(String)
+     * @see org.apache.ldap.server.db.Database#hasUserIndexOn(String)
      */
     public boolean hasUserIndexOn( String attribute )
     {
@@ -349,7 +350,7 @@
 
 
     /**
-     * @see Database#hasSystemIndexOn(String)
+     * @see org.apache.ldap.server.db.Database#hasSystemIndexOn(String)
      */
     public boolean hasSystemIndexOn( String attribute )
     {
@@ -362,7 +363,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#getUserIndex(String)
+     * @see org.apache.ldap.server.db.Database#getUserIndex(String)
      */
     public Index getUserIndex( String attribute ) throws IndexNotFoundException
     {
@@ -411,7 +412,7 @@
 
 
     /**
-     * @see Database#getEntryId(String)
+     * @see org.apache.ldap.server.db.Database#getEntryId(String)
      */
     public BigInteger getEntryId( String dn ) throws NamingException
     {
@@ -420,7 +421,7 @@
 
 
     /**
-     * @see Database#getEntryDn(java.math.BigInteger)
+     * @see org.apache.ldap.server.db.Database#getEntryDn(java.math.BigInteger)
      */
     public String getEntryDn( BigInteger id ) throws NamingException
     {
@@ -448,7 +449,7 @@
     
     
     /**
-     * @see Database#getEntryUpdn(BigInteger)
+     * @see org.apache.ldap.server.db.Database#getEntryUpdn(BigInteger)
      */
     public String getEntryUpdn( BigInteger id ) throws NamingException
     {
@@ -457,7 +458,7 @@
 
 
     /**
-     * @see Database#getEntryUpdn(String)
+     * @see org.apache.ldap.server.db.Database#getEntryUpdn(String)
      */
     public String getEntryUpdn( String dn ) throws NamingException
     {
@@ -467,7 +468,7 @@
 
 
     /**
-     * @see Database#count()
+     * @see org.apache.ldap.server.db.Database#count()
      */
     public int count() throws NamingException
     {
@@ -737,7 +738,7 @@
 
 
     /**
-     * @see Database#delete(BigInteger)
+     * @see org.apache.ldap.server.db.Database#delete(BigInteger)
      */
     public void delete( BigInteger id ) throws  NamingException
     {
@@ -792,7 +793,7 @@
 
 
     /**
-     * @see Database#getChildCount(java.math.BigInteger)
+     * @see org.apache.ldap.server.db.Database#getChildCount(java.math.BigInteger)
      */
     public int getChildCount( BigInteger id ) throws NamingException
     {
@@ -801,7 +802,7 @@
 
 
     /**
-     * @see Database#getSuffix()
+     * @see org.apache.ldap.server.db.Database#getSuffix()
      */
     public Name getSuffix()
     {
@@ -810,7 +811,7 @@
 
 
     /**
-     * @see Database#getSuffixEntry()
+     * @see org.apache.ldap.server.db.Database#getSuffixEntry()
      */
     public Attributes getSuffixEntry() throws NamingException
     {
@@ -826,7 +827,7 @@
 
 
     /**
-     * @see Database#sync()
+     * @see org.apache.ldap.server.db.Database#sync()
      */
     public void sync() throws NamingException
     {
@@ -889,7 +890,7 @@
 
 
     /**
-     * @see Database#close()
+     * @see org.apache.ldap.server.db.Database#close()
      */
     public synchronized void close() throws NamingException
     {
@@ -998,7 +999,7 @@
 
 
     /**
-     * @see Database#isClosed()
+     * @see org.apache.ldap.server.db.Database#isClosed()
      */
     public boolean isClosed()
     {
@@ -1007,7 +1008,7 @@
 
 
     /**
-     * @see Database#setProperty(String, String)
+     * @see org.apache.ldap.server.db.Database#setProperty(String, String)
      */
     public void setProperty( String propertyName, String propertyValue )
         throws NamingException
@@ -1017,7 +1018,7 @@
 
 
     /**
-     * @see Database#getProperty(String)
+     * @see org.apache.ldap.server.db.Database#getProperty(String)
      */
     public String getProperty( String propertyName ) throws NamingException
     {
@@ -1226,7 +1227,7 @@
 
 
     /**
-     * @see Database#modify(javax.naming.Name, int,
+     * @see org.apache.ldap.server.db.Database#modify(javax.naming.Name, int,
      * javax.naming.directory.Attributes)
      */
     public void modify( Name dn, int modOp, Attributes mods ) throws NamingException
@@ -1329,7 +1330,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 Database#modifyRdn(javax.naming.Name,
+     * @see org.apache.ldap.server.db.Database#modifyRdn(javax.naming.Name,
      * String, boolean)
      */
     public void modifyRdn( Name dn, String newRdn, boolean deleteOldRdn )
@@ -1493,7 +1494,7 @@
 
 
     /**
-     * @see Database#move(javax.naming.Name,
+     * @see org.apache.ldap.server.db.Database#move(javax.naming.Name,
      * javax.naming.Name, String, boolean)
      */
     public void move( Name oldChildDn, Name newParentDn, String newRdn,
@@ -1591,7 +1592,7 @@
             dropAliasIndices( movedBaseId, movedBase );
         }
         
-        NamingEnumeration aliases = new IndexAssertionEnumeration( 
+        NamingEnumeration aliases = new IndexAssertionEnumeration(
             aliasIdx.listIndices( movedBase.toString(), true ), 
             isBaseDescendant );
         while ( aliases.hasMore() )

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmIndex.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmIndex.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmIndex.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmIndex.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmIndex.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmIndex.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.jdbm;
+package org.apache.ldap.server.db.jdbm;
 
 
 import java.io.File;
@@ -28,9 +28,11 @@
 import javax.naming.directory.Attributes;
 
 import org.apache.regexp.RE;
-import org.apache.eve.db.Index;
-import org.apache.eve.db.IndexComparator;
-import org.apache.eve.db.IndexEnumeration;
+import org.apache.ldap.server.db.Index;
+import org.apache.ldap.server.db.IndexComparator;
+import org.apache.ldap.server.db.IndexComparator;
+import org.apache.ldap.server.db.IndexEnumeration;
+import org.apache.ldap.server.db.IndexEnumeration;
 import org.apache.ldap.server.schema.SerializableComparator;
 import org.apache.ldap.common.util.LRUMap;
 import org.apache.ldap.common.schema.AttributeType;
@@ -160,7 +162,7 @@
 
 
     /**
-     * @see Index#getAttribute()
+     * @see org.apache.ldap.server.db.Index#getAttribute()
      */
     public AttributeType getAttribute()
     {
@@ -194,7 +196,7 @@
 
 
     /**
-     * @see Index#count(java.lang.Object, boolean)
+     * @see org.apache.ldap.server.db.Index#count(java.lang.Object, boolean)
      */
     public int count( Object attrVal, boolean isGreaterThan )
         throws NamingException
@@ -234,7 +236,7 @@
 
 
     /**
-     * @see Index#add(java.lang.Object,
+     * @see org.apache.ldap.server.db.Index#add(java.lang.Object,
      * java.math.BigInteger)
      */
     public synchronized void add( Object attrVal, BigInteger id )
@@ -246,7 +248,7 @@
 
 
     /**
-     * @see Index#add(
+     * @see org.apache.ldap.server.db.Index#add(
      * javax.naming.directory.Attribute, java.math.BigInteger)
      */
     public synchronized void add( Attribute attr, BigInteger id ) 
@@ -277,7 +279,7 @@
 
 
     /**
-     * @see Index#drop(java.lang.Object,
+     * @see org.apache.ldap.server.db.Index#drop(java.lang.Object,
      * java.math.BigInteger)
      */
     public synchronized void drop( Object attrVal, BigInteger id )
@@ -334,7 +336,7 @@
         
     
     /**
-     * @see Index#drop(
+     * @see org.apache.ldap.server.db.Index#drop(
      * javax.naming.directory.Attributes, java.math.BigInteger)
      */
     public void drop( Attributes attrs, BigInteger id )
@@ -370,7 +372,7 @@
 
 
     /**
-     * @see Index#listIndices(java.lang.Object)
+     * @see org.apache.ldap.server.db.Index#listIndices(java.lang.Object)
      */
     public IndexEnumeration listIndices( Object attrVal ) 
         throws NamingException
@@ -381,7 +383,7 @@
 
 
     /**
-     * @see Index#listIndices(java.lang.Object,
+     * @see org.apache.ldap.server.db.Index#listIndices(java.lang.Object,
      * boolean)
      */
     public IndexEnumeration listIndices( Object attrVal, 

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmMasterTable.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmMasterTable.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.jdbm;
+package org.apache.ldap.server.db.jdbm;
 
 
 import java.math.BigInteger;
@@ -26,7 +26,7 @@
 
 import org.apache.ldap.common.util.BigIntegerComparator;
 import org.apache.ldap.server.schema.SerializableComparator;
-import org.apache.eve.db.MasterTable;
+import org.apache.ldap.server.db.MasterTable;
 import org.apache.ldap.server.schema.SerializableComparator;
 
 

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTable.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTable.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmTable.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTable.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmTable.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTable.java	Fri Jan  7 07:56:56 2005
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.jdbm;
+package org.apache.ldap.server.db.jdbm;
 
 
 import java.util.TreeSet;
@@ -38,6 +38,7 @@
 
 import org.apache.eve.db.*;
 import org.apache.ldap.server.schema.SerializableComparator;
+import org.apache.ldap.server.db.*;
 
 
 /**
@@ -159,7 +160,7 @@
 
 
     /**
-     * @see Table#getComparator()
+     * @see org.apache.ldap.server.db.Table#getComparator()
      */
     public TupleComparator getComparator()
     {
@@ -168,7 +169,7 @@
 
 
     /**
-     * @see Table#isDupsEnabled()
+     * @see org.apache.ldap.server.db.Table#isDupsEnabled()
      */
     public boolean isDupsEnabled()
     {
@@ -177,7 +178,7 @@
 
 
     /**
-     * @see Table#getName()
+     * @see org.apache.ldap.server.db.Table#getName()
      */
     public String getName()
     {
@@ -186,7 +187,7 @@
 
 
     /**
-     * @see Table#getRenderer()
+     * @see org.apache.ldap.server.db.Table#getRenderer()
      */
     public TupleRenderer getRenderer()
     {
@@ -260,7 +261,7 @@
 
 
     /**
-     * @see Table#count()
+     * @see org.apache.ldap.server.db.Table#count()
      */
     public int count()
         throws NamingException
@@ -458,7 +459,7 @@
 
 
     /**
-     * @see Table#has(java.lang.Object,
+     * @see org.apache.ldap.server.db.Table#has(java.lang.Object,
      * java.lang.Object)
      */
     public boolean has( Object key, Object value )
@@ -498,7 +499,7 @@
 
 
     /**
-     * @see Table#put(java.lang.Object,
+     * @see org.apache.ldap.server.db.Table#put(java.lang.Object,
      * java.lang.Object)
      */
     public Object put( Object key, Object value )
@@ -800,7 +801,7 @@
 
 
     /**
-     * @see Table#listTuples()
+     * @see org.apache.ldap.server.db.Table#listTuples()
      */
     public NamingEnumeration listTuples()
         throws NamingException
@@ -829,7 +830,7 @@
 
 
     /**
-     * @see Table#listTuples(java.lang.Object)
+     * @see org.apache.ldap.server.db.Table#listTuples(java.lang.Object)
      */
     public NamingEnumeration listTuples( Object key )
         throws NamingException
@@ -929,7 +930,7 @@
     
 
     /**
-     * @see Table#listTuples(java.lang.Object,
+     * @see org.apache.ldap.server.db.Table#listTuples(java.lang.Object,
      * java.lang.Object, boolean)
      */
     public NamingEnumeration listTuples( Object key, Object val, 

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTupleBrowser.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTupleBrowser.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmTupleBrowser.java&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTupleBrowser.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/jdbm/JdbmTupleBrowser.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmTupleBrowser.java	Fri Jan  7 07:56:56 2005
@@ -14,11 +14,13 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.db.jdbm;
+package org.apache.ldap.server.db.jdbm;
 
 
-import org.apache.eve.db.Tuple;
-import org.apache.eve.db.TupleBrowser;
+import org.apache.ldap.server.db.Tuple;
+import org.apache.ldap.server.db.TupleBrowser;
+import org.apache.ldap.server.db.Tuple;
+import org.apache.ldap.server.db.TupleBrowser;
 
 import java.io.IOException;
 
@@ -51,7 +53,7 @@
     
     
     /**
-     * @see TupleBrowser#getNext(Tuple)
+     * @see TupleBrowser#getNext(org.apache.ldap.server.db.Tuple)
      */
     public boolean getNext( Tuple tuple ) throws NamingException
     {

Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/package.html (from r124520, incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/package.html)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/package.html?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/eve/db/package.html&r1=124520&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/package.html&r2=124522
==============================================================================

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java&r1=124521&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java	Fri Jan  7 07:56:56 2005
@@ -53,10 +53,12 @@
 import org.apache.eve.ContextPartitionConfig;
 import org.apache.eve.protocol.LdapProtocolProvider;
 import org.apache.eve.db.*;
-import org.apache.eve.db.jdbm.JdbmDatabase;
+import org.apache.ldap.server.db.jdbm.JdbmDatabase;
 import org.apache.ldap.server.schema.bootstrap.BootstrapSchemaLoader;
 import org.apache.ldap.server.schema.*;
 import org.apache.ldap.server.jndi.ibs.*;
+import org.apache.ldap.server.db.jdbm.JdbmDatabase;
+import org.apache.ldap.server.db.*;
 import org.apache.seda.DefaultFrontend;
 import org.apache.seda.DefaultFrontendFactory;
 import org.apache.seda.listener.TCPListenerConfig;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java&r1=124521&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java	Fri Jan  7 07:56:56 2005
@@ -26,7 +26,7 @@
 import javax.naming.directory.SearchResult;
 
 import org.apache.eve.SystemPartition;
-import org.apache.eve.db.SearchResultFilter;
+import org.apache.ldap.server.db.SearchResultFilter;
 import org.apache.ldap.common.exception.LdapNoPermissionException;
 import org.apache.ldap.common.name.NameComponentNormalizer;
 import org.apache.ldap.common.name.DnParser;
@@ -34,6 +34,7 @@
 import org.apache.ldap.server.jndi.EveContext;
 import org.apache.ldap.server.jndi.BaseInterceptor;
 import org.apache.ldap.server.jndi.Invocation;
+import org.apache.ldap.server.db.SearchResultFilter;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterService.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterService.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterService.java&r1=124521&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterService.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterService.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterService.java	Fri Jan  7 07:56:56 2005
@@ -17,7 +17,8 @@
 package org.apache.ldap.server.jndi.ibs;
 
 
-import org.apache.eve.db.SearchResultFilter;
+import org.apache.ldap.server.db.SearchResultFilter;
+import org.apache.ldap.server.db.SearchResultFilter;
 
 
 /**

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java&r1=124521&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java	Fri Jan  7 07:56:56 2005
@@ -27,8 +27,9 @@
 import javax.naming.ldap.LdapContext;
 import javax.naming.directory.*;
 
-import org.apache.eve.db.SearchResultFilter;
-import org.apache.eve.db.ResultFilteringEnumeration;
+import org.apache.ldap.server.db.SearchResultFilter;
+import org.apache.ldap.server.db.ResultFilteringEnumeration;
+import org.apache.ldap.server.db.SearchResultFilter;
 import org.apache.ldap.server.jndi.Invocation;
 import org.apache.ldap.server.jndi.BaseInterceptor;
 import org.apache.ldap.server.jndi.InvocationStateEnum;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/LookupFilter.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/LookupFilter.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/LookupFilter.java&r1=124521&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/LookupFilter.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/LookupFilter.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/LookupFilter.java	Fri Jan  7 07:56:56 2005
@@ -26,7 +26,7 @@
 /**
  * A simple filter for modifying Attributes as they are returned to the caller
  * following a lookup operation.  For filtering search results see
- * {@link org.apache.eve.db.SearchResultFilter}s.  These filters unlike ResultFilters
+ * {@link org.apache.ldap.server.db.SearchResultFilter}s.  These filters unlike ResultFilters
  * cannot stop an entry from being returned unless they throw exceptions like
  * {@link javax.naming.NameNotFoundException}.  That is why the method is named
  * <code>filter()</code> instead of <code>accept()</code>.  This is also why

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/OperationalAttributeService.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/OperationalAttributeService.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/OperationalAttributeService.java&r1=124521&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/OperationalAttributeService.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/OperationalAttributeService.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/OperationalAttributeService.java	Fri Jan  7 07:56:56 2005
@@ -24,12 +24,13 @@
 import javax.naming.directory.*;
 
 import org.apache.eve.RootNexus;
-import org.apache.eve.db.SearchResultFilter;
+import org.apache.ldap.server.db.SearchResultFilter;
 import org.apache.ldap.server.jndi.Invocation;
 import org.apache.ldap.server.jndi.BaseInterceptor;
 import org.apache.ldap.server.jndi.InvocationStateEnum;
 import org.apache.ldap.server.schema.GlobalRegistries;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.db.SearchResultFilter;
 
 import org.apache.ldap.common.util.DateUtils;
 import org.apache.ldap.common.schema.AttributeType;

Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java?view=diff&rev=124522&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java&r1=124521&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java&r2=124522
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java	(original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java	Fri Jan  7 07:56:56 2005
@@ -31,9 +31,10 @@
 import org.apache.ldap.server.jndi.Invocation;
 import org.apache.ldap.server.jndi.InvocationStateEnum;
 import org.apache.eve.RootNexus;
-import org.apache.eve.db.SearchResultFilter;
+import org.apache.ldap.server.db.SearchResultFilter;
 import org.apache.ldap.server.schema.GlobalRegistries;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.db.SearchResultFilter;
 
 import org.apache.ldap.common.schema.*;
 import org.apache.ldap.common.message.LockableAttributeImpl;

Mime
View raw message