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 2011/11/04 18:25:08 UTC
svn commit: r1197677 - in /directory/apacheds/branches/apacheds-osgi:
core-api/src/main/java/org/apache/directory/server/core/api/interceptor/
core-api/src/main/java/org/apache/directory/server/core/api/partition/
core/src/test/java/org/apache/director...
Author: elecharny
Date: Fri Nov 4 17:25:07 2011
New Revision: 1197677
URL: http://svn.apache.org/viewvc?rev=1197677&view=rev
Log:
o Removed the BypassConstants class, it's now useless
o Removed useless imports
Removed:
directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/ByPassConstants.java
Modified:
directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/InterceptorChain.java
directory/apacheds/branches/apacheds-osgi/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
directory/apacheds/branches/apacheds-osgi/interceptors/collective/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/InterceptorChain.java?rev=1197677&r1=1197676&r2=1197677&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/InterceptorChain.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/InterceptorChain.java Fri Nov 4 17:25:07 2011
@@ -46,7 +46,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.api.interceptor.context.UnbindOperationContext;
import org.apache.directory.server.core.api.invocation.InvocationStack;
-import org.apache.directory.server.core.api.partition.ByPassConstants;
import org.apache.directory.server.core.api.partition.PartitionNexus;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
@@ -482,11 +481,6 @@ public class InterceptorChain
return head;
}
- if ( opContext.isBypassed( ByPassConstants.BYPASS_ALL ) )
- {
- return tail;
- }
-
Element next = head;
while ( next != tail )
Modified: directory/apacheds/branches/apacheds-osgi/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java?rev=1197677&r1=1197676&r2=1197677&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java Fri Nov 4 17:25:07 2011
@@ -35,7 +35,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.interceptor.InterceptorChain;
import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.api.invocation.InvocationStack;
-import org.apache.directory.server.core.api.partition.ByPassConstants;
import org.apache.directory.server.core.shared.DefaultCoreSession;
import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.model.name.Dn;
@@ -228,27 +227,4 @@ public class InterceptorChainTest
assertEquals( "2", interceptors.get( 1 ).getName() );
assertEquals( "4", interceptors.get( 2 ).getName() );
}
-
-
- @Test
- public void testCompleteBypass() throws Exception
- {
- Dn dn = new Dn( schemaManager, "ou=system" );
- DirectoryService ds = new MockDirectoryService( 0 );
- DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( schemaManager, new Dn( schemaManager ), AuthenticationLevel.STRONG ),
- ds );
- LookupOperationContext lookupContext = new LookupOperationContext( session, dn );
- lookupContext.setByPassed( ByPassConstants.BYPASS_ALL_COLLECTION );
- InvocationStack.getInstance().push( lookupContext );
-
- try
- {
- chain.lookup( lookupContext );
- }
- catch ( Exception e )
- {
- }
-
- assertEquals( 0, interceptors.size() );
- }
}
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/collective/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/collective/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=1197677&r1=1197676&r2=1197677&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/collective/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/collective/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Fri Nov 4 17:25:07 2011
@@ -38,7 +38,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.interceptor.context.OperationContext;
import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext;
-import org.apache.directory.server.core.api.partition.ByPassConstants;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.entry.Attribute;