directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r951916 - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/ core-api/src/main/java/org/apache/directory/server/core/interceptor/ core-api/src/main/java/org/apache/directory/server/core/interceptor/contex...
Date Sun, 06 Jun 2010 18:05:13 GMT
Author: elecharny
Date: Sun Jun  6 18:05:12 2010
New Revision: 951916

URL: http://svn.apache.org/viewvc?rev=951916&view=rev
Log:
o Removed the listSuffixes() method from the Interceptor and OperamationManager interface.

o This operation now only exists in the PartitionNexus interceptor, and takes no parameter
o Removed the associated OperationContext

Removed:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListSuffixOperationContext.java
Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperationManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java
Sun Jun  6 18:05:12 2010
@@ -20,8 +20,6 @@
 package org.apache.directory.server.core;
 
 
-import java.util.Set;
-
 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;
@@ -30,7 +28,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
 import org.apache.directory.server.core.interceptor.context.ListOperationContext;
-import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 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.MoveAndRenameOperationContext;
@@ -60,12 +57,6 @@ public interface OperationManager
     /**
      * TODO document after determining if this method should be here.
      */
-    Set<String> listSuffixes( ListSuffixOperationContext opContext ) throws LdapException;
-
-
-    /**
-     * TODO document after determining if this method should be here.
-     */
     boolean compare( CompareOperationContext opContext) throws LdapException;
 
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
Sun Jun  6 18:05:12 2010
@@ -20,8 +20,6 @@
 package org.apache.directory.server.core.interceptor;
 
 
-import java.util.Set;
-
 import javax.naming.Context;
 
 import org.apache.directory.server.core.DirectoryService;
@@ -34,7 +32,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
 import org.apache.directory.server.core.interceptor.context.ListOperationContext;
-import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 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.MoveAndRenameOperationContext;
@@ -149,13 +146,6 @@ public abstract class BaseInterceptor im
     }
 
 
-    public Set<String> listSuffixes ( NextInterceptor next, ListSuffixOperationContext
opContext ) 
-        throws LdapException
-    {
-        return next.listSuffixes( opContext );
-    }
-
-
     public Entry lookup( NextInterceptor next, LookupOperationContext opContext ) throws
LdapException
     {
         return next.lookup( opContext );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
Sun Jun  6 18:05:12 2010
@@ -20,8 +20,6 @@
 package org.apache.directory.server.core.interceptor;
 
 
-import java.util.Set;
-
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
@@ -31,7 +29,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
 import org.apache.directory.server.core.interceptor.context.ListOperationContext;
-import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 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.MoveAndRenameOperationContext;
@@ -137,12 +134,6 @@ public interface Interceptor
 
 
     /**
-     * Filters {@link DefaultPartitionNexus#listSuffixes( ListSuffixOperationContext )} call.
-     */
-    Set<String> listSuffixes( NextInterceptor next, ListSuffixOperationContext opContext
) throws LdapException;
-
-
-    /**
      * Filters {@link DefaultPartitionNexus#compare( CompareOperationContext )} call.
      */
     boolean compare( NextInterceptor next, CompareOperationContext opContext) throws LdapException;

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
Sun Jun  6 18:05:12 2010
@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import javax.naming.ConfigurationException;
 
@@ -39,7 +38,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
 import org.apache.directory.server.core.interceptor.context.ListOperationContext;
-import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 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.MoveAndRenameOperationContext;
@@ -108,12 +106,6 @@ public class InterceptorChain
         }
 
 
-        public Set<String> listSuffixes( NextInterceptor next, ListSuffixOperationContext
opContext ) throws LdapException
-        {
-            return nexus.listSuffixes( opContext );
-        }
-
-
         public void delete( NextInterceptor next, DeleteOperationContext opContext ) throws
LdapException
         {
             nexus.delete( opContext );
@@ -554,28 +546,6 @@ public class InterceptorChain
     }
 
 
-    public Set<String> listSuffixes( ListSuffixOperationContext opContext ) throws
LdapException
-    {
-        Element entry = getStartingEntry();
-        Interceptor head = entry.interceptor;
-        NextInterceptor next = entry.nextInterceptor;
-
-        try
-        {
-            return head.listSuffixes( next, opContext );
-        }
-        catch ( LdapException le )
-        {
-            throw le;
-        }
-        catch ( Throwable e )
-        {
-            throwInterceptorException( head, e );
-            throw new InternalError(); // Should be unreachable
-        }
-    }
-
-
     /**
      * Eagerly populates fields of operation contexts so multiple Interceptors 
      * in the processing pathway can reuse this value without performing a 
@@ -978,27 +948,6 @@ public class InterceptorChain
                 }
 
 
-                public Set<String> listSuffixes( ListSuffixOperationContext opContext
) throws LdapException
-                {
-                    Element next = getNextEntry();
-                    Interceptor interceptor = next.interceptor;
-
-                    try
-                    {
-                        return interceptor.listSuffixes( next.nextInterceptor, opContext
);
-                    }
-                    catch ( LdapException le )
-                    {
-                        throw le;
-                    }
-                    catch ( Throwable e )
-                    {
-                        throwInterceptorException( interceptor, e );
-                        throw new InternalError(); // Should be unreachable
-                    }
-                }
-
-
                 public void delete( DeleteOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
Sun Jun  6 18:05:12 2010
@@ -20,8 +20,6 @@
 package org.apache.directory.server.core.interceptor;
 
 
-import java.util.Set;
-
 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;
@@ -30,7 +28,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
 import org.apache.directory.server.core.interceptor.context.ListOperationContext;
-import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 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.MoveAndRenameOperationContext;
@@ -65,12 +62,6 @@ public interface NextInterceptor
 
 
     /**
-     * Calls the next interceptor's {@link Interceptor#listSuffixes( NextInterceptor, ListSuffixOperationContext
)}.
-     */
-    Set<String> listSuffixes( ListSuffixOperationContext opContext ) throws LdapException;
-
-
-    /**
      * Calls the next interceptor's {@link Interceptor#delete(NextInterceptor, DeleteOperationContext
)}.
      */
     void delete( DeleteOperationContext opContext ) throws LdapException;

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
Sun Jun  6 18:05:12 2010
@@ -24,7 +24,6 @@ import java.util.Set;
 
 import org.apache.directory.server.core.interceptor.context.CompareOperationContext;
 import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
-import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -117,7 +116,7 @@ public interface PartitionNexus extends 
      * @return Iteration over ContextPartition suffix names as Names.
      * @throws Exception if there are any problems
      */
-    public Set<String> listSuffixes( ListSuffixOperationContext emptyContext ) throws
LdapException;
+    public Set<String> listSuffixes() throws LdapException;
 
 
     /**

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java
(original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java
Sun Jun  6 18:05:12 2010
@@ -21,7 +21,6 @@ package org.apache.directory.server.core
 
 
 import java.util.List;
-import java.util.Set;
 
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.Interceptor;
@@ -33,7 +32,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
 import org.apache.directory.server.core.interceptor.context.ListOperationContext;
-import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 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.MoveAndRenameOperationContext;
@@ -88,13 +86,6 @@ public class MockInterceptor implements 
     }
 
 
-    public Set<String> listSuffixes( NextInterceptor next, ListSuffixOperationContext
opContext ) throws LdapException
-    {
-        interceptors.add( this );
-        return next.listSuffixes( opContext );
-    }
-
-
     public boolean compare( NextInterceptor next, CompareOperationContext opContext ) throws
LdapException
     {
         interceptors.add( this );

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperationManager.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperationManager.java
(original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperationManager.java
Sun Jun  6 18:05:12 2010
@@ -19,8 +19,6 @@
  */
 package org.apache.directory.server.core;
 
-import java.util.Set;
-
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
@@ -31,7 +29,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
 import org.apache.directory.server.core.interceptor.context.ListOperationContext;
-import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 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.MoveAndRenameOperationContext;
@@ -86,11 +83,6 @@ public class MockOperationManager implem
         return null;
     }
 
-    public Set<String> listSuffixes( ListSuffixOperationContext opContext ) throws
LdapException
-    {
-        return null;
-    }
-
     public ClonedServerEntry lookup( LookupOperationContext opContext ) throws LdapException
     {
         return null;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
Sun Jun  6 18:05:12 2010
@@ -22,7 +22,6 @@ package org.apache.directory.server.core
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.InterceptorChain;
@@ -33,7 +32,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
 import org.apache.directory.server.core.interceptor.context.ListOperationContext;
-import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 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.MoveAndRenameOperationContext;
@@ -535,29 +533,6 @@ public class DefaultOperationManager imp
     /**
      * {@inheritDoc}
      */
-    public Set<String> listSuffixes( ListSuffixOperationContext opContext ) throws
LdapException
-    {
-        LOG.debug( ">> ListSuffixesOperation : {}", opContext );
-
-        ensureStarted();
-        push( opContext );
-
-        try
-        {
-            return directoryService.getInterceptorChain().listSuffixes( opContext );
-        }
-        finally
-        {
-            pop();
-
-            LOG.debug( "<< ListSuffixesOperation successful" );
-        }
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public Entry lookup( LookupOperationContext opContext ) throws LdapException
     {
         LOG.debug( ">> LookupOperation : {}", opContext );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java
Sun Jun  6 18:05:12 2010
@@ -72,7 +72,7 @@ public class ReferralManagerImpl impleme
         referrals = new DnBranchNode<Entry>();
         PartitionNexus nexus = directoryService.getPartitionNexus();
 
-        Set<String> suffixes = nexus.listSuffixes( null );
+        Set<String> suffixes = nexus.listSuffixes();
         
         init( directoryService, suffixes.toArray( new String[]{} ) );
         

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
Sun Jun  6 18:05:12 2010
@@ -42,7 +42,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
 import org.apache.directory.server.core.interceptor.context.ListOperationContext;
-import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 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.MoveAndRenameOperationContext;
@@ -259,18 +258,6 @@ public class AuthenticationInterceptor e
     }
 
 
-    public Set<String> listSuffixes( NextInterceptor next, ListSuffixOperationContext
opContext ) throws LdapException
-    {
-        if ( IS_DEBUG )
-        {
-            LOG.debug( "Operation Context: {}", opContext );
-        }
-
-        checkAuthenticated( opContext );
-        return next.listSuffixes( opContext );
-    }
-
-
     public Entry lookup( NextInterceptor next, LookupOperationContext opContext ) throws
LdapException
     {
         if ( IS_DEBUG )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
Sun Jun  6 18:05:12 2010
@@ -126,7 +126,7 @@ public class GroupCache
         // search all naming contexts for static groups and generate
         // normalized sets of members to cache within the map
 
-        Set<String> suffixes = nexus.listSuffixes( null );
+        Set<String> suffixes = nexus.listSuffixes();
 
         for ( String suffix:suffixes )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
Sun Jun  6 18:05:12 2010
@@ -116,7 +116,7 @@ public class TupleCache
         // search all naming contexts for access control subentenries
         // generate ACITuple Arrays for each subentry
         // add that subentry to the hash
-        Set<String> suffixes = nexus.listSuffixes( null );
+        Set<String> suffixes = nexus.listSuffixes();
 
         for ( String suffix:suffixes )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
Sun Jun  6 18:05:12 2010
@@ -19,7 +19,6 @@
  */
 package org.apache.directory.server.core.logger;
 
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -34,7 +33,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
 import org.apache.directory.server.core.interceptor.context.ListOperationContext;
-import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 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.MoveAndRenameOperationContext;
@@ -103,10 +101,6 @@ public class TimerInterceptor implements
     private static AtomicLong totalList = new AtomicLong( 0 );
     private static AtomicInteger nbListCalls = new AtomicInteger( 0 );
     
-    /** Stats for the ListSuffixes operation */
-    private static AtomicLong totalListSuffixes = new AtomicLong( 0 );
-    private static AtomicInteger nbListSuffixesCalls = new AtomicInteger( 0 );
-    
     /** Stats for the lookup operation */
     private static AtomicLong totalLookup = new AtomicLong( 0 );
     private static AtomicInteger nbLookupCalls = new AtomicInteger( 0 );
@@ -575,34 +569,4 @@ public class TimerInterceptor implements
             OPERATION_TIME.debug( "{} : Delta unbind = {}", name, delta );
         }
     }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    public Set<String> listSuffixes( NextInterceptor next, ListSuffixOperationContext
opContext ) throws LdapException
-    {
-        long t0 = System.nanoTime();
-        Set<String> suffixes = next.listSuffixes( opContext );
-        long delta = System.nanoTime() - t0;
-        
-        if ( IS_DEBUG_STATS )
-        {
-            nbListSuffixesCalls.incrementAndGet();
-            totalListSuffixes.getAndAdd( delta );
-    
-            if ( nbListSuffixesCalls.get() % 1000 == 0 )
-            {
-                long average = totalListSuffixes.get()/(nbListSuffixesCalls.get() * 1000);
-                OPERATION_STATS.debug( name + " : Average listSuffixes = {} microseconds,
nb listSuffixes = {}", average, nbListSuffixesCalls.get() );
-            }
-        }
-
-        if ( IS_DEBUG_TIME )
-        {
-            OPERATION_TIME.debug( "{} : Delta listSuffixes = {}", name, delta );
-        }
-        
-        return suffixes; 
-    }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
Sun Jun  6 18:05:12 2010
@@ -51,7 +51,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
 import org.apache.directory.server.core.interceptor.context.ListOperationContext;
-import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 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.MoveAndRenameOperationContext;
@@ -1059,9 +1058,8 @@ public class DefaultPartitionNexus exten
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.server.core.partition.PartitionNexus#listSuffixes(org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext)
      */
-    public Set<String> listSuffixes( ListSuffixOperationContext emptyContext ) throws
LdapException
+    public Set<String> listSuffixes() throws LdapException
     {
         return Collections.unmodifiableSet( partitions.keySet() );
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
Sun Jun  6 18:05:12 2010
@@ -24,16 +24,14 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-
 import org.apache.directory.server.constants.ApacheSchemaConstants;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
-import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.StringValue;
-import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.AndNode;
@@ -181,11 +179,7 @@ public class LdapClassLoader extends Cla
             {
                 List<DN> namingContexts = new ArrayList<DN>();
                 
-                // TODO - why is this an operation????  Why can't we just list these damn
things
-                // who went stupid crazy making everything into a damn operation  !!!! grrrr

-                Set<String> suffixes = 
-                    directoryService.getPartitionNexus().listSuffixes( 
-                        new ListSuffixOperationContext( directoryService.getAdminSession()
) );
+                Set<String> suffixes = directoryService.getPartitionNexus().listSuffixes();
 
                 for ( String suffix:suffixes )
                 {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
Sun Jun  6 18:05:12 2010
@@ -155,7 +155,7 @@ public class SubentryInterceptor extends
         evaluator = new SubtreeEvaluator( oidRegistry, schemaManager );
 
         // prepare to find all subentries in all namingContexts
-        Set<String> suffixes = this.nexus.listSuffixes( null );
+        Set<String> suffixes = nexus.listSuffixes();
         ExprNode filter = new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT,
new StringValue(
             SchemaConstants.SUBENTRY_OC ) );
         SearchControls controls = new SearchControls();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
Sun Jun  6 18:05:12 2010
@@ -116,7 +116,7 @@ public class TriggerSpecCache
         // search all naming contexts for trigger subentenries
         // generate TriggerSpecification arrays for each subentry
         // add that subentry to the hash
-        Set<String> suffixes = nexus.listSuffixes( null );
+        Set<String> suffixes = nexus.listSuffixes();
         
         for ( String suffix:suffixes )
         {

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
Sun Jun  6 18:05:12 2010
@@ -268,13 +268,6 @@ public class GracefulShutdownHandler imp
     public static GracefulDisconnect getGracefulDisconnect( int timeOffline, int delay )
     {
         // build the graceful disconnect message with replicationContexts
-        // @todo add the referral objects for replication contexts using setup code below
-        //        Iterator list = nexus.listSuffixes( true );
-        //        while ( list.hasNext() )
-        //        {
-        //            LdapName dn = new LdapName( ( String ) list.next() );
-        //            DirectoryPartition partition = nexus.getPartition( dn );
-        //        }
         return new GracefulDisconnect( timeOffline, delay );
     }
 

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java?rev=951916&r1=951915&r2=951916&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java
Sun Jun  6 18:05:12 2010
@@ -30,10 +30,8 @@ import java.util.Set;
 import javax.swing.JFrame;
 
 import org.apache.directory.server.constants.ServerDNConstants;
-import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.LdapPrincipal;
-import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
@@ -96,8 +94,7 @@ public class LaunchDiagnosticUiHandler i
         DN adminDn = new DN( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
         adminDn.normalize( service.getSchemaManager().getNormalizerMapping() );
         LdapPrincipal principal = new LdapPrincipal( adminDn, AuthenticationLevel.STRONG
);
-        CoreSession session = service.getSession( principal );
-        Set<String> suffixes = nexus.listSuffixes( new ListSuffixOperationContext(
session ) );
+        Set<String> suffixes = nexus.listSuffixes();
         int launchedWindowCount = 0;
             
         for ( String suffix:suffixes )



Mime
View raw message