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 2008/05/25 05:37:31 UTC
svn commit: r659905 [1/2] - in /directory/apacheds/branches/bigbang:
core/src/main/java/org/apache/directory/server/core/authn/
core/src/main/java/org/apache/directory/server/core/authz/
core/src/main/java/org/apache/directory/server/core/authz/support...
Author: akarasulu
Date: Sat May 24 20:37:28 2008
New Revision: 659905
URL: http://svn.apache.org/viewvc?rev=659905&view=rev
Log:
using interface instead of implementation for EntryFilteringCursor
Modified:
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/Partition.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java
directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddEntryOperation.java
directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java
directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java
directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Sat May 24 20:37:28 2008
@@ -31,7 +31,7 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.entry.ClonedServerEntry;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.Interceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
@@ -264,7 +264,7 @@
}
- public BaseEntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception
{
if ( IS_DEBUG )
{
@@ -382,7 +382,7 @@
}
- public BaseEntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception
+ public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception
{
if ( IS_DEBUG )
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Sat May 24 20:37:28 2008
@@ -29,7 +29,7 @@
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.entry.ServerEntryUtils;
import org.apache.directory.server.core.filtering.EntryFilter;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.InterceptorChain;
import org.apache.directory.server.core.interceptor.NextInterceptor;
@@ -995,12 +995,12 @@
}
- public BaseEntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception
{
Invocation invocation = InvocationStack.getInstance().peek();
ServerLdapContext ctx = ( ServerLdapContext ) invocation.getCaller();
LdapPrincipal user = ctx.getPrincipal();
- BaseEntryFilteringCursor cursor = next.list( opContext );
+ EntryFilteringCursor cursor = next.list( opContext );
if ( isPrincipalAnAdministrator( user.getJndiName() ) || !enabled )
{
@@ -1013,13 +1013,13 @@
}
- public BaseEntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception
+ public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception
{
Invocation invocation = InvocationStack.getInstance().peek();
ServerLdapContext ctx = ( ServerLdapContext ) invocation.getCaller();
LdapPrincipal user = ctx.getPrincipal();
LdapDN principalDn = user.getJndiName();
- BaseEntryFilteringCursor cursor = next.search( opContext );
+ EntryFilteringCursor cursor = next.search( opContext );
boolean isSubschemaSubentryLookup = subschemaSubentryDn.equals( opContext.getDn().getNormName() );
SearchControls searchCtls = opContext.getSearchControls();
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java Sat May 24 20:37:28 2008
@@ -25,7 +25,7 @@
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.filtering.EntryFilter;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.Interceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
@@ -495,9 +495,9 @@
}
- public BaseEntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext ) throws Exception
+ public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext ) throws Exception
{
- BaseEntryFilteringCursor cursor = nextInterceptor.search( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.search( opContext );
if ( !enabled )
{
@@ -514,9 +514,9 @@
}
- public BaseEntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception
{
- BaseEntryFilteringCursor cursor = nextInterceptor.list( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.list( opContext );
if ( !enabled )
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Sat May 24 20:37:28 2008
@@ -31,7 +31,7 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
@@ -142,7 +142,7 @@
LdapDN baseDn = new LdapDN( suffix );
SearchControls ctls = new SearchControls();
ctls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- BaseEntryFilteringCursor results = nexus.search( new SearchOperationContext( registries,
+ EntryFilteringCursor results = nexus.search( new SearchOperationContext( registries,
baseDn, AliasDerefMode.DEREF_ALWAYS, filter, ctls ) );
while ( results.next() )
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Sat May 24 20:37:28 2008
@@ -23,7 +23,7 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.schema.ConcreteNameComponentNormalizer;
@@ -134,7 +134,7 @@
new ClientStringValue( SchemaConstants.ACCESS_CONTROL_SUBENTRY_OC ) );
SearchControls ctls = new SearchControls();
ctls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- BaseEntryFilteringCursor results = nexus.search( new SearchOperationContext( registries,
+ EntryFilteringCursor results = nexus.search( new SearchOperationContext( registries,
baseDn, AliasDerefMode.NEVER_DEREF_ALIASES, filter, ctls ) );
while ( results.next() )
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java Sat May 24 20:37:28 2008
@@ -25,7 +25,7 @@
import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.event.EventInterceptor;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.normalization.NormalizationInterceptor;
import org.apache.directory.server.core.operational.OperationalAttributeInterceptor;
@@ -155,7 +155,7 @@
private int getImmSubCount( Registries registries, PartitionNexusProxy proxy, LdapDN entryName ) throws Exception
{
int cnt = 0;
- BaseEntryFilteringCursor results = null;
+ EntryFilteringCursor results = null;
try
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Sat May 24 20:37:28 2008
@@ -25,7 +25,7 @@
import org.apache.directory.server.core.entry.DefaultServerAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.filtering.EntryFilter;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
import org.apache.directory.server.core.interceptor.context.AddOperationContext;
@@ -326,17 +326,17 @@
}
- public BaseEntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception
{
- BaseEntryFilteringCursor cursor = nextInterceptor.list( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.list( opContext );
cursor.addEntryFilter( SEARCH_FILTER );
return cursor;
}
- public BaseEntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext ) throws Exception
+ public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext ) throws Exception
{
- BaseEntryFilteringCursor cursor = nextInterceptor.search( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.search( opContext );
cursor.addEntryFilter( SEARCH_FILTER );
return cursor;
}
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Sat May 24 20:37:28 2008
@@ -26,6 +26,7 @@
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
@@ -233,7 +234,7 @@
// check if entry to delete has children (only leaves can be deleted)
boolean hasChildren = false;
- BaseEntryFilteringCursor list = nextInterceptor.list( new ListOperationContext( registries, name ) );
+ EntryFilteringCursor list = nextInterceptor.list( new ListOperationContext( registries, name ) );
if ( list.next() )
{
@@ -264,7 +265,7 @@
/**
* Checks to see the base being searched exists, otherwise throws the appropriate LdapException.
*/
- public BaseEntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception
{
if ( opContext.getDn().getNormName().equals( subschemSubentryDn.getNormName() ) )
{
@@ -517,13 +518,13 @@
/**
* Checks to see the entry being searched exists, otherwise throws the appropriate LdapException.
*/
- public BaseEntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext ) throws Exception
+ public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext ) throws Exception
{
LdapDN base = opContext.getDn();
try
{
- BaseEntryFilteringCursor cursor = nextInterceptor.search( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.search( opContext );
if ( ! cursor.next() )
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java Sat May 24 20:37:28 2008
@@ -23,7 +23,7 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.authn.LdapPrincipal;
import org.apache.directory.server.core.entry.ClonedServerEntry;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
import org.apache.directory.server.core.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.interceptor.context.BindOperationContext;
@@ -160,7 +160,7 @@
}
- public BaseEntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception
{
return next.list( opContext );
}
@@ -204,7 +204,7 @@
}
- public BaseEntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception
+ public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception
{
return next.search( opContext );
}
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java Sat May 24 20:37:28 2008
@@ -22,7 +22,7 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.entry.ClonedServerEntry;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
import org.apache.directory.server.core.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.interceptor.context.BindOperationContext;
@@ -198,13 +198,13 @@
/**
* Filters {@link Partition#list( ListOperationContext )} call.
*/
- BaseEntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception;
+ EntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception;
/**
* Filters {@link Partition#search( SearchOperationContext )} call.
*/
- BaseEntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception;
+ EntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception;
/**
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java Sat May 24 20:37:28 2008
@@ -28,7 +28,7 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.entry.ClonedServerEntry;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
import org.apache.directory.server.core.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.interceptor.context.BindOperationContext;
@@ -142,13 +142,13 @@
}
- public BaseEntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception
{
return nexus.list( opContext );
}
- public BaseEntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception
+ public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception
{
return nexus.search( opContext );
}
@@ -793,7 +793,7 @@
}
- public BaseEntryFilteringCursor list( ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( ListOperationContext opContext ) throws Exception
{
Entry entry = getStartingEntry();
Interceptor head = entry.interceptor;
@@ -815,7 +815,7 @@
}
- public BaseEntryFilteringCursor search( SearchOperationContext opContext )
+ public EntryFilteringCursor search( SearchOperationContext opContext )
throws Exception
{
Entry entry = getStartingEntry();
@@ -1183,7 +1183,7 @@
}
- public BaseEntryFilteringCursor list( ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( ListOperationContext opContext ) throws Exception
{
Entry next = getNextEntry();
Interceptor interceptor = next.interceptor;
@@ -1204,7 +1204,7 @@
}
- public BaseEntryFilteringCursor search( SearchOperationContext opContext )
+ public EntryFilteringCursor search( SearchOperationContext opContext )
throws Exception
{
Entry next = getNextEntry();
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java Sat May 24 20:37:28 2008
@@ -23,7 +23,7 @@
import java.util.Iterator;
import org.apache.directory.server.core.entry.ClonedServerEntry;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
import org.apache.directory.server.core.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.interceptor.context.BindOperationContext;
@@ -119,13 +119,13 @@
/**
* Calls the next interceptor's {@link Interceptor#list( NextInterceptor, ListOperationContext )}.
*/
- BaseEntryFilteringCursor list( ListOperationContext opContext ) throws Exception;
+ EntryFilteringCursor list( ListOperationContext opContext ) throws Exception;
/**
* Calls the next interceptor's {@link Interceptor#search( NextInterceptor, SearchOperationContext opContext )}.
*/
- BaseEntryFilteringCursor search( SearchOperationContext opContext ) throws Exception;
+ EntryFilteringCursor search( SearchOperationContext opContext ) throws Exception;
/**
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java Sat May 24 20:37:28 2008
@@ -28,7 +28,7 @@
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerEntryUtils;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
/**
@@ -39,11 +39,11 @@
*/
public class NamingEnumerationAdapter implements NamingEnumeration<SearchResult>
{
- private final BaseEntryFilteringCursor cursor;
+ private final EntryFilteringCursor cursor;
private boolean available = false;
- public NamingEnumerationAdapter( BaseEntryFilteringCursor cursor ) throws NamingException
+ public NamingEnumerationAdapter( EntryFilteringCursor cursor ) throws NamingException
{
this.cursor = cursor;
try
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Sat May 24 20:37:28 2008
@@ -27,7 +27,7 @@
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.entry.ServerEntryUtils;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.interceptor.context.BindOperationContext;
import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
@@ -252,7 +252,7 @@
* @param searchControls
* @return NamingEnumeration
*/
- protected BaseEntryFilteringCursor doSearchOperation( LdapDN dn, AliasDerefMode aliasDerefMode,
+ protected EntryFilteringCursor doSearchOperation( LdapDN dn, AliasDerefMode aliasDerefMode,
ExprNode filter, SearchControls searchControls ) throws Exception
{
// setup the op context and populate with request controls
@@ -261,7 +261,7 @@
opCtx.addRequestControls( requestControls );
// execute search operation
- BaseEntryFilteringCursor results = nexusProxy.search( opCtx );
+ EntryFilteringCursor results = nexusProxy.search( opCtx );
// clear the request controls and set the response controls
requestControls = EMPTY_CONTROLS;
@@ -274,14 +274,14 @@
/**
* Used to encapsulate [de]marshalling of controls before and after list operations.
*/
- protected BaseEntryFilteringCursor doListOperation( LdapDN target ) throws Exception
+ protected EntryFilteringCursor doListOperation( LdapDN target ) throws Exception
{
// setup the op context and populate with request controls
ListOperationContext opCtx = new ListOperationContext( registries, target );
opCtx.addRequestControls( requestControls );
// execute list operation
- BaseEntryFilteringCursor results = nexusProxy.list( opCtx );
+ EntryFilteringCursor results = nexusProxy.list( opCtx );
// clear the request controls and set the response controls
requestControls = EMPTY_CONTROLS;
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Sat May 24 20:37:28 2008
@@ -24,6 +24,7 @@
import org.apache.directory.server.core.cursor.EmptyCursor;
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
@@ -160,7 +161,7 @@
}
- public BaseEntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext ) throws Exception
+ public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext ) throws Exception
{
ExprNode filter = opContext.getFilter();
opContext.getDn().normalize( attrNormalizers );
@@ -188,7 +189,7 @@
}
- public BaseEntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception
{
opContext.getDn().normalize( attrNormalizers );
return nextInterceptor.list( opContext );
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Sat May 24 20:37:28 2008
@@ -35,7 +35,7 @@
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.entry.ServerModification;
import org.apache.directory.server.core.filtering.EntryFilter;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.Interceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
@@ -288,17 +288,17 @@
}
- public BaseEntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception
{
- BaseEntryFilteringCursor cursor = nextInterceptor.list( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.list( opContext );
cursor.addEntryFilter( SEARCH_FILTER );
return cursor;
}
- public BaseEntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext ) throws Exception
+ public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext ) throws Exception
{
- BaseEntryFilteringCursor cursor = nextInterceptor.search( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.search( opContext );
SearchControls searchCtls = opContext.getSearchControls();
if ( searchCtls.getReturningAttributes() != null )
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Sat May 24 20:37:28 2008
@@ -27,6 +27,7 @@
import org.apache.directory.server.core.entry.DefaultServerAttribute;
import org.apache.directory.server.core.entry.DefaultServerEntry;
import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
import org.apache.directory.server.core.interceptor.context.AddOperationContext;
@@ -865,21 +866,21 @@
/**
* @see Partition#list(ListOperationContext)
*/
- public BaseEntryFilteringCursor list( ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( ListOperationContext opContext ) throws Exception
{
Partition backend = getPartition( opContext.getDn() );
return backend.list( opContext );
}
- public BaseEntryFilteringCursor search( SearchOperationContext opContext )
+ public EntryFilteringCursor search( SearchOperationContext opContext )
throws Exception
{
LdapDN base = opContext.getDn();
SearchControls searchCtls = opContext.getSearchControls();
ExprNode filter = opContext.getFilter();
- // TODO since we're handling the *, and + in the BaseEntryFilteringCursor
+ // TODO since we're handling the *, and + in the EntryFilteringCursor
// we may not need this code: we need see if this is actually the
// case and remove this code.
if ( base.size() == 0 )
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/Partition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/Partition.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/Partition.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/Partition.java Sat May 24 20:37:28 2008
@@ -24,7 +24,7 @@
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.entry.ServerSearchResult;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.interceptor.context.BindOperationContext;
import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
@@ -240,7 +240,7 @@
* @return a NamingEnumeration containing objects of type {@link ServerSearchResult}
* @throws Exception if there are any problems
*/
- BaseEntryFilteringCursor list( ListOperationContext opContext ) throws Exception;
+ EntryFilteringCursor list( ListOperationContext opContext ) throws Exception;
/**
@@ -255,7 +255,7 @@
* @throws Exception if there are any problems
* @return a NamingEnumeration containing objects of type
*/
- BaseEntryFilteringCursor search( SearchOperationContext opContext ) throws Exception;
+ EntryFilteringCursor search( SearchOperationContext opContext ) throws Exception;
/**
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java Sat May 24 20:37:28 2008
@@ -45,7 +45,7 @@
import org.apache.directory.server.core.event.EventInterceptor;
import org.apache.directory.server.core.exception.ExceptionInterceptor;
import org.apache.directory.server.core.filtering.EntryFilter;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.InterceptorChain;
import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
import org.apache.directory.server.core.interceptor.context.AddOperationContext;
@@ -483,13 +483,13 @@
}
- public BaseEntryFilteringCursor list( ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( ListOperationContext opContext ) throws Exception
{
return list( opContext, null );
}
- public BaseEntryFilteringCursor list( ListOperationContext opContext, Collection<String> bypass ) throws Exception
+ public EntryFilteringCursor list( ListOperationContext opContext, Collection<String> bypass ) throws Exception
{
ensureStarted();
opContext.push( new Invocation( this, caller, "list", bypass ) );
@@ -505,9 +505,9 @@
}
- public BaseEntryFilteringCursor search( SearchOperationContext opContext ) throws Exception
+ public EntryFilteringCursor search( SearchOperationContext opContext ) throws Exception
{
- BaseEntryFilteringCursor cursor = search( opContext, null );
+ EntryFilteringCursor cursor = search( opContext, null );
final SearchControls searchCtls = opContext.getSearchControls();
if ( searchCtls.getTimeLimit() + searchCtls.getCountLimit() > 0 )
@@ -550,7 +550,7 @@
}
- public BaseEntryFilteringCursor search( SearchOperationContext opContext, Collection<String> bypass )
+ public EntryFilteringCursor search( SearchOperationContext opContext, Collection<String> bypass )
throws Exception
{
ensureStarted();
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Sat May 24 20:37:28 2008
@@ -22,6 +22,7 @@
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
@@ -262,14 +263,14 @@
public abstract void modify( ModifyOperationContext opContext ) throws Exception;
- public BaseEntryFilteringCursor list( ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( ListOperationContext opContext ) throws Exception
{
return new BaseEntryFilteringCursor( new ServerEntryCursorAdaptor( this,
list( getEntryId( opContext.getDn().getNormName() ) ) ), opContext );
}
- public BaseEntryFilteringCursor search( SearchOperationContext opContext ) throws Exception
+ public EntryFilteringCursor search( SearchOperationContext opContext ) throws Exception
{
SearchControls searchCtls = opContext.getSearchControls();
IndexCursor<Long,ServerEntry> underlying;
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Sat May 24 20:37:28 2008
@@ -37,7 +37,6 @@
import org.apache.directory.server.core.entry.ServerStringValue;
import org.apache.directory.server.core.event.EventInterceptor;
import org.apache.directory.server.core.filtering.EntryFilter;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
@@ -880,7 +879,7 @@
Partition partition = opContext.getPartition();
LdapDN suffix = partition.getSuffixDn();
Invocation invocation = InvocationStack.getInstance().peek();
- BaseEntryFilteringCursor list = invocation.getProxy().search(
+ EntryFilteringCursor list = invocation.getProxy().search(
new SearchOperationContext( registries, suffix, AliasDerefMode.DEREF_ALWAYS, getReferralFilter(),
getControls() ), SEARCH_BYPASS );
addReferrals( list, suffix );
@@ -892,7 +891,7 @@
{
// remove referrals immediately before removing the partition
Invocation invocation = InvocationStack.getInstance().peek();
- BaseEntryFilteringCursor cursor = invocation.getProxy().search(
+ EntryFilteringCursor cursor = invocation.getProxy().search(
new SearchOperationContext( registries, opContext.getDn(), AliasDerefMode.DEREF_ALWAYS,
getReferralFilter(), getControls() ), SEARCH_BYPASS );
@@ -901,7 +900,7 @@
}
- private void addReferrals( BaseEntryFilteringCursor referrals, LdapDN base ) throws Exception
+ private void addReferrals( EntryFilteringCursor referrals, LdapDN base ) throws Exception
{
while ( referrals.next() )
{
@@ -922,7 +921,7 @@
}
- private void deleteReferrals( BaseEntryFilteringCursor referrals, LdapDN base ) throws Exception
+ private void deleteReferrals( EntryFilteringCursor referrals, LdapDN base ) throws Exception
{
while ( referrals.next() )
{
@@ -943,7 +942,7 @@
}
- public BaseEntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception
+ public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception
{
Invocation invocation = InvocationStack.getInstance().peek();
ServerLdapContext caller = ( ServerLdapContext ) invocation.getCaller();
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Sat May 24 20:37:28 2008
@@ -38,7 +38,7 @@
import org.apache.directory.server.constants.MetaSchemaConstants;
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
import org.apache.directory.server.core.interceptor.context.ListOperationContext;
import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
@@ -197,7 +197,7 @@
* OID registry. To prevent this we need to load all the OID's in advance
* regardless of whether they are used or not.
*/
- BaseEntryFilteringCursor cursor = dao.listAllNames();
+ EntryFilteringCursor cursor = dao.listAllNames();
while ( cursor.next() )
{
@@ -425,7 +425,7 @@
LOG.debug( "{} schema: loading objectClasses", schema.getSchemaName() );
- BaseEntryFilteringCursor list = partition.list( new ListOperationContext( registries, dn ) );
+ EntryFilteringCursor list = partition.list( new ListOperationContext( registries, dn ) );
while ( list.next() )
{
@@ -526,7 +526,7 @@
LOG.debug( "{} schema: loading attributeTypes", schema.getSchemaName() );
- BaseEntryFilteringCursor list = partition.list( new ListOperationContext( registries, dn ) );
+ EntryFilteringCursor list = partition.list( new ListOperationContext( registries, dn ) );
while ( list.next() )
{
@@ -624,7 +624,7 @@
LOG.debug( "{} schema: loading matchingRules", schema.getSchemaName() );
- BaseEntryFilteringCursor list = partition.list( new ListOperationContext( registries, dn ) );
+ EntryFilteringCursor list = partition.list( new ListOperationContext( registries, dn ) );
while ( list.next() )
{
@@ -657,7 +657,7 @@
LOG.debug( "{} schema: loading syntaxes", schema.getSchemaName() );
- BaseEntryFilteringCursor list = partition.list( new ListOperationContext( registries, dn ) );
+ EntryFilteringCursor list = partition.list( new ListOperationContext( registries, dn ) );
while ( list.next() )
{
@@ -689,7 +689,7 @@
LOG.debug( "{} schema: loading syntaxCheckers", schema.getSchemaName() );
- BaseEntryFilteringCursor list = partition.list( new ListOperationContext( registries, dn ) );
+ EntryFilteringCursor list = partition.list( new ListOperationContext( registries, dn ) );
while ( list.next() )
{
@@ -723,7 +723,7 @@
LOG.debug( "{} schema: loading normalizers", schema.getSchemaName() );
- BaseEntryFilteringCursor list = partition.list( new ListOperationContext( registries, dn ) );
+ EntryFilteringCursor list = partition.list( new ListOperationContext( registries, dn ) );
while ( list.next() )
{
@@ -802,7 +802,7 @@
LOG.debug( "{} schema: loading comparators", schema.getSchemaName() );
- BaseEntryFilteringCursor list = partition.list( new ListOperationContext( registries, dn ) );
+ EntryFilteringCursor list = partition.list( new ListOperationContext( registries, dn ) );
while ( list.next() )
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Sat May 24 20:37:28 2008
@@ -32,6 +32,7 @@
import org.apache.directory.server.core.entry.ServerEntryUtils;
import org.apache.directory.server.core.entry.ServerStringValue;
import org.apache.directory.server.core.filtering.EntryFilter;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
@@ -383,9 +384,9 @@
}
- public BaseEntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception
{
- BaseEntryFilteringCursor cursor = nextInterceptor.list( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.list( opContext );
cursor.addEntryFilter( binaryAttributeFilter );
return cursor;
}
@@ -656,7 +657,7 @@
}
- public BaseEntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext )
+ public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext )
throws Exception
{
LdapDN base = opContext.getDn();
@@ -679,7 +680,7 @@
// Deal with the normal case : searching for a normal value (not subSchemaSubEntry)
if ( !subschemaSubentryDnNorm.equals( baseNormForm ) )
{
- BaseEntryFilteringCursor cursor = nextInterceptor.search( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.search( opContext );
if ( searchCtls.getReturningAttributes() != null )
{
@@ -753,7 +754,7 @@
{
// call.setBypass( true );
ServerEntry serverEntry = schemaService.getSubschemaEntry( searchCtls.getReturningAttributes() );
- BaseEntryFilteringCursor cursor = new BaseEntryFilteringCursor(
+ EntryFilteringCursor cursor = new BaseEntryFilteringCursor(
new SingletonCursor<ServerEntry>( serverEntry ), opContext );
return cursor;
}
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java Sat May 24 20:37:28 2008
@@ -32,7 +32,7 @@
import org.apache.directory.server.core.entry.DefaultServerAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.entry.ServerModification;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
@@ -157,7 +157,7 @@
public Map<String, Schema> getSchemas() throws Exception
{
Map<String, Schema> schemas = new HashMap<String, Schema>();
- BaseEntryFilteringCursor list = listSchemas();
+ EntryFilteringCursor list = listSchemas();
while ( list.next() )
{
@@ -173,7 +173,7 @@
public Set<String> getSchemaNames() throws Exception
{
Set<String> schemaNames = new HashSet<String>();
- BaseEntryFilteringCursor list = listSchemas();
+ EntryFilteringCursor list = listSchemas();
while ( list.next() )
{
@@ -185,11 +185,11 @@
}
- private BaseEntryFilteringCursor listSchemas() throws Exception
+ private EntryFilteringCursor listSchemas() throws Exception
{
LdapDN base = new LdapDN( ServerDNConstants.OU_SCHEMA_DN );
base.normalize( attrRegistry.getNormalizerMapping() );
- ExprNode filter = new EqualityNode( oidRegistry.getOid( SchemaConstants.OBJECT_CLASS_AT ),
+ ExprNode filter = new EqualityNode<String>( oidRegistry.getOid( SchemaConstants.OBJECT_CLASS_AT ),
new ClientStringValue( MetaSchemaConstants.META_SCHEMA_OC ) );
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -210,21 +210,21 @@
public boolean hasMatchingRule( String oid ) throws Exception
{
BranchNode filter = new AndNode();
- filter.addNode( new EqualityNode( OBJECTCLASS_OID, new ClientStringValue(
+ filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new ClientStringValue(
MetaSchemaConstants.META_MATCHING_RULE_OC ) ) );
if ( NUMERIC_OID_CHECKER.isValidSyntax( oid ) )
{
- filter.addNode( new EqualityNode( M_OID_OID, new ClientStringValue( oid ) ) );
+ filter.addNode( new EqualityNode<String>( M_OID_OID, new ClientStringValue( oid ) ) );
}
else
{
- filter.addNode( new EqualityNode( M_NAME_OID, new ClientStringValue( oid.toLowerCase() ) ) );
+ filter.addNode( new EqualityNode<String>( M_NAME_OID, new ClientStringValue( oid.toLowerCase() ) ) );
}
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- BaseEntryFilteringCursor cursor = null;
+ EntryFilteringCursor cursor = null;
try
{
@@ -270,7 +270,7 @@
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- BaseEntryFilteringCursor cursor = null;
+ EntryFilteringCursor cursor = null;
try
{
@@ -302,21 +302,21 @@
public boolean hasObjectClass( String oid ) throws Exception
{
BranchNode filter = new AndNode();
- filter.addNode( new EqualityNode( OBJECTCLASS_OID, new ClientStringValue(
- MetaSchemaConstants.META_OBJECT_CLASS_OC ) ) );
+ filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID,
+ new ClientStringValue( MetaSchemaConstants.META_OBJECT_CLASS_OC ) ) );
if ( NUMERIC_OID_CHECKER.isValidSyntax( oid ) )
{
- filter.addNode( new EqualityNode( M_OID_OID, new ClientStringValue( oid ) ) );
+ filter.addNode( new EqualityNode<String>( M_OID_OID, new ClientStringValue( oid ) ) );
}
else
{
- filter.addNode( new EqualityNode( M_NAME_OID, new ClientStringValue( oid.toLowerCase() ) ) );
+ filter.addNode( new EqualityNode<String>( M_NAME_OID, new ClientStringValue( oid.toLowerCase() ) ) );
}
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- BaseEntryFilteringCursor cursor = null;
+ EntryFilteringCursor cursor = null;
try
{
@@ -348,21 +348,21 @@
public boolean hasSyntax( String oid ) throws Exception
{
BranchNode filter = new AndNode();
- filter
- .addNode( new EqualityNode( OBJECTCLASS_OID, new ClientStringValue( MetaSchemaConstants.META_SYNTAX_OC ) ) );
+ filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID,
+ new ClientStringValue( MetaSchemaConstants.META_SYNTAX_OC ) ) );
if ( NUMERIC_OID_CHECKER.isValidSyntax( oid ) )
{
- filter.addNode( new EqualityNode( M_OID_OID, new ClientStringValue( oid ) ) );
+ filter.addNode( new EqualityNode<String>( M_OID_OID, new ClientStringValue( oid ) ) );
}
else
{
- filter.addNode( new EqualityNode( M_NAME_OID, new ClientStringValue( oid.toLowerCase() ) ) );
+ filter.addNode( new EqualityNode<String>( M_NAME_OID, new ClientStringValue( oid.toLowerCase() ) ) );
}
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- BaseEntryFilteringCursor cursor = null;
+ EntryFilteringCursor cursor = null;
try
{
@@ -394,21 +394,21 @@
public boolean hasSyntaxChecker( String oid ) throws Exception
{
BranchNode filter = new AndNode();
- filter.addNode( new EqualityNode( OBJECTCLASS_OID, new ClientStringValue(
- MetaSchemaConstants.META_SYNTAX_CHECKER_OC ) ) );
+ filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID,
+ new ClientStringValue( MetaSchemaConstants.META_SYNTAX_CHECKER_OC ) ) );
if ( NUMERIC_OID_CHECKER.isValidSyntax( oid ) )
{
- filter.addNode( new EqualityNode( M_OID_OID, new ClientStringValue( oid ) ) );
+ filter.addNode( new EqualityNode<String>( M_OID_OID, new ClientStringValue( oid ) ) );
}
else
{
- filter.addNode( new EqualityNode( M_NAME_OID, new ClientStringValue( oid.toLowerCase() ) ) );
+ filter.addNode( new EqualityNode<String>( M_NAME_OID, new ClientStringValue( oid.toLowerCase() ) ) );
}
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- BaseEntryFilteringCursor cursor = null;
+ EntryFilteringCursor cursor = null;
try
{
@@ -496,13 +496,15 @@
public ServerEntry find( String entityName ) throws Exception
{
BranchNode filter = new OrNode();
- SimpleNode nameAVA = new EqualityNode( M_NAME_OID, new ClientStringValue( entityName.toLowerCase() ) );
- SimpleNode oidAVA = new EqualityNode( M_OID_OID, new ClientStringValue( entityName.toLowerCase() ) );
+ SimpleNode<String> nameAVA = new EqualityNode<String>( M_NAME_OID,
+ new ClientStringValue( entityName.toLowerCase() ) );
+ SimpleNode<String> oidAVA = new EqualityNode<String>( M_OID_OID,
+ new ClientStringValue( entityName.toLowerCase() ) );
filter.addNode( nameAVA );
filter.addNode( oidAVA );
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- BaseEntryFilteringCursor cursor = null;
+ EntryFilteringCursor cursor = null;
try
{
@@ -614,17 +616,17 @@
// subfilter for (| (objectClass=metaMatchingRule) (objectClass=metaAttributeType))
BranchNode or = new OrNode();
- or.addNode( new EqualityNode( OBJECTCLASS_OID, new ClientStringValue( MetaSchemaConstants.META_MATCHING_RULE_OC
- .toLowerCase() ) ) );
- or.addNode( new EqualityNode( OBJECTCLASS_OID, new ClientStringValue(
- MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC.toLowerCase() ) ) );
+ or.addNode( new EqualityNode<String>( OBJECTCLASS_OID,
+ new ClientStringValue( MetaSchemaConstants.META_MATCHING_RULE_OC.toLowerCase() ) ) );
+ or.addNode( new EqualityNode<String>( OBJECTCLASS_OID,
+ new ClientStringValue( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC.toLowerCase() ) ) );
filter.addNode( or );
- filter.addNode( new EqualityNode( M_SYNTAX_OID, new ClientStringValue( numericOid.toLowerCase() ) ) );
+ filter.addNode( new EqualityNode<String>( M_SYNTAX_OID, new ClientStringValue( numericOid.toLowerCase() ) ) );
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- BaseEntryFilteringCursor cursor = null;
+ EntryFilteringCursor cursor = null;
try
{
@@ -654,28 +656,28 @@
BranchNode filter = new AndNode();
// ( objectClass = metaAttributeType )
- filter.addNode( new EqualityNode( OBJECTCLASS_OID, new ClientStringValue(
+ filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new ClientStringValue(
MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC.toLowerCase() ) ) );
BranchNode or = new OrNode();
- or.addNode( new EqualityNode( M_ORDERING_OID, new ClientStringValue( mr.getOid() ) ) );
- or.addNode( new EqualityNode( M_SUBSTRING_OID, new ClientStringValue( mr.getOid() ) ) );
- or.addNode( new EqualityNode( M_EQUALITY_OID, new ClientStringValue( mr.getOid() ) ) );
+ or.addNode( new EqualityNode<String>( M_ORDERING_OID, new ClientStringValue( mr.getOid() ) ) );
+ or.addNode( new EqualityNode<String>( M_SUBSTRING_OID, new ClientStringValue( mr.getOid() ) ) );
+ or.addNode( new EqualityNode<String>( M_EQUALITY_OID, new ClientStringValue( mr.getOid() ) ) );
filter.addNode( or );
if ( mr.getNames() != null || mr.getNames().length > 0 )
{
for ( String name : mr.getNames() )
{
- or.addNode( new EqualityNode( M_ORDERING_OID, new ClientStringValue( name.toLowerCase() ) ) );
- or.addNode( new EqualityNode( M_SUBSTRING_OID, new ClientStringValue( name.toLowerCase() ) ) );
- or.addNode( new EqualityNode( M_EQUALITY_OID, new ClientStringValue( name.toLowerCase() ) ) );
+ or.addNode( new EqualityNode<String>( M_ORDERING_OID, new ClientStringValue( name.toLowerCase() ) ) );
+ or.addNode( new EqualityNode<String>( M_SUBSTRING_OID, new ClientStringValue( name.toLowerCase() ) ) );
+ or.addNode( new EqualityNode<String>( M_EQUALITY_OID, new ClientStringValue( name.toLowerCase() ) ) );
}
}
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- BaseEntryFilteringCursor cursor = null;
+ EntryFilteringCursor cursor = null;
try
{
@@ -699,7 +701,7 @@
}
- public BaseEntryFilteringCursor listAllNames() throws Exception
+ public EntryFilteringCursor listAllNames() throws Exception
{
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
@@ -738,21 +740,21 @@
// ( objectClass = metaAttributeType )
BranchNode or = new OrNode();
- or.addNode( new EqualityNode( OBJECTCLASS_OID, new ClientStringValue(
- MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC.toLowerCase() ) ) );
- or.addNode( new EqualityNode( OBJECTCLASS_OID, new ClientStringValue( MetaSchemaConstants.META_OBJECT_CLASS_OC
- .toLowerCase() ) ) );
+ or.addNode( new EqualityNode<String>( OBJECTCLASS_OID,
+ new ClientStringValue( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC.toLowerCase() ) ) );
+ or.addNode( new EqualityNode<String>( OBJECTCLASS_OID,
+ new ClientStringValue( MetaSchemaConstants.META_OBJECT_CLASS_OC.toLowerCase() ) ) );
filter.addNode( or );
or = new OrNode();
- or.addNode( new EqualityNode( M_MAY_OID, new ClientStringValue( at.getOid() ) ) );
- or.addNode( new EqualityNode( M_MUST_OID, new ClientStringValue( at.getOid() ) ) );
- or.addNode( new EqualityNode( M_SUP_ATTRIBUTE_TYPE_OID, new ClientStringValue( at.getOid() ) ) );
+ or.addNode( new EqualityNode<String>( M_MAY_OID, new ClientStringValue( at.getOid() ) ) );
+ or.addNode( new EqualityNode<String>( M_MUST_OID, new ClientStringValue( at.getOid() ) ) );
+ or.addNode( new EqualityNode<String>( M_SUP_ATTRIBUTE_TYPE_OID, new ClientStringValue( at.getOid() ) ) );
filter.addNode( or );
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- BaseEntryFilteringCursor cursor = null;
+ EntryFilteringCursor cursor = null;
try
{
@@ -794,13 +796,14 @@
Set<ServerEntry> set = new HashSet<ServerEntry>();
BranchNode filter = new AndNode();
- filter.addNode( new EqualityNode( OBJECTCLASS_OID, new ClientStringValue( MetaSchemaConstants.META_SCHEMA_OC
- .toLowerCase() ) ) );
- filter.addNode( new EqualityNode( M_DEPENDENCIES_OID, new ClientStringValue( schemaName.toLowerCase() ) ) );
+ filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID,
+ new ClientStringValue( MetaSchemaConstants.META_SCHEMA_OC.toLowerCase() ) ) );
+ filter.addNode( new EqualityNode<String>( M_DEPENDENCIES_OID,
+ new ClientStringValue( schemaName.toLowerCase() ) ) );
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
- BaseEntryFilteringCursor cursor = null;
+ EntryFilteringCursor cursor = null;
try
{
@@ -836,13 +839,14 @@
Set<ServerEntry> set = new HashSet<ServerEntry>();
BranchNode filter = new AndNode();
- filter.addNode( new EqualityNode( OBJECTCLASS_OID, new ClientStringValue( MetaSchemaConstants.META_SCHEMA_OC
- .toLowerCase() ) ) );
- filter.addNode( new EqualityNode( M_DEPENDENCIES_OID, new ClientStringValue( schemaName.toLowerCase() ) ) );
+ filter.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new ClientStringValue(
+ MetaSchemaConstants.META_SCHEMA_OC.toLowerCase() ) ) );
+ filter.addNode( new EqualityNode<String>( M_DEPENDENCIES_OID, new ClientStringValue(
+ schemaName.toLowerCase() ) ) );
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
- BaseEntryFilteringCursor cursor = null;
+ EntryFilteringCursor cursor = null;
try
{
@@ -906,23 +910,23 @@
BranchNode filter = new AndNode();
BranchNode or = new OrNode();
- or.addNode( new EqualityNode( OBJECTCLASS_OID, new ClientStringValue( MetaSchemaConstants.META_NAME_FORM_OC
+ or.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new ClientStringValue( MetaSchemaConstants.META_NAME_FORM_OC
.toLowerCase() ) ) );
- or.addNode( new EqualityNode( OBJECTCLASS_OID, new ClientStringValue( MetaSchemaConstants.META_OBJECT_CLASS_OC
+ or.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new ClientStringValue( MetaSchemaConstants.META_OBJECT_CLASS_OC
.toLowerCase() ) ) );
- or.addNode( new EqualityNode( OBJECTCLASS_OID, new ClientStringValue(
+ or.addNode( new EqualityNode<String>( OBJECTCLASS_OID, new ClientStringValue(
MetaSchemaConstants.META_DIT_CONTENT_RULE_OC.toLowerCase() ) ) );
filter.addNode( or );
or = new OrNode();
- or.addNode( new EqualityNode( M_AUX_OID, new ClientStringValue( oc.getOid() ) ) );
- or.addNode( new EqualityNode( M_OC_OID, new ClientStringValue( oc.getOid() ) ) );
- or.addNode( new EqualityNode( M_SUP_OBJECT_CLASS_OID, new ClientStringValue( oc.getOid() ) ) );
+ or.addNode( new EqualityNode<String>( M_AUX_OID, new ClientStringValue( oc.getOid() ) ) );
+ or.addNode( new EqualityNode<String>( M_OC_OID, new ClientStringValue( oc.getOid() ) ) );
+ or.addNode( new EqualityNode<String>( M_SUP_OBJECT_CLASS_OID, new ClientStringValue( oc.getOid() ) ) );
filter.addNode( or );
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- BaseEntryFilteringCursor cursor = null;
+ EntryFilteringCursor cursor = null;
try
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Sat May 24 20:37:28 2008
@@ -31,7 +31,7 @@
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.entry.ServerModification;
import org.apache.directory.server.core.filtering.EntryFilter;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
import org.apache.directory.server.core.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
@@ -170,7 +170,7 @@
//suffix = LdapDN.normalize( suffix, registry.getNormalizerMapping() );
suffix.normalize( atRegistry.getNormalizerMapping() );
- BaseEntryFilteringCursor subentries = nexus.search( new SearchOperationContext( registries,
+ EntryFilteringCursor subentries = nexus.search( new SearchOperationContext( registries,
suffix, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
while ( subentries.next() )
@@ -238,10 +238,10 @@
// Methods/Code dealing with Subentry Visibility
// -----------------------------------------------------------------------
- public BaseEntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext )
+ public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext )
throws Exception
{
- BaseEntryFilteringCursor cursor = nextInterceptor.list( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.list( opContext );
Invocation invocation = InvocationStack.getInstance().peek();
if ( !isSubentryVisible( invocation ) )
@@ -253,10 +253,10 @@
}
- public BaseEntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext )
+ public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext )
throws Exception
{
- BaseEntryFilteringCursor cursor = nextInterceptor.search( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.search( opContext );
Invocation invocation = InvocationStack.getInstance().peek();
// object scope searches by default return subentries
@@ -480,7 +480,7 @@
controls.setReturningAttributes( new String[]
{ SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
- BaseEntryFilteringCursor subentries = nexus.search( new SearchOperationContext( registries,
+ EntryFilteringCursor subentries = nexus.search( new SearchOperationContext( registries,
baseDn, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
while ( subentries.next() )
@@ -614,7 +614,7 @@
controls.setReturningAttributes( new String[]
{ SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
- BaseEntryFilteringCursor subentries = nexus.search( new SearchOperationContext( registries,
+ EntryFilteringCursor subentries = nexus.search( new SearchOperationContext( registries,
baseDn, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
while ( subentries.next() )
@@ -655,7 +655,7 @@
ExprNode filter = new PresenceNode( "administrativeRole" );
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- BaseEntryFilteringCursor aps = nexus.search( new SearchOperationContext( registries, name,
+ EntryFilteringCursor aps = nexus.search( new SearchOperationContext( registries, name,
AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
if ( aps.next() )
@@ -773,7 +773,7 @@
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
controls.setReturningAttributes( new String[]
{ SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
- BaseEntryFilteringCursor subentries = nexus.search( new SearchOperationContext( registries,
+ EntryFilteringCursor subentries = nexus.search( new SearchOperationContext( registries,
baseDn, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
while ( subentries.next() )
@@ -850,7 +850,7 @@
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
controls.setReturningAttributes( new String[]
{ SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
- BaseEntryFilteringCursor subentries = nexus.search( new SearchOperationContext( registries,
+ EntryFilteringCursor subentries = nexus.search( new SearchOperationContext( registries,
baseDn, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
while ( subentries.next() )
@@ -924,7 +924,7 @@
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
controls.setReturningAttributes( new String[]
{ SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
- BaseEntryFilteringCursor subentries = nexus.search( new SearchOperationContext( registries,
+ EntryFilteringCursor subentries = nexus.search( new SearchOperationContext( registries,
baseDn, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
while ( subentries.next() )
@@ -1058,7 +1058,7 @@
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
controls.setReturningAttributes( new String[]
{ SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
- BaseEntryFilteringCursor subentries = nexus.search( new SearchOperationContext( registries,
+ EntryFilteringCursor subentries = nexus.search( new SearchOperationContext( registries,
oldBaseDn, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
while ( subentries.next() )
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java Sat May 24 20:37:28 2008
@@ -24,7 +24,7 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.partition.PartitionNexus;
@@ -116,7 +116,7 @@
new ClientStringValue( ApacheSchemaConstants.TRIGGER_EXECUTION_SUBENTRY_OC ) );
SearchControls ctls = new SearchControls();
ctls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- BaseEntryFilteringCursor results =
+ EntryFilteringCursor results =
nexus.search( new SearchOperationContext( registries, baseDn, AliasDerefMode.DEREF_ALWAYS, filter, ctls ) );
while ( results.next() )
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Sat May 24 20:37:28 2008
@@ -28,6 +28,7 @@
import org.apache.directory.server.core.cursor.CursorIterator;
import org.apache.directory.server.core.entry.DefaultServerEntry;
import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
import org.apache.directory.server.core.interceptor.Interceptor;
import org.apache.directory.server.core.interceptor.InterceptorChain;
@@ -180,14 +181,14 @@
}
- public BaseEntryFilteringCursor search( SearchOperationContext opContext )
+ public EntryFilteringCursor search( SearchOperationContext opContext )
throws NamingException
{
return new BaseEntryFilteringCursor( new BogusCursor( count ), opContext );
}
- public BaseEntryFilteringCursor search( SearchOperationContext opContext, Collection<String> bypass ) throws NamingException
+ public EntryFilteringCursor search( SearchOperationContext opContext, Collection<String> bypass ) throws NamingException
{
return new BaseEntryFilteringCursor( new BogusCursor( count ), opContext );
}
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java?rev=659905&r1=659904&r2=659905&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java Sat May 24 20:37:28 2008
@@ -22,7 +22,7 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.entry.ClonedServerEntry;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
import org.apache.directory.server.core.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.interceptor.context.BindOperationContext;
@@ -155,14 +155,14 @@
}
- public BaseEntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception
{
test.interceptors.add( this );
return next.list( opContext );
}
- public BaseEntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception
+ public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception
{
test.interceptors.add( this );
return next.search( opContext );