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/04/06 17:02:42 UTC
svn commit: r526188 - in /directory/apacheds/trunk/core/src:
main/java/org/apache/directory/server/core/authn/
main/java/org/apache/directory/server/core/interceptor/
main/java/org/apache/directory/server/core/normalization/
main/java/org/apache/direct...
Author: elecharny
Date: Fri Apr 6 08:02:37 2007
New Revision: 526188
URL: http://svn.apache.org/viewvc?view=rev&rev=526188
Log:
Completely removed the isSuffix() method, it's never used anywhere
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.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/partition/Partition.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java?view=diff&rev=526188&r1=526187&r2=526188
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java Fri Apr 6 08:02:37 2007
@@ -44,7 +44,6 @@
import org.apache.directory.server.core.interceptor.context.BindServiceContext;
import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
import org.apache.directory.server.core.interceptor.context.ServiceContext;
-import org.apache.directory.server.core.interceptor.context.SuffixServiceContext;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.LdapJndiProperties;
import org.apache.directory.server.core.jndi.ServerContext;
@@ -270,18 +269,6 @@
checkAuthenticated();
return next.hasEntry( name );
- }
-
-
- public boolean isSuffix( NextInterceptor next, ServiceContext suffixContext ) throws NamingException
- {
- if ( IS_DEBUG )
- {
- log.debug( "Testing suffix for name = '" + ((SuffixServiceContext)suffixContext).getSuffixDn().getUpName() + "'" );
- }
-
- checkAuthenticated();
- return next.isSuffix( suffixContext );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?view=diff&rev=526188&r1=526187&r2=526188
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java Fri Apr 6 08:02:37 2007
@@ -135,12 +135,6 @@
}
- public boolean isSuffix( NextInterceptor next, ServiceContext suffixContext ) throws NamingException
- {
- return next.isSuffix( suffixContext );
- }
-
-
public NamingEnumeration list( NextInterceptor next, LdapDN base ) throws NamingException
{
return next.list( base );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?view=diff&rev=526188&r1=526187&r2=526188
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java Fri Apr 6 08:02:37 2007
@@ -210,12 +210,6 @@
/**
- * Filters {@link Partition#isSuffix(ServiceContext)} call.
- */
- boolean isSuffix( NextInterceptor next, ServiceContext suffixContext ) throws NamingException;
-
-
- /**
* Filters {@link Partition#modifyRn(org.apache.directory.shared.ldap.name.LdapDN,String,boolean)} call.
*/
void modifyRn( NextInterceptor next, LdapDN name, String newRn, boolean deleteOldRn ) throws NamingException;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?view=diff&rev=526188&r1=526187&r2=526188
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java Fri Apr 6 08:02:37 2007
@@ -158,12 +158,6 @@
}
- public boolean isSuffix( NextInterceptor next, ServiceContext suffixContext ) throws NamingException
- {
- return nexus.isSuffix( suffixContext );
- }
-
-
public void modifyRn( NextInterceptor next, LdapDN name, String newRn, boolean deleteOldRn )
throws NamingException
{
@@ -881,27 +875,6 @@
}
- public boolean isSuffix( ServiceContext suffixContext ) throws NamingException
- {
- Entry entry = getStartingEntry();
- Interceptor head = entry.configuration.getInterceptor();
- NextInterceptor next = entry.nextInterceptor;
- try
- {
- return head.isSuffix( next, suffixContext );
- }
- catch ( NamingException ne )
- {
- throw ne;
- }
- catch ( Throwable e )
- {
- throwInterceptorException( head, e );
- throw new InternalError(); // Should be unreachable
- }
- }
-
-
public void modifyRn( LdapDN name, String newRn, boolean deleteOldRn ) throws NamingException
{
Entry entry = getStartingEntry();
@@ -1282,27 +1255,6 @@
try
{
return interceptor.hasEntry( next.nextInterceptor, name );
- }
- catch ( NamingException ne )
- {
- throw ne;
- }
- catch ( Throwable e )
- {
- throwInterceptorException( interceptor, e );
- throw new InternalError(); // Should be unreachable
- }
- }
-
-
- public boolean isSuffix( ServiceContext suffixContext ) throws NamingException
- {
- Entry next = getNextEntry();
- Interceptor interceptor = next.configuration.getInterceptor();
-
- try
- {
- return interceptor.isSuffix( next.nextInterceptor, suffixContext );
}
catch ( NamingException ne )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?view=diff&rev=526188&r1=526187&r2=526188
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java Fri Apr 6 08:02:37 2007
@@ -137,12 +137,6 @@
/**
- * Calls the next interceptor's {@link Interceptor#isSuffix(NextInterceptor, ServiceContext)}.
- */
- boolean isSuffix( ServiceContext suffixContext ) throws NamingException;
-
-
- /**
* Calls the next interceptor's {@link Interceptor#modifyRn(NextInterceptor,org.apache.directory.shared.ldap.name.LdapDN,String,boolean)}.
*/
void modifyRn( LdapDN name, String newRn, boolean deleteOldRn ) throws NamingException;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java?view=diff&rev=526188&r1=526187&r2=526188
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java Fri Apr 6 08:02:37 2007
@@ -36,7 +36,6 @@
import org.apache.directory.server.core.interceptor.context.BindServiceContext;
import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
import org.apache.directory.server.core.interceptor.context.ServiceContext;
-import org.apache.directory.server.core.interceptor.context.SuffixServiceContext;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.schema.ConcreteNameComponentNormalizer;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
@@ -349,13 +348,6 @@
{
name = LdapDN.normalize( name, attrNormalizers );
return nextInterceptor.hasEntry( name );
- }
-
-
- public boolean isSuffix( NextInterceptor nextInterceptor, ServiceContext suffixContext ) throws NamingException
- {
- LdapDN.normalize( ((SuffixServiceContext)suffixContext).getSuffixDn(), attrNormalizers );
- return nextInterceptor.isSuffix( suffixContext );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java?view=diff&rev=526188&r1=526187&r2=526188
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java Fri Apr 6 08:02:37 2007
@@ -34,7 +34,6 @@
import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
import org.apache.directory.server.core.interceptor.context.ServiceContext;
-import org.apache.directory.server.core.interceptor.context.SuffixServiceContext;
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -177,12 +176,6 @@
}
return suffixDn;
- }
-
-
- public final boolean isSuffix( ServiceContext suffixContext ) throws NamingException
- {
- return getSuffix().equals( ((SuffixServiceContext)suffixContext).getSuffixDn() );
}
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?view=diff&rev=526188&r1=526187&r2=526188
==============================================================================
--- 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 Fri Apr 6 08:02:37 2007
@@ -47,7 +47,6 @@
import org.apache.directory.server.core.interceptor.context.BindServiceContext;
import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
import org.apache.directory.server.core.interceptor.context.ServiceContext;
-import org.apache.directory.server.core.interceptor.context.SuffixServiceContext;
import org.apache.directory.server.core.interceptor.context.UnbindServiceContext;
import org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
@@ -942,15 +941,6 @@
Partition backend = getBackend( dn );
return backend.hasEntry( dn );
- }
-
-
- /**
- * @see Partition#isSuffix(org.apache.directory.shared.ldap.name.LdapDN)
- */
- public boolean isSuffix( ServiceContext suffixContext )
- {
- return partitions.containsKey( ((SuffixServiceContext)suffixContext).getSuffixDn().getNormName() );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/Partition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/Partition.java?view=diff&rev=526188&r1=526187&r2=526188
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/Partition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/Partition.java Fri Apr 6 08:02:37 2007
@@ -212,17 +212,6 @@
*/
boolean hasEntry( LdapDN name ) throws NamingException;
-
- /**
- * Checks to see if name is a context suffix.
- *
- * @param suffixContext the context associated with the isSuffix operation
- * @return true if the name is a context suffix, false if it is not.
- * @throws NamingException if there are any problems
- */
- boolean isSuffix( ServiceContext suffixContext ) throws NamingException;
-
-
/**
* Modifies an entry by changing its relative name. Optionally attributes
* associated with the old relative name can be removed from the entry.
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java?view=diff&rev=526188&r1=526187&r2=526188
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java Fri Apr 6 08:02:37 2007
@@ -543,29 +543,6 @@
}
- public boolean isSuffix( ServiceContext suffixContext ) throws NamingException
- {
- return isSuffix( suffixContext, null );
- }
-
-
- public boolean isSuffix( ServiceContext suffixContext, Collection bypass ) throws NamingException
- {
- ensureStarted();
- InvocationStack stack = InvocationStack.getInstance();
- stack.push( new Invocation( this, caller, "isSuffix", new Object[]
- { suffixContext }, bypass ) );
- try
- {
- return this.configuration.getInterceptorChain().isSuffix( suffixContext );
- }
- finally
- {
- stack.pop();
- }
- }
-
-
public void modifyRn( LdapDN name, String newRn, boolean deleteOldRn ) throws NamingException
{
modifyRn( name, newRn, deleteOldRn, null );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?view=diff&rev=526188&r1=526187&r2=526188
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Fri Apr 6 08:02:37 2007
@@ -36,7 +36,6 @@
import org.apache.directory.server.core.enumeration.SearchResultEnumeration;
import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
import org.apache.directory.server.core.interceptor.context.ServiceContext;
-import org.apache.directory.server.core.interceptor.context.SuffixServiceContext;
import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.core.partition.Oid;
import org.apache.directory.server.core.partition.impl.btree.gui.PartitionViewer;
@@ -485,12 +484,6 @@
public abstract boolean isInitialized();
-
-
- public boolean isSuffix( ServiceContext suffixContext ) throws NamingException
- {
- return getSuffix().equals( ((SuffixServiceContext)suffixContext).getSuffixDn() );
- }
public void inspect() throws Exception
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java?view=diff&rev=526188&r1=526187&r2=526188
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java Fri Apr 6 08:02:37 2007
@@ -397,13 +397,6 @@
}
- public boolean isSuffix( NextInterceptor next, ServiceContext suffixContext ) throws NamingException
- {
- interceptors.add( this );
- return next.isSuffix( suffixContext );
- }
-
-
public void modifyRn( NextInterceptor next, LdapDN name, String newRn, boolean deleteOldRn )
throws NamingException
{