You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2004/09/30 06:25:15 UTC
svn commit: rev 47552 - in incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db: . jdbm
Author: akarasulu
Date: Wed Sep 29 21:25:12 2004
New Revision: 47552
Added:
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/EnumeratorImpl.java
- copied, changed from rev 47551, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/EnumeratorImpl.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/LeafEvaluatorImpl.java
- copied, changed from rev 47541, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/LeafEvaluatorImpl.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/NegationEnumeratorImpl.java
- copied, changed from rev 47541, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/NegationEnumeratorImpl.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ScopeEnumeratorImpl.java
- copied, changed from rev 47541, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/ScopeEnumeratorImpl.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ScopeEvaluatorImpl.java
- copied, changed from rev 47541, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/ScopeEvaluatorImpl.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/SubstringEnumeratorImpl.java
- copied, changed from rev 47541, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/SubstringEnumeratorImpl.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/SubstringEvaluatorImpl.java
- copied, changed from rev 47541, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/SubstringEvaluatorImpl.java
Removed:
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/EnumeratorImpl.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/LeafEvaluatorImpl.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/NegationEnumeratorImpl.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/ScopeEnumeratorImpl.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/ScopeEvaluatorImpl.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/SubstringEnumeratorImpl.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/SubstringEvaluatorImpl.java
Log:
Moving a bunch of reusable classes that do not depend on jdbm up one level to
the db package. These classes can be reused for any underlying BTree
implementation.
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/EnumeratorImpl.java (from rev 47551, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/EnumeratorImpl.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/EnumeratorImpl.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/EnumeratorImpl.java Wed Sep 29 21:25:12 2004
@@ -1,4 +1,20 @@
-package org.apache.eve.db.jdbm;
+/*
+ * Copyright 2004 The 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.
+ *
+ */
+package org.apache.eve.db;
import javax.naming.NamingException;
@@ -14,12 +30,12 @@
import org.apache.ldap.common.filter.SubstringNode;
import org.apache.ldap.common.NotImplementedException;
-import org.apache.eve.db.*;
-
/**
* Enumerates over candidates that satisfy a filter expression.
*
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public class EnumeratorImpl implements Enumerator
{
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/LeafEvaluatorImpl.java (from rev 47541, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/LeafEvaluatorImpl.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/LeafEvaluatorImpl.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/LeafEvaluatorImpl.java Wed Sep 29 21:25:12 2004
@@ -1,4 +1,20 @@
-package org.apache.eve.db.jdbm;
+/*
+ * Copyright 2004 The 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.
+ *
+ */
+package org.apache.eve.db;
import java.math.BigInteger;
@@ -17,11 +33,6 @@
import org.apache.ldap.common.filter.PresenceNode;
import org.apache.ldap.common.NotImplementedException;
-import org.apache.eve.db.Index;
-import org.apache.eve.db.Database;
-import org.apache.eve.db.IndexRecord;
-import org.apache.eve.db.LeafEvaluator;
-
import org.apache.eve.schema.NormalizerRegistry;
import org.apache.eve.schema.ComparatorRegistry;
@@ -29,6 +40,8 @@
/**
* Evaluates LeafNode assertions on candidates using a database.
*
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public class LeafEvaluatorImpl implements LeafEvaluator
{
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/NegationEnumeratorImpl.java (from rev 47541, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/NegationEnumeratorImpl.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/NegationEnumeratorImpl.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/NegationEnumeratorImpl.java Wed Sep 29 21:25:12 2004
@@ -1,4 +1,20 @@
-package org.apache.eve.db.jdbm;
+/*
+ * Copyright 2004 The 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.
+ *
+ */
+package org.apache.eve.db;
import javax.naming.NamingException;
@@ -8,13 +24,13 @@
import org.apache.ldap.common.filter.LeafNode;
import org.apache.ldap.common.filter.BranchNode;
-import org.apache.eve.db.*;
-
/**
* Creates a naming enumeration over the set of candidates accepted by a negated
* filter expression.
*
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public class NegationEnumeratorImpl implements NegationEnumerator
{
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ScopeEnumeratorImpl.java (from rev 47541, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/ScopeEnumeratorImpl.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/ScopeEnumeratorImpl.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ScopeEnumeratorImpl.java Wed Sep 29 21:25:12 2004
@@ -1,4 +1,20 @@
-package org.apache.eve.db.jdbm;
+/*
+ * Copyright 2004 The 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.
+ *
+ */
+package org.apache.eve.db;
import java.math.BigInteger;
@@ -11,12 +27,12 @@
import org.apache.ldap.common.filter.ScopeNode;
import org.apache.ldap.common.util.SingletonEnumeration;
-import org.apache.eve.db.*;
-
/**
* Enumerates candidates based on scope.
*
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public class ScopeEnumeratorImpl implements ScopeEnumerator
{
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ScopeEvaluatorImpl.java (from rev 47541, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/ScopeEvaluatorImpl.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/ScopeEvaluatorImpl.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ScopeEvaluatorImpl.java Wed Sep 29 21:25:12 2004
@@ -212,7 +212,7 @@
*
* Created on Oct 9, 2003
*/
-package org.apache.eve.db.jdbm;
+package org.apache.eve.db;
import java.math.BigInteger;
@@ -224,15 +224,12 @@
import org.apache.ldap.common.filter.ScopeNode;
import org.apache.ldap.common.message.DerefAliasesEnum;
-import org.apache.eve.db.Index;
-import org.apache.eve.db.Database;
-import org.apache.eve.db.IndexRecord;
-import org.apache.eve.db.ScopeEvaluator;
-
/**
* Evaluates ScopeNode assertions on candidates using a database.
*
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public class ScopeEvaluatorImpl implements ScopeEvaluator
{
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/SubstringEnumeratorImpl.java (from rev 47541, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/SubstringEnumeratorImpl.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/SubstringEnumeratorImpl.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/SubstringEnumeratorImpl.java Wed Sep 29 21:25:12 2004
@@ -212,7 +212,7 @@
*
* Created on Oct 13, 2003
*/
-package org.apache.eve.db.jdbm;
+package org.apache.eve.db;
import javax.naming.NamingException;
@@ -224,13 +224,13 @@
import org.apache.ldap.common.filter.ExprNode;
import org.apache.ldap.common.filter.SubstringNode;
-import org.apache.eve.db.*;
-
/**
* Enumerator that creates a NamingEnumeration over the set of candidates that
* satisfy a substring filter expression.
*
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public class SubstringEnumeratorImpl implements SubstringEnumerator
{
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/SubstringEvaluatorImpl.java (from rev 47541, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/SubstringEvaluatorImpl.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/SubstringEvaluatorImpl.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/SubstringEvaluatorImpl.java Wed Sep 29 21:25:12 2004
@@ -1,4 +1,20 @@
-package org.apache.eve.db.jdbm;
+/*
+ * Copyright 2004 The 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.
+ *
+ */
+package org.apache.eve.db;
import javax.naming.NamingException;
@@ -13,16 +29,14 @@
import org.apache.ldap.common.schema.Normalizer;
import org.apache.ldap.common.filter.SubstringNode;
-import org.apache.eve.db.Index;
-import org.apache.eve.db.Database;
-import org.apache.eve.db.IndexRecord;
-import org.apache.eve.db.SubstringEvaluator;
import org.apache.eve.schema.NormalizerRegistry;
/**
* Evaluates substring filter assertions on an entry.
*
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public class SubstringEvaluatorImpl implements SubstringEvaluator
{