directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject svn commit: rev 43380 - in incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store: db spi spi/index spi/search spi/table
Date Sun, 05 Sep 2004 08:49:40 GMT
Author: niclas
Date: Sun Sep  5 01:49:39 2004
New Revision: 43380

Added:
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/
      - copied from rev 43340, incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/Database.java
  (contents, props changed)
      - copied, changed from rev 43379, incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/Database.java
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/DatabaseEnabled.java
  (contents, props changed)
      - copied, changed from rev 43379, incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/DatabaseEnabled.java
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/IndexNotFoundException.java
  (contents, props changed)
      - copied, changed from rev 43379, incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/IndexNotFoundException.java
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/index/
      - copied from rev 43379, incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/index/
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/
      - copied from rev 43379, incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/
      - copied from rev 43379, incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/table/
Removed:
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/
Modified:
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/index/Index.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/index/IndexComparator.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/index/IndexEnumeration.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/index/IndexRecord.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/ConjunctionEnumerator.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/DbSearchResult.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/DisjunctionEnumeration.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/DisjunctionEnumerator.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/Enumerator.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/EnumeratorDependent.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/Evaluator.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/IndexAssertion.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/IndexAssertionEnumeration.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/LeafEvaluator.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/NegationEnumerator.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/Optimizer.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/ScopeEnumerator.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/ScopeEvaluator.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/SearchEngine.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/SearchResultEnumeration.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/SubstringEnumerator.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/SubstringEvaluator.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/DupsEnumeration.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/KeyOnlyComparator.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/MasterTable.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/NoDupsEnumeration.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/SerializableComparator.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/Table.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/Tuple.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/TupleBrowser.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/TupleComparator.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/TupleEnumeration.java
  (contents, props changed)
   incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/TupleRenderer.java
  (contents, props changed)
Log:
proper package, imports sorted and fixed, svn props corrected.

Copied: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/Database.java
(from rev 43379, incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/Database.java)
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/Database.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/Database.java
Sun Sep  5 01:49:39 2004
@@ -14,22 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* 
- * Copyright 2004 Apache Software Foundation
- * Licensed  under the  Apache License,  Version 2.0  (the "License");
- * you may not use  this file  except in  compliance with the License.
- * You may obtain a copy of the License at 
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
- * implied.
- * 
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 /*
  * $Id: Database.java,v 1.6 2003/10/02 00:26:35 akarasulu Exp $
@@ -39,7 +23,7 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db ;
+package org.apache.ldap.store.spi ;
 
 
 import java.util.Iterator ;
@@ -118,7 +102,7 @@
      *
      * @return the heirarchy Index
      */
-    Index getHeirarchyIndex() ;
+    Index getHierarchyIndex() ;
     
     /**
      * Gets the Index mapping user provided distinguished names of entries as 

Copied: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/DatabaseEnabled.java
(from rev 43379, incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/DatabaseEnabled.java)
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/DatabaseEnabled.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/DatabaseEnabled.java
Sun Sep  5 01:49:39 2004
@@ -24,7 +24,7 @@
  *
  * Created on Oct 9, 2003
  */
-package org.apache.ldap.store.db ;
+package org.apache.ldap.store.spi ;
 
 
 /**

Copied: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/IndexNotFoundException.java
(from rev 43379, incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/IndexNotFoundException.java)
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/IndexNotFoundException.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/IndexNotFoundException.java
Sun Sep  5 01:49:39 2004
@@ -23,7 +23,7 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db ;
+package org.apache.ldap.store.spi ;
 
 
 import javax.naming.NamingException ;

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/index/Index.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/index/Index.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/index/Index.java
Sun Sep  5 01:49:39 2004
@@ -23,7 +23,7 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.index ;
+package org.apache.ldap.store.spi.index ;
 
 
 import java.math.BigInteger ;

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/index/IndexComparator.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/index/IndexComparator.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/index/IndexComparator.java
Sun Sep  5 01:49:39 2004
@@ -23,13 +23,14 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.index ;
+package org.apache.ldap.store.spi.index ;
 
 
 import java.util.Comparator ;
 
 import org.apache.ldap.common.util.BigIntegerComparator;
-import org.apache.ldap.store.db.table.TupleComparator ;
+
+import org.apache.ldap.store.spi.table.TupleComparator ;
 
 
 /**

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/index/IndexEnumeration.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/index/IndexEnumeration.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/index/IndexEnumeration.java
Sun Sep  5 01:49:39 2004
@@ -39,7 +39,7 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.index ;
+package org.apache.ldap.store.spi.index ;
 
 
 import java.util.NoSuchElementException ;
@@ -47,7 +47,7 @@
 import javax.naming.NamingException ;
 import javax.naming.NamingEnumeration ;
 
-import org.apache.ldap.store.db.table.Tuple ;
+import org.apache.ldap.store.spi.table.Tuple ;
 
 import org.apache.regexp.RE ;
 

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/index/IndexRecord.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/index/IndexRecord.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/index/IndexRecord.java
Sun Sep  5 01:49:39 2004
@@ -23,14 +23,14 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.index ;
+package org.apache.ldap.store.spi.index ;
 
 
 import java.math.BigInteger ;
 
 import javax.naming.directory.Attributes ;
 
-import org.apache.ldap.store.db.table.Tuple ;
+import org.apache.ldap.store.spi.table.Tuple ;
 
 
 /**

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/ConjunctionEnumerator.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/ConjunctionEnumerator.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/ConjunctionEnumerator.java
Sun Sep  5 01:49:39 2004
@@ -24,7 +24,7 @@
  *
  * Created on Oct 11, 2003
  */
-package org.apache.ldap.store.db.search ;
+package org.apache.ldap.store.spi.search ;
 
 
 /**

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/DbSearchResult.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/DbSearchResult.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/DbSearchResult.java
Sun Sep  5 01:49:39 2004
@@ -24,8 +24,7 @@
  *
  * Created on Oct 16, 2003
  */
-package org.apache.ldap.store.db.search ;
-
+package org.apache.ldap.store.spi.search ;
 
 import java.math.BigInteger ;
 

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/DisjunctionEnumeration.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/DisjunctionEnumeration.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/DisjunctionEnumeration.java
Sun Sep  5 01:49:39 2004
@@ -23,17 +23,15 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.search ;
+package org.apache.ldap.store.spi.search ;
 
-
-import java.util.Map ;
 import java.util.HashMap ;
 import java.util.NoSuchElementException ;
 
-import javax.naming.NamingException ;
 import javax.naming.NamingEnumeration ;
+import javax.naming.NamingException ;
 
-import org.apache.ldap.store.db.index.IndexRecord ;
+import org.apache.ldap.store.spi.index.IndexRecord ;
 
 
 /**
@@ -52,7 +50,7 @@
     /** The underlying child enumerations */
     private final NamingEnumeration [] m_children ;
     /** LUT used to avoid returning duplicates */
-    private final Map m_candidates = new HashMap() ;
+    private final HashMap m_candidates = new HashMap() ;
     /** Index of current cursor used */
     private int m_index = 0 ;
     /** Candidate to return */

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/DisjunctionEnumerator.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/DisjunctionEnumerator.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/DisjunctionEnumerator.java
Sun Sep  5 01:49:39 2004
@@ -24,7 +24,7 @@
  *
  * Created on Oct 11, 2003
  */
-package org.apache.ldap.store.db.search ;
+package org.apache.ldap.store.spi.search ;
 
 
 /**

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/Enumerator.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/Enumerator.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/Enumerator.java
Sun Sep  5 01:49:39 2004
@@ -24,14 +24,14 @@
  *
  * Created on Oct 10, 2003
  */
-package org.apache.ldap.store.db.search ;
+package org.apache.ldap.store.spi.search ;
 
-
-import javax.naming.NamingException ;
 import javax.naming.NamingEnumeration ;
+import javax.naming.NamingException ;
 
 import org.apache.ldap.common.filter.ExprNode ;
-import org.apache.ldap.store.db.DatabaseEnabled ;
+
+import org.apache.ldap.store.spi.DatabaseEnabled ;
 
 
 /**

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/EnumeratorDependent.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/EnumeratorDependent.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/EnumeratorDependent.java
Sun Sep  5 01:49:39 2004
@@ -24,7 +24,7 @@
  *
  * Created on Oct 13, 2003
  */
-package org.apache.ldap.store.db.search ;
+package org.apache.ldap.store.spi.search ;
 
 /**
  * Cycle dependency workaround due to recusion between Enumerator and its 

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/Evaluator.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/Evaluator.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/Evaluator.java
Sun Sep  5 01:49:39 2004
@@ -24,14 +24,15 @@
  *
  * Created on Oct 9, 2003
  */
-package org.apache.ldap.store.db.search ;
-
+package org.apache.ldap.store.spi.search ;
 
 import javax.naming.NamingException ;
 
 import org.apache.ldap.common.filter.ExprNode ;
-import org.apache.ldap.store.db.DatabaseEnabled ;
-import org.apache.ldap.store.db.index.IndexRecord ;
+
+import org.apache.ldap.store.spi.DatabaseEnabled ;
+
+import org.apache.ldap.store.spi.index.IndexRecord ;
 
 
 /**

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/IndexAssertion.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/IndexAssertion.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/IndexAssertion.java
Sun Sep  5 01:49:39 2004
@@ -24,12 +24,11 @@
  *
  * Created on Oct 14, 2003
  */
-package org.apache.ldap.store.db.search ;
-
+package org.apache.ldap.store.spi.search ;
 
 import javax.naming.NamingException ;
 
-import org.apache.ldap.store.db.index.IndexRecord ;
+import org.apache.ldap.store.spi.index.IndexRecord ;
 
 
 /**

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/IndexAssertionEnumeration.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/IndexAssertionEnumeration.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/IndexAssertionEnumeration.java
Sun Sep  5 01:49:39 2004
@@ -23,17 +23,15 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.search ;
+package org.apache.ldap.store.spi.search ;
 
-
-import java.util.Map ;
 import java.util.HashMap ;
 import java.util.NoSuchElementException ;
 
-import javax.naming.NamingException ;
 import javax.naming.NamingEnumeration ;
+import javax.naming.NamingException ;
 
-import org.apache.ldap.store.db.index.IndexRecord ;
+import org.apache.ldap.store.spi.index.IndexRecord ;
 
 
 /**
@@ -54,7 +52,7 @@
     /** The iteration cursor */
     private final NamingEnumeration m_underlying ;
     /** LUT used to avoid returning duplicates */
-    private final Map m_candidates ;
+    private final HashMap m_candidates ;
     /** */
     private final IndexAssertion m_assertion ;
     /** */

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/LeafEvaluator.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/LeafEvaluator.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/LeafEvaluator.java
Sun Sep  5 01:49:39 2004
@@ -24,7 +24,7 @@
  *
  * Created on Oct 10, 2003
  */
-package org.apache.ldap.store.db.search ;
+package org.apache.ldap.store.spi.search ;
 
 
 /**

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/NegationEnumerator.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/NegationEnumerator.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/NegationEnumerator.java
Sun Sep  5 01:49:39 2004
@@ -24,7 +24,7 @@
  *
  * Created on Oct 11, 2003
  */
-package org.apache.ldap.store.db.search ;
+package org.apache.ldap.store.spi.search ;
 
 
 /**

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/Optimizer.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/Optimizer.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/Optimizer.java
Sun Sep  5 01:49:39 2004
@@ -23,15 +23,15 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.search ;
-
+package org.apache.ldap.store.spi.search ;
 
 import java.math.BigInteger ;
 
 import javax.naming.NamingException ;
 
 import org.apache.ldap.common.filter.ExprNode ;
-import org.apache.ldap.store.db.DatabaseEnabled;
+
+import org.apache.ldap.store.spi.DatabaseEnabled;
 
 
 /**

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/ScopeEnumerator.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/ScopeEnumerator.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/ScopeEnumerator.java
Sun Sep  5 01:49:39 2004
@@ -24,7 +24,7 @@
  *
  * Created on Oct 11, 2003
  */
-package org.apache.ldap.store.db.search ;
+package org.apache.ldap.store.spi.search ;
 
 
 /**

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/ScopeEvaluator.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/ScopeEvaluator.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/ScopeEvaluator.java
Sun Sep  5 01:49:39 2004
@@ -24,7 +24,7 @@
  *
  * Created on Oct 10, 2003
  */
-package org.apache.ldap.store.db.search ;
+package org.apache.ldap.store.spi.search ;
 
 
 /**

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/SearchEngine.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/SearchEngine.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/SearchEngine.java
Sun Sep  5 01:49:39 2004
@@ -23,20 +23,23 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.search ;
+package org.apache.ldap.store.spi.search ;
 
-
-import java.util.Hashtable ;
 import java.math.BigInteger ;
 
+import java.util.Map ;
+
 import javax.naming.Name ;
-import javax.naming.ldap.Control ;
-import javax.naming.NamingException ;
 import javax.naming.NamingEnumeration ;
+import javax.naming.NamingException ;
+
+import javax.naming.ldap.Control ;
+
 import javax.naming.directory.SearchControls ;
 
 import org.apache.ldap.common.filter.ExprNode ;
-import org.apache.ldap.store.db.DatabaseEnabled ;
+
+import org.apache.ldap.store.spi.DatabaseEnabled ;
 
 
 /**
@@ -95,7 +98,7 @@
      */
     NamingEnumeration search( 
         Name a_base,
-        Hashtable a_env,
+        Map a_env,
         ExprNode a_filter,
         Control [] a_reqCtls,
         SearchControls a_searchCtls ) throws NamingException ;

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/SearchResultEnumeration.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/SearchResultEnumeration.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/SearchResultEnumeration.java
Sun Sep  5 01:49:39 2004
@@ -24,17 +24,18 @@
  *
  * Created on Oct 16, 2003
  */
-package org.apache.ldap.store.db.search ;
+package org.apache.ldap.store.spi.search ;
 
-
-import javax.naming.NamingException ;
 import javax.naming.NamingEnumeration ;
+import javax.naming.NamingException ;
+
 import javax.naming.directory.Attribute ;
 import javax.naming.directory.Attributes ;
 
-import org.apache.ldap.store.db.Database ;
-import org.apache.ldap.store.db.DatabaseEnabled ;
-import org.apache.ldap.store.db.index.IndexRecord ;
+import org.apache.ldap.store.spi.Database ;
+import org.apache.ldap.store.spi.DatabaseEnabled ;
+
+import org.apache.ldap.store.spi.index.IndexRecord ;
 
 import org.apache.ldap.common.message.LockableAttributesImpl ;
 

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/SubstringEnumerator.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/SubstringEnumerator.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/SubstringEnumerator.java
Sun Sep  5 01:49:39 2004
@@ -24,7 +24,7 @@
  *
  * Created on Oct 11, 2003
  */
-package org.apache.ldap.store.db.search ;
+package org.apache.ldap.store.spi.search ;
 
 
 /**

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/SubstringEvaluator.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/SubstringEvaluator.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/search/SubstringEvaluator.java
Sun Sep  5 01:49:39 2004
@@ -24,7 +24,7 @@
  *
  * Created on Oct 10, 2003
  */
-package org.apache.ldap.store.db.search;
+package org.apache.ldap.store.spi.search;
 
 /**
  * @todo

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/DupsEnumeration.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/table/DupsEnumeration.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/DupsEnumeration.java
Sun Sep  5 01:49:39 2004
@@ -23,17 +23,16 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.table ;
+package org.apache.ldap.store.spi.table ;
 
-
-import java.util.TreeSet ;
-import java.util.Iterator ;
 import java.util.ArrayList ;
 import java.util.Collections ;
+import java.util.Iterator ;
 import java.util.NoSuchElementException ;
+import java.util.TreeSet ;
 
-import javax.naming.NamingException ;
 import javax.naming.NamingEnumeration ;
+import javax.naming.NamingException ;
 
 
 /**

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/KeyOnlyComparator.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/table/KeyOnlyComparator.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/KeyOnlyComparator.java
Sun Sep  5 01:49:39 2004
@@ -23,12 +23,11 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.table ;
-
+package org.apache.ldap.store.spi.table ;
 
 import java.io.Serializable ;
-import java.util.Comparator;
 
+import java.util.Comparator;
 
 /**
  * A TupleComparator that compares keys only.

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/MasterTable.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/table/MasterTable.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/MasterTable.java
Sun Sep  5 01:49:39 2004
@@ -23,14 +23,13 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.table ;
-
+package org.apache.ldap.store.spi.table ;
 
 import java.math.BigInteger ;
 
 import javax.naming.NamingException ;
-import javax.naming.directory.Attributes ;
 
+import javax.naming.directory.Attributes ;
 
 /**
  * The master table used to store the Attributes of entries.

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/NoDupsEnumeration.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/table/NoDupsEnumeration.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/NoDupsEnumeration.java
Sun Sep  5 01:49:39 2004
@@ -23,14 +23,13 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.table ;
-
-
-import java.util.NoSuchElementException ;
+package org.apache.ldap.store.spi.table ;
 
 import javax.naming.NamingException ;
+
 import javax.naming.NamingEnumeration ;
 
+import java.util.NoSuchElementException ;
 
 /**
  * A simple NamingEnumeration over a TupleBrowser on a table that does not allow

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/SerializableComparator.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/table/SerializableComparator.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/SerializableComparator.java
Sun Sep  5 01:49:39 2004
@@ -23,16 +23,14 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.table ;
-
+package org.apache.ldap.store.spi.table ;
 
 import java.io.IOException ;
-import java.io.Serializable ;
 import java.io.ObjectInputStream ;
 import java.io.ObjectOutputStream ;
+import java.io.Serializable ;
 
 import java.util.Comparator ;
-
 
 /**
  * A Serializable Comparator used to wrap a non-Serializable Comparator.  Uses a

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/Table.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/table/Table.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/Table.java
Sun Sep  5 01:49:39 2004
@@ -23,15 +23,13 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.table ;
+package org.apache.ldap.store.spi.table ;
 
-
-import javax.naming.NamingException ;
 import javax.naming.NamingEnumeration ;
-
+import javax.naming.NamingException ;
 
 /**
- * A backend friendly wrapper around a JDBM BTree that transparent enables
+ * A backend friendly wrapper around a JDBM BTree that transparently enables
  * duplicates when the BTree does not support them.
  * 
  * TODO Need to rewrite the Javadocs in this interface.

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/Tuple.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/table/Tuple.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/Tuple.java
Sun Sep  5 01:49:39 2004
@@ -23,7 +23,7 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.table ;
+package org.apache.ldap.store.spi.table ;
 
 /**
  * A key/value tuple for simple two column Tables.  Implemented to provide 

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/TupleBrowser.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/table/TupleBrowser.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/TupleBrowser.java
Sun Sep  5 01:49:39 2004
@@ -23,11 +23,9 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.table ;
-
+package org.apache.ldap.store.spi.table ;
 
 import javax.naming.NamingException ;
-
 
 /**
  * TupleBrowser interface used to abstract 

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/TupleComparator.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/table/TupleComparator.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/TupleComparator.java
Sun Sep  5 01:49:39 2004
@@ -1,84 +1,82 @@
-/* 
- * Copyright 2004 Apache Software Foundation
- * Licensed  under the  Apache License,  Version 2.0  (the "License");
- * you may not use  this file  except in  compliance with the License.
- * You may obtain a copy of the License at 
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
- * implied.
- * 
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * $Id: TupleComparator.java,v 1.3 2003/09/06 02:51:37 akarasulu Exp $
- *
- * -- (c) LDAPd Group                                                    --
- * -- Please refer to the LICENSE.txt file in the root directory of      --
- * -- any LDAPd project for copyright and distribution information.      --
- *
- */
-package org.apache.ldap.store.db.table ;
-
-
-import java.util.Comparator ;
-
-
-/**
- * Used to compare the sorting order of binary data.
- * 
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.3 $
- */
-public interface TupleComparator
-    extends java.io.Serializable
-{
-    /**
-     * Gets the comparator used to compare keys.  May be null in which
-     * case the compareKey method will throw an UnsupportedOperationException.
-     *
-     * @return the comparator for comparing keys.
-     */
-    Comparator getKeyComparator() ;
-
-
-    /**
-     * Gets the binary comparator used to compare valuess.  May be null in which
-     * case the compareValue method will throw an UnsupportedOperationException.
-     *
-     * @return the binary comparator for comparing values.
-     */
-    Comparator getValueComparator() ;
-
-
-    /**
-     * Compares key Object to determine their sorting order returning a
-     * value = to, < or > than 0.
-     *
-     * @param a_key1 the first key to compare
-     * @param a_key2 the other key to compare to the first
-     * @return 0 if both are equal, a negative value less than 0 if the first
-     * is less than the second, or a postive value if the first is greater than
-     * the second byte array.
-     */
-    int compareKey( Object a_key1, Object a_key2 ) ;
-
-
-    /**
-     * Comparse value Objects to determine their sorting order returning a
-     * value = to, < or > than 0.
-     *
-     * @param a_value1 the first value to compare
-     * @param a_value2 the other value to compare to the first
-     * @return 0 if both are equal, a negative value less than 0 if the first
-     * is less than the second, or a postive value if the first is greater than
-     * the second Object.
-     */
-    int compareValue( Object a_value1, Object a_value2 ) ;
-}
+/* 
+ * Copyright 2004 Apache Software Foundation
+ * Licensed  under the  Apache License,  Version 2.0  (the "License");
+ * you may not use  this file  except in  compliance with the License.
+ * You may obtain a copy of the License at 
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed  under the  License is distributed on an "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+ * implied.
+ * 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * $Id: TupleComparator.java,v 1.3 2003/09/06 02:51:37 akarasulu Exp $
+ *
+ * -- (c) LDAPd Group                                                    --
+ * -- Please refer to the LICENSE.txt file in the root directory of      --
+ * -- any LDAPd project for copyright and distribution information.      --
+ *
+ */
+package org.apache.ldap.store.spi.table ;
+
+import java.util.Comparator ;
+
+/**
+ * Used to compare the sorting order of binary data.
+ * 
+ * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
+ * @author $Author: akarasulu $
+ * @version $Revision: 1.3 $
+ */
+public interface TupleComparator
+    extends java.io.Serializable
+{
+    /**
+     * Gets the comparator used to compare keys.  May be null in which
+     * case the compareKey method will throw an UnsupportedOperationException.
+     *
+     * @return the comparator for comparing keys.
+     */
+    Comparator getKeyComparator() ;
+
+
+    /**
+     * Gets the binary comparator used to compare valuess.  May be null in which
+     * case the compareValue method will throw an UnsupportedOperationException.
+     *
+     * @return the binary comparator for comparing values.
+     */
+    Comparator getValueComparator() ;
+
+
+    /**
+     * Compares key Object to determine their sorting order returning a
+     * value = to, < or > than 0.
+     *
+     * @param a_key1 the first key to compare
+     * @param a_key2 the other key to compare to the first
+     * @return 0 if both are equal, a negative value less than 0 if the first
+     * is less than the second, or a postive value if the first is greater than
+     * the second byte array.
+     */
+    int compareKey( Object a_key1, Object a_key2 ) ;
+
+
+    /**
+     * Comparse value Objects to determine their sorting order returning a
+     * value = to, < or > than 0.
+     *
+     * @param a_value1 the first value to compare
+     * @param a_value2 the other value to compare to the first
+     * @return 0 if both are equal, a negative value less than 0 if the first
+     * is less than the second, or a postive value if the first is greater than
+     * the second Object.
+     */
+    int compareValue( Object a_value1, Object a_value2 ) ;
+}

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/TupleEnumeration.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/table/TupleEnumeration.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/TupleEnumeration.java
Sun Sep  5 01:49:39 2004
@@ -1,126 +1,125 @@
-/* 
- * Copyright 2004 Apache Software Foundation
- * Licensed  under the  Apache License,  Version 2.0  (the "License");
- * you may not use  this file  except in  compliance with the License.
- * You may obtain a copy of the License at 
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
- * implied.
- * 
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * $Id: TupleEnumeration.java,v 1.3 2003/09/06 02:51:37 akarasulu Exp $
- *
- * -- (c) LDAPd Group                                                    --
- * -- Please refer to the LICENSE.txt file in the root directory of      --
- * -- any LDAPd project for copyright and distribution information.      --
- *
- */
-package org.apache.ldap.store.db.table ;
-
-
-import java.util.Iterator ;
-
-import javax.naming.NamingEnumeration ;
-
-
-/**
- * A NamingEnumeration that returns underlying Iterator values for a single key
- * as Tuples.
- * 
- * <p>
- * WARNING: The tuple returned is reused every time for efficiency and populated
- * a over and over again with the new value.  The key never changes.
- * </p>
- * 
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.3 $
- */
-public class TupleEnumeration
-    implements NamingEnumeration
-{
-    /** TODO */
-    private final Object m_key ;
-    /** TODO */
-    private final Iterator m_iterator ;
-    /** TODO */
-    private final Tuple m_tuple = new Tuple() ;
-
-
-    /**
-     * Creates a cursor over an Iterator of single a_key's values
-     * 
-     * @param a_key the keys whose duplicate values are to be returned
-     * @param a_iterator the underlying iterator this cursor uses
-     */
-    public TupleEnumeration( Object a_key, Iterator a_iterator )
-    {
-        m_key = a_key ;
-        m_tuple.setKey( a_key ) ;
-        m_iterator = a_iterator ;
-    }
-
-    
-    /**
-     * Gets the next value as a Tuple.
-     *
-     * @see javax.naming.NamingEnumeration#next()
-     */
-    public Object next()
-    {
-        m_tuple.setKey( m_key ) ;
-        m_tuple.setValue( m_iterator.next() ) ;
-        return m_tuple ;
-    }
-
-
-    /**
-     * Gets the next value as a Tuple.
-     *
-     * @see javax.naming.NamingEnumeration#nextElement()
-     */
-    public Object nextElement()
-    {
-        m_tuple.setKey( m_key ) ;
-        m_tuple.setValue( m_iterator.next() ) ;
-        return m_tuple ;
-    }
-
-
-    /**
-     * Checks if another value is available.
-     *
-     * @see javax.naming.NamingEnumeration#hasMore()
-     */
-    public boolean hasMore()
-    {
-        return m_iterator.hasNext() ;
-    }
-
-
-    /**
-     * Checks if another value is available.
-     *
-     * @see javax.naming.NamingEnumeration#hasMoreElements()
-     */
-    public boolean hasMoreElements()
-    {
-        return m_iterator.hasNext() ;
-    }
-
-
-    /**
-     * @see javax.naming.NamingEnumeration#close()
-     */
-    public void close() 
-    { 
-    }
-}
+/* 
+ * Copyright 2004 Apache Software Foundation
+ * Licensed  under the  Apache License,  Version 2.0  (the "License");
+ * you may not use  this file  except in  compliance with the License.
+ * You may obtain a copy of the License at 
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed  under the  License is distributed on an "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+ * implied.
+ * 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * $Id: TupleEnumeration.java,v 1.3 2003/09/06 02:51:37 akarasulu Exp $
+ *
+ * -- (c) LDAPd Group                                                    --
+ * -- Please refer to the LICENSE.txt file in the root directory of      --
+ * -- any LDAPd project for copyright and distribution information.      --
+ *
+ */
+package org.apache.ldap.store.spi.table ;
+
+import java.util.Iterator ;
+
+import javax.naming.NamingEnumeration ;
+
+
+/**
+ * A NamingEnumeration that returns underlying Iterator values for a single key
+ * as Tuples.
+ * 
+ * <p>
+ * WARNING: The tuple returned is reused every time for efficiency and populated
+ * a over and over again with the new value.  The key never changes.
+ * </p>
+ * 
+ * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
+ * @author $Author: akarasulu $
+ * @version $Revision: 1.3 $
+ */
+public class TupleEnumeration
+    implements NamingEnumeration
+{
+    /** TODO */
+    private final Object m_key ;
+    /** TODO */
+    private final Iterator m_iterator ;
+    /** TODO */
+    private final Tuple m_tuple = new Tuple() ;
+
+
+    /**
+     * Creates a cursor over an Iterator of single a_key's values
+     * 
+     * @param a_key the keys whose duplicate values are to be returned
+     * @param a_iterator the underlying iterator this cursor uses
+     */
+    public TupleEnumeration( Object a_key, Iterator a_iterator )
+    {
+        m_key = a_key ;
+        m_tuple.setKey( a_key ) ;
+        m_iterator = a_iterator ;
+    }
+
+    
+    /**
+     * Gets the next value as a Tuple.
+     *
+     * @see javax.naming.NamingEnumeration#next()
+     */
+    public Object next()
+    {
+        m_tuple.setKey( m_key ) ;
+        m_tuple.setValue( m_iterator.next() ) ;
+        return m_tuple ;
+    }
+
+
+    /**
+     * Gets the next value as a Tuple.
+     *
+     * @see javax.naming.NamingEnumeration#nextElement()
+     */
+    public Object nextElement()
+    {
+        m_tuple.setKey( m_key ) ;
+        m_tuple.setValue( m_iterator.next() ) ;
+        return m_tuple ;
+    }
+
+
+    /**
+     * Checks if another value is available.
+     *
+     * @see javax.naming.NamingEnumeration#hasMore()
+     */
+    public boolean hasMore()
+    {
+        return m_iterator.hasNext() ;
+    }
+
+
+    /**
+     * Checks if another value is available.
+     *
+     * @see javax.naming.NamingEnumeration#hasMoreElements()
+     */
+    public boolean hasMoreElements()
+    {
+        return m_iterator.hasNext() ;
+    }
+
+
+    /**
+     * @see javax.naming.NamingEnumeration#close()
+     */
+    public void close() 
+    { 
+    }
+}

Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/TupleRenderer.java
==============================================================================
--- incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/table/TupleRenderer.java
(original)
+++ incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/spi/table/TupleRenderer.java
Sun Sep  5 01:49:39 2004
@@ -23,7 +23,7 @@
  * -- any LDAPd project for copyright and distribution information.      --
  *
  */
-package org.apache.ldap.store.db.table ;
+package org.apache.ldap.store.spi.table ;
 
 
 /**

Mime
View raw message