directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r193118 - in /directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server: authz/ enumeration/ operational/ schema/
Date Thu, 23 Jun 2005 09:10:47 GMT
Author: trustin
Date: Thu Jun 23 02:10:45 2005
New Revision: 193118

URL: http://svn.apache.org/viewcvs?rev=193118&view=rev
Log:
Renamed ResultFilteringEnumeration to SearchResultFilteringEnumeration.

Added:
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilteringEnumeration.java
      - copied, changed from r191831, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/ResultFilteringEnumeration.java
Removed:
    directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/ResultFilteringEnumeration.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/enumeration/SearchResultFilter.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/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=193118&r1=193117&r2=193118&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
Thu Jun 23 02:10:45 2005
@@ -33,7 +33,7 @@
 import org.apache.ldap.common.filter.ExprNode;
 import org.apache.ldap.common.name.DnParser;
 import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.enumeration.ResultFilteringEnumeration;
+import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
 import org.apache.ldap.server.enumeration.SearchResultFilter;
 import org.apache.ldap.server.interceptor.BaseInterceptor;
 import org.apache.ldap.server.interceptor.Interceptor;
@@ -382,7 +382,7 @@
         
         LdapContext ctx =
             ( LdapContext ) InvocationStack.getInstance().peek().getTarget();
-        return new ResultFilteringEnumeration( e, searchCtls, ctx,
+        return new SearchResultFilteringEnumeration( e, searchCtls, ctx,
                 new SearchResultFilter()
                 {
                     public boolean accept( LdapContext ctx, SearchResult result,
@@ -401,7 +401,7 @@
         LdapContext ctx =
             ( LdapContext ) InvocationStack.getInstance().peek().getTarget();
         
-        return new ResultFilteringEnumeration( e, null, ctx,
+        return new SearchResultFilteringEnumeration( e, null, ctx,
             new SearchResultFilter()
             {
                 public boolean accept( LdapContext ctx, SearchResult result,

Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java?rev=193118&r1=193117&r2=193118&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java
Thu Jun 23 02:10:45 2005
@@ -26,8 +26,8 @@
 /**
  * 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.enumeration.ResultFilteringEnumeration}.
 Multiple filters can
- * be applied one after the other and hence they are stackable.
+ * conjunction with a {@link SearchResultFilteringEnumeration}.
+ * 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>
  * @version $Rev$

Copied: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilteringEnumeration.java
(from r191831, directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/ResultFilteringEnumeration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilteringEnumeration.java?p2=directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilteringEnumeration.java&p1=directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/ResultFilteringEnumeration.java&r1=191831&r2=193118&rev=193118&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/ResultFilteringEnumeration.java
(original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilteringEnumeration.java
Thu Jun 23 02:10:45 2005
@@ -36,7 +36,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ResultFilteringEnumeration implements NamingEnumeration
+public class SearchResultFilteringEnumeration implements NamingEnumeration
 {
     /** the list of filters to be applied */
     private final List filters;
@@ -68,7 +68,7 @@
      * @param ctx the LDAP context that made the search creating this
      * enumeration
      */
-    public ResultFilteringEnumeration( NamingEnumeration decorated,
+    public SearchResultFilteringEnumeration( NamingEnumeration decorated,
                                        SearchControls searchControls,
                                        LdapContext ctx,
                                        SearchResultFilter filter )
@@ -100,7 +100,7 @@
      * @param ctx the LDAP context that made the search creating this
      * enumeration
      */
-    public ResultFilteringEnumeration( NamingEnumeration decorated,
+    public SearchResultFilteringEnumeration( NamingEnumeration decorated,
                                        SearchControls searchControls,
                                        LdapContext ctx,
                                        List filters )

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=193118&r1=193117&r2=193118&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
Thu Jun 23 02:10:45 2005
@@ -37,7 +37,7 @@
 import org.apache.ldap.common.schema.UsageEnum;
 import org.apache.ldap.common.util.DateUtils;
 import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.enumeration.ResultFilteringEnumeration;
+import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
 import org.apache.ldap.server.enumeration.SearchResultFilter;
 import org.apache.ldap.server.interceptor.BaseInterceptor;
 import org.apache.ldap.server.interceptor.NextInterceptor;
@@ -243,7 +243,7 @@
         NamingEnumeration e = nextInterceptor.list( base );
         LdapContext ctx =
             ( LdapContext ) InvocationStack.getInstance().peek().getTarget();
-        return new ResultFilteringEnumeration( e, new SearchControls(), ctx, SEARCH_FILTER
);
+        return new SearchResultFilteringEnumeration( e, new SearchControls(), ctx, SEARCH_FILTER
);
     }
 
 
@@ -259,7 +259,7 @@
 
         LdapContext ctx =
             ( LdapContext ) InvocationStack.getInstance().peek().getTarget();
-        return new ResultFilteringEnumeration( e, searchCtls, ctx, SEARCH_FILTER );
+        return new SearchResultFilteringEnumeration( e, searchCtls, ctx, SEARCH_FILTER );
     }
 
 

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=193118&r1=193117&r2=193118&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
Thu Jun 23 02:10:45 2005
@@ -49,7 +49,7 @@
 import org.apache.ldap.common.schema.Syntax;
 import org.apache.ldap.common.util.SingletonEnumeration;
 import org.apache.ldap.server.configuration.InterceptorConfiguration;
-import org.apache.ldap.server.enumeration.ResultFilteringEnumeration;
+import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
 import org.apache.ldap.server.enumeration.SearchResultFilter;
 import org.apache.ldap.server.interceptor.BaseInterceptor;
 import org.apache.ldap.server.interceptor.NextInterceptor;
@@ -122,7 +122,7 @@
     {
         NamingEnumeration e = nextInterceptor.list( base );
         LdapContext ctx = getContext();
-        return new ResultFilteringEnumeration( e, new SearchControls(), ctx, binaryAttributeFilter
);
+        return new SearchResultFilteringEnumeration( e, new SearchControls(), ctx, binaryAttributeFilter
);
     }
 
 
@@ -174,7 +174,7 @@
         }
 
         LdapContext ctx = getContext();
-        return new ResultFilteringEnumeration( e, searchCtls, ctx, binaryAttributeFilter
);
+        return new SearchResultFilteringEnumeration( e, searchCtls, ctx, binaryAttributeFilter
);
     }
 
 



Mime
View raw message