You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2007/05/22 01:58:08 UTC
svn commit: r540368 - in
/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core:
authz/ collective/ operational/ subtree/
Author: elecharny
Date: Mon May 21 16:58:07 2007
New Revision: 540368
URL: http://svn.apache.org/viewvc?view=rev&rev=540368
Log:
Added a name to the SearchResultFilteringEnumeration constructore
for debug purpose
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java?view=diff&rev=540368&r1=540367&r2=540368
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java Mon May 21 16:58:07 2007
@@ -905,7 +905,7 @@
}
AuthorizationFilter authzFilter = new AuthorizationFilter();
- return new SearchResultFilteringEnumeration( e, DEFAULT_SEARCH_CONTROLS, invocation, authzFilter );
+ return new SearchResultFilteringEnumeration( e, DEFAULT_SEARCH_CONTROLS, invocation, authzFilter, "List authorization Filter" );
}
@@ -927,7 +927,7 @@
}
AuthorizationFilter authzFilter = new AuthorizationFilter();
- return new SearchResultFilteringEnumeration( e, searchCtls, invocation, authzFilter );
+ return new SearchResultFilteringEnumeration( e, searchCtls, invocation, authzFilter, "Search authorization Filter" );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java?view=diff&rev=540368&r1=540367&r2=540368
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java Mon May 21 16:58:07 2007
@@ -521,7 +521,7 @@
{
return DefaultAuthorizationService.this.isSearchable( invocation, result );
}
- } );
+ }, "Search Default Authorization filter" );
}
@@ -543,7 +543,7 @@
{
return DefaultAuthorizationService.this.isSearchable( invocation, result );
}
- } );
+ }, "List Default Authorization filter" );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java?view=diff&rev=540368&r1=540367&r2=540368
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java Mon May 21 16:58:07 2007
@@ -311,7 +311,7 @@
{
NamingEnumeration e = nextInterceptor.list( opContext );
Invocation invocation = InvocationStack.getInstance().peek();
- return new SearchResultFilteringEnumeration( e, new SearchControls(), invocation, SEARCH_FILTER );
+ return new SearchResultFilteringEnumeration( e, new SearchControls(), invocation, SEARCH_FILTER, "List collective Filter" );
}
@@ -320,7 +320,7 @@
NamingEnumeration<SearchResult> e = nextInterceptor.search( opContext );
Invocation invocation = InvocationStack.getInstance().peek();
return new SearchResultFilteringEnumeration(
- e, ((SearchOperationContext)opContext).getSearchControls(), invocation, SEARCH_FILTER );
+ e, ((SearchOperationContext)opContext).getSearchControls(), invocation, SEARCH_FILTER, "Search collective Filter" );
}
// ------------------------------------------------------------------------
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java?view=diff&rev=540368&r1=540367&r2=540368
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java Mon May 21 16:58:07 2007
@@ -300,7 +300,7 @@
{
NamingEnumeration e = nextInterceptor.list( opContext );
Invocation invocation = InvocationStack.getInstance().peek();
- return new SearchResultFilteringEnumeration( e, new SearchControls(), invocation, SEARCH_FILTER );
+ return new SearchResultFilteringEnumeration( e, new SearchControls(), invocation, SEARCH_FILTER, "List Operational Filter" );
}
@@ -314,13 +314,13 @@
{
if ( isDenormalizeOpAttrsEnabled )
{
- return new SearchResultFilteringEnumeration( e, searchCtls, invocation, DENORMALIZING_SEARCH_FILTER );
+ return new SearchResultFilteringEnumeration( e, searchCtls, invocation, DENORMALIZING_SEARCH_FILTER, "Search Operational Filter denormalized" );
}
return e;
}
- return new SearchResultFilteringEnumeration( e, searchCtls, invocation, SEARCH_FILTER );
+ return new SearchResultFilteringEnumeration( e, searchCtls, invocation, SEARCH_FILTER , "Search Operational Filter");
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java?view=diff&rev=540368&r1=540367&r2=540368
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java Mon May 21 16:58:07 2007
@@ -235,7 +235,7 @@
if ( !isSubentryVisible( invocation ) )
{
return new SearchResultFilteringEnumeration( e, new SearchControls(), invocation,
- new HideSubentriesFilter() );
+ new HideSubentriesFilter(), "List Subentry filter" );
}
return e;
@@ -257,11 +257,11 @@
// for subtree and one level scope we filter
if ( !isSubentryVisible( invocation ) )
{
- return new SearchResultFilteringEnumeration( e, searchCtls, invocation, new HideSubentriesFilter() );
+ return new SearchResultFilteringEnumeration( e, searchCtls, invocation, new HideSubentriesFilter(), "Search Subentry filter hide subentries" );
}
else
{
- return new SearchResultFilteringEnumeration( e, searchCtls, invocation, new HideEntriesFilter() );
+ return new SearchResultFilteringEnumeration( e, searchCtls, invocation, new HideEntriesFilter(), "Search Subentry filter hide entries");
}
}