Return-Path: Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org Received: (qmail 91163 invoked from network); 4 Sep 2004 17:54:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 4 Sep 2004 17:54:57 -0000 Received: (qmail 9554 invoked by uid 500); 4 Sep 2004 17:54:57 -0000 Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org Received: (qmail 9511 invoked by uid 500); 4 Sep 2004 17:54:57 -0000 Mailing-List: contact directory-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk Reply-To: directory-dev@incubator.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list directory-cvs@incubator.apache.org Delivered-To: moderator for directory-cvs@incubator.apache.org Received: (qmail 21479 invoked by uid 99); 4 Sep 2004 15:56:46 -0000 X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Date: 4 Sep 2004 15:56:44 -0000 Message-ID: <20040904155644.66908.qmail@minotaur.apache.org> From: niclas@apache.org To: directory-cvs@incubator.apache.org Subject: svn commit: rev 43343 - in incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db: index search table X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: niclas Date: Sat Sep 4 08:56:44 2004 New Revision: 43343 Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/index/IndexComparator.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/index/IndexEnumeration.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/index/IndexRecord.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/ConjunctionEnumerator.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/DisjunctionEnumeration.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/DisjunctionEnumerator.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/Enumerator.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/Evaluator.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/IndexAssertion.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/IndexAssertionEnumeration.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/LeafEvaluator.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/NegationEnumerator.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/Optimizer.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/ScopeEnumerator.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/ScopeEvaluator.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/SearchEngine.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/SearchResultEnumeration.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/SubstringEnumerator.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/search/SubstringEvaluator.java incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/table/SerializableComparator.java Log: removed the Avalon ROLE and changed the necessary import statements. Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/index/IndexComparator.java Sat Sep 4 08:56:44 2004 @@ -29,7 +29,7 @@ import java.util.Comparator ; import org.apache.ldap.common.util.BigIntegerComparator; -import org.apache.ldap.server.backend.db.table.TupleComparator ; +import org.apache.ldap.store.db.table.TupleComparator ; /** Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/index/IndexEnumeration.java Sat Sep 4 08:56:44 2004 @@ -47,7 +47,7 @@ import javax.naming.NamingException ; import javax.naming.NamingEnumeration ; -import org.apache.ldap.server.backend.db.table.Tuple ; +import org.apache.ldap.store.db.table.Tuple ; import org.apache.regexp.RE ; Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/index/IndexRecord.java Sat Sep 4 08:56:44 2004 @@ -30,7 +30,7 @@ import javax.naming.directory.Attributes ; -import org.apache.ldap.server.backend.db.table.Tuple ; +import org.apache.ldap.store.db.table.Tuple ; /** Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/search/ConjunctionEnumerator.java Sat Sep 4 08:56:44 2004 @@ -37,6 +37,4 @@ */ public interface ConjunctionEnumerator extends Enumerator { - /** Avalon Service Role */ - String ROLE = ConjunctionEnumerator.class.getName() ; } Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/search/DisjunctionEnumeration.java Sat Sep 4 08:56:44 2004 @@ -33,7 +33,7 @@ import javax.naming.NamingException ; import javax.naming.NamingEnumeration ; -import org.apache.ldap.server.backend.db.index.IndexRecord ; +import org.apache.ldap.store.db.index.IndexRecord ; /** Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/search/DisjunctionEnumerator.java Sat Sep 4 08:56:44 2004 @@ -37,6 +37,4 @@ */ public interface DisjunctionEnumerator extends Enumerator { - /** Avalon Service Role */ - String ROLE = DisjunctionEnumerator.class.getName() ; } Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/search/Enumerator.java Sat Sep 4 08:56:44 2004 @@ -31,7 +31,7 @@ import javax.naming.NamingEnumeration ; import org.apache.ldap.common.filter.ExprNode ; -import org.apache.ldap.server.backend.db.DatabaseEnabled ; +import org.apache.ldap.store.db.DatabaseEnabled ; /** @@ -43,9 +43,6 @@ */ public interface Enumerator extends DatabaseEnabled { - /** Avalon Service Role */ - String ROLE = Enumerator.ROLE ; - /** * Creates an enumeration to enumerate through the set of candidates * satisfying a filter expression. Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/search/Evaluator.java Sat Sep 4 08:56:44 2004 @@ -30,8 +30,8 @@ import javax.naming.NamingException ; import org.apache.ldap.common.filter.ExprNode ; -import org.apache.ldap.server.backend.db.DatabaseEnabled ; -import org.apache.ldap.server.backend.db.index.IndexRecord ; +import org.apache.ldap.store.db.DatabaseEnabled ; +import org.apache.ldap.store.db.index.IndexRecord ; /** @@ -45,9 +45,6 @@ */ public interface Evaluator extends DatabaseEnabled { - /** Avalon Service Role */ - String ROLE = Evaluator.class.getName() ; - /** * Evaluates a candidate to determine if a filter expression selects it. * Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/search/IndexAssertion.java Sat Sep 4 08:56:44 2004 @@ -29,7 +29,7 @@ import javax.naming.NamingException ; -import org.apache.ldap.server.backend.db.index.IndexRecord ; +import org.apache.ldap.store.db.index.IndexRecord ; /** Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/search/IndexAssertionEnumeration.java Sat Sep 4 08:56:44 2004 @@ -33,7 +33,7 @@ import javax.naming.NamingException ; import javax.naming.NamingEnumeration ; -import org.apache.ldap.server.backend.db.index.IndexRecord ; +import org.apache.ldap.store.db.index.IndexRecord ; /** Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/search/LeafEvaluator.java Sat Sep 4 08:56:44 2004 @@ -36,6 +36,4 @@ */ public interface LeafEvaluator extends Evaluator { - /** Avalon ROLE */ - String ROLE = LeafEvaluator.ROLE ; } Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/search/NegationEnumerator.java Sat Sep 4 08:56:44 2004 @@ -37,6 +37,4 @@ */ public interface NegationEnumerator extends Enumerator { - /** Avalon Service Role */ - String ROLE = NegationEnumerator.class.getName() ; } Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/search/Optimizer.java Sat Sep 4 08:56:44 2004 @@ -31,7 +31,7 @@ import javax.naming.NamingException ; import org.apache.ldap.common.filter.ExprNode ; -import org.apache.ldap.server.backend.db.DatabaseEnabled; +import org.apache.ldap.store.db.DatabaseEnabled; /** Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/search/ScopeEnumerator.java Sat Sep 4 08:56:44 2004 @@ -36,6 +36,4 @@ */ public interface ScopeEnumerator extends Enumerator { - /** Avalon Service Role */ - String ROLE = ScopeEnumerator.class.getName() ; } Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/search/ScopeEvaluator.java Sat Sep 4 08:56:44 2004 @@ -36,6 +36,4 @@ */ public interface ScopeEvaluator extends Evaluator { - /** Avalon Service Role */ - String ROLE = ScopeEvaluator.ROLE ; } Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/search/SearchEngine.java Sat Sep 4 08:56:44 2004 @@ -36,7 +36,7 @@ import javax.naming.directory.SearchControls ; import org.apache.ldap.common.filter.ExprNode ; -import org.apache.ldap.server.backend.db.DatabaseEnabled ; +import org.apache.ldap.store.db.DatabaseEnabled ; /** @@ -49,9 +49,6 @@ */ public interface SearchEngine extends DatabaseEnabled { - /** Avalon service role */ - String ROLE = SearchEngine.class.getName() ; - /** * @todo put this in the right place * The alias dereferencing mode key for JNDI providers Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/search/SearchResultEnumeration.java Sat Sep 4 08:56:44 2004 @@ -32,9 +32,10 @@ import javax.naming.directory.Attribute ; import javax.naming.directory.Attributes ; -import org.apache.ldap.server.backend.db.Database ; -import org.apache.ldap.server.backend.db.DatabaseEnabled ; -import org.apache.ldap.server.backend.db.index.IndexRecord ; +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.common.message.LockableAttributesImpl ; Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/search/SubstringEnumerator.java Sat Sep 4 08:56:44 2004 @@ -37,6 +37,4 @@ */ public interface SubstringEnumerator extends Enumerator { - /** Avalon Service Role */ - String ROLE = SubstringEnumerator.class.getName() ; } Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/search/SubstringEvaluator.java Sat Sep 4 08:56:44 2004 @@ -34,6 +34,4 @@ */ public interface SubstringEvaluator extends Evaluator { - /** Avalon Service Role */ - String ROLE = SubstringEvaluator.class.getName() ; } Modified: incubator/directory/sandbox/trunk/store/spi/src/java/org/apache/ldap/store/db/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/db/table/SerializableComparator.java Sat Sep 4 08:56:44 2004 @@ -45,7 +45,8 @@ * @author $Author: akarasulu $ * @version $Revision: 1.4 $ */ -public class SerializableComparator implements Comparator, Serializable +public class SerializableComparator + implements Comparator, Serializable { /** Used to access underlying transient comparator during deserialization */ private static ThreadLocal s_comparators = new ThreadLocal() ;