You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2005/06/20 18:33:03 UTC
svn commit: r191505 - in
/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server:
authz/ enumeration/ operational/ partition/impl/btree/ schema/
Author: trustin
Date: Mon Jun 20 09:32:56 2005
New Revision: 191505
URL: http://svn.apache.org/viewcvs?rev=191505&view=rev
Log:
* Extracted some common enumerations and filters from btree implementation.
* Original SearchResultEnumeration is renamed to BTreeSearchResultEnumeration.
Added:
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/ResultFilteringEnumeration.java
- copied, changed from r191504, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ResultFilteringEnumeration.java
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultEnumeration.java (with props)
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java
- copied, changed from r191504, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SearchResultFilter.java
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeSearchResultEnumeration.java
- copied, changed from r191504, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SearchResultEnumeration.java
Removed:
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ResultFilteringEnumeration.java
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SearchResultEnumeration.java
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SearchResultFilter.java
Modified:
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeContextPartition.java
directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java?rev=191505&r1=191504&r2=191505&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java Mon Jun 20 09:32:56 2005
@@ -27,6 +27,8 @@
import org.apache.ldap.common.exception.LdapNoPermissionException;
import org.apache.ldap.common.name.DnParser;
+import org.apache.ldap.server.enumeration.ResultFilteringEnumeration;
+import org.apache.ldap.server.enumeration.SearchResultFilter;
import org.apache.ldap.server.interceptor.BaseInterceptor;
import org.apache.ldap.server.interceptor.InterceptorContext;
import org.apache.ldap.server.interceptor.NextInterceptor;
@@ -45,8 +47,6 @@
import org.apache.ldap.server.jndi.ServerContext;
import org.apache.ldap.server.partition.ContextPartition;
import org.apache.ldap.server.partition.ContextPartitionNexus;
-import org.apache.ldap.server.partition.impl.btree.ResultFilteringEnumeration;
-import org.apache.ldap.server.partition.impl.btree.SearchResultFilter;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
Copied: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/ResultFilteringEnumeration.java (from r191504, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ResultFilteringEnumeration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/ResultFilteringEnumeration.java?p2=directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/ResultFilteringEnumeration.java&p1=directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ResultFilteringEnumeration.java&r1=191504&r2=191505&rev=191505&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ResultFilteringEnumeration.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/ResultFilteringEnumeration.java Mon Jun 20 09:32:56 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.partition.impl.btree;
+package org.apache.ldap.server.enumeration;
import java.util.ArrayList;
Added: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultEnumeration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultEnumeration.java?rev=191505&view=auto
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultEnumeration.java (added)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultEnumeration.java Mon Jun 20 09:32:56 2005
@@ -0,0 +1,31 @@
+/*
+ * 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.ldap.server.enumeration;
+
+
+import javax.naming.NamingEnumeration;
+
+
+/**
+ * An enumeration that represents search result
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public interface SearchResultEnumeration extends NamingEnumeration
+{
+}
Propchange: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultEnumeration.java
------------------------------------------------------------------------------
svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Copied: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java (from r191504, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SearchResultFilter.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java?p2=directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java&p1=directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SearchResultFilter.java&r1=191504&r2=191505&rev=191505&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SearchResultFilter.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java Mon Jun 20 09:32:56 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.partition.impl.btree;
+package org.apache.ldap.server.enumeration;
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 org.apache.ldap.server.partition.impl.btree.ResultFilteringEnumeration}. Multiple filters can
+ * conjunction with a {@link org.apache.ldap.server.enumeration.ResultFilteringEnumeration}. Multiple filters can
* be applied one after the other and hence they are stackable.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java?rev=191505&r1=191504&r2=191505&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java Mon Jun 20 09:32:56 2005
@@ -33,6 +33,8 @@
import org.apache.ldap.common.schema.AttributeType;
import org.apache.ldap.common.schema.UsageEnum;
import org.apache.ldap.common.util.DateUtils;
+import org.apache.ldap.server.enumeration.ResultFilteringEnumeration;
+import org.apache.ldap.server.enumeration.SearchResultFilter;
import org.apache.ldap.server.interceptor.BaseInterceptor;
import org.apache.ldap.server.interceptor.InterceptorContext;
import org.apache.ldap.server.interceptor.NextInterceptor;
@@ -47,8 +49,6 @@
import org.apache.ldap.server.invocation.MoveAndModifyRN;
import org.apache.ldap.server.invocation.Search;
import org.apache.ldap.server.partition.ContextPartitionNexus;
-import org.apache.ldap.server.partition.impl.btree.ResultFilteringEnumeration;
-import org.apache.ldap.server.partition.impl.btree.SearchResultFilter;
import org.apache.ldap.server.schema.AttributeTypeRegistry;
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeContextPartition.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeContextPartition.java?rev=191505&r1=191504&r2=191505&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeContextPartition.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeContextPartition.java Mon Jun 20 09:32:56 2005
@@ -37,6 +37,7 @@
import org.apache.ldap.common.schema.AttributeType;
import org.apache.ldap.common.util.ArrayUtils;
import org.apache.ldap.server.configuration.ContextPartitionConfiguration;
+import org.apache.ldap.server.enumeration.SearchResultEnumeration;
import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
import org.apache.ldap.server.partition.ContextPartition;
import org.apache.ldap.server.partition.Oid;
@@ -236,7 +237,7 @@
public NamingEnumeration list( Name base ) throws NamingException
{
SearchResultEnumeration list;
- list = new SearchResultEnumeration( ArrayUtils.EMPTY_STRING_ARRAY,
+ list = new BTreeSearchResultEnumeration( ArrayUtils.EMPTY_STRING_ARRAY,
list( getEntryId( base.toString() ) ), this );
return list;
}
@@ -251,7 +252,7 @@
underlying = searchEngine.search( base, env, filter, searchCtls );
- return new SearchResultEnumeration( attrIds, underlying, this );
+ return new BTreeSearchResultEnumeration( attrIds, underlying, this );
}
Copied: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeSearchResultEnumeration.java (from r191504, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SearchResultEnumeration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeSearchResultEnumeration.java?p2=directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeSearchResultEnumeration.java&p1=directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SearchResultEnumeration.java&r1=191504&r2=191505&rev=191505&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SearchResultEnumeration.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeSearchResultEnumeration.java Mon Jun 20 09:32:56 2005
@@ -23,6 +23,7 @@
import javax.naming.directory.Attributes;
import org.apache.ldap.common.message.LockableAttributesImpl;
+import org.apache.ldap.server.enumeration.SearchResultEnumeration;
/**
@@ -36,7 +37,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class SearchResultEnumeration implements NamingEnumeration
+public class BTreeSearchResultEnumeration implements SearchResultEnumeration
{
/** Database used to lookup entries from */
private BTreeContextPartition partition = null;
@@ -54,7 +55,7 @@
* @param attrIds the returned attributes
* @param underlying the enumeration over IndexRecords
*/
- public SearchResultEnumeration( String [] attrIds,
+ public BTreeSearchResultEnumeration( String [] attrIds,
NamingEnumeration underlying,
BTreeContextPartition db )
{
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java?rev=191505&r1=191504&r2=191505&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java Mon Jun 20 09:32:56 2005
@@ -46,6 +46,8 @@
import org.apache.ldap.common.schema.SchemaUtils;
import org.apache.ldap.common.schema.Syntax;
import org.apache.ldap.common.util.SingletonEnumeration;
+import org.apache.ldap.server.enumeration.ResultFilteringEnumeration;
+import org.apache.ldap.server.enumeration.SearchResultFilter;
import org.apache.ldap.server.interceptor.BaseInterceptor;
import org.apache.ldap.server.interceptor.InterceptorContext;
import org.apache.ldap.server.interceptor.NextInterceptor;
@@ -55,8 +57,6 @@
import org.apache.ldap.server.invocation.Search;
import org.apache.ldap.server.jndi.ServerLdapContext;
import org.apache.ldap.server.partition.ContextPartitionNexus;
-import org.apache.ldap.server.partition.impl.btree.ResultFilteringEnumeration;
-import org.apache.ldap.server.partition.impl.btree.SearchResultFilter;
/**