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/14 02:47:58 UTC
svn commit: r528724 - in /directory/apacheds/trunk:
core/src/main/java/org/apache/directory/server/core/authn/
core/src/main/java/org/apache/directory/server/core/authz/
core/src/main/java/org/apache/directory/server/core/exception/
core/src/main/java/...
Author: elecharny
Date: Fri Apr 13 17:47:57 2007
New Revision: 528724
URL: http://svn.apache.org/viewvc?view=rev&rev=528724
Log:
Added an argument to the getRootDSE operation : a ServiceContext.
Created the GetRootDSEServiceContext to be used by all the interceptors
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/authz/AuthorizationService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.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/operational/OperationalAttributeService.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/PartitionNexus.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/schema/SchemaService.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.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=528724&r1=528723&r2=528724
==============================================================================
--- 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 13 17:47:57 2007
@@ -242,7 +242,7 @@
}
- public Attributes getRootDSE( NextInterceptor next ) throws NamingException
+ public Attributes getRootDSE( NextInterceptor next, ServiceContext getRootDSEContext ) throws NamingException
{
if ( IS_DEBUG )
{
@@ -250,7 +250,7 @@
}
checkAuthenticated();
- return next.getRootDSE();
+ return next.getRootDSE( getRootDSEContext );
}
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=528724&r1=528723&r2=528724
==============================================================================
--- 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 Fri Apr 13 17:47:57 2007
@@ -202,7 +202,7 @@
enabled = factoryCfg.getStartupConfiguration().isAccessControlEnabled();
// stuff for dealing with subentries (garbage for now)
- String subschemaSubentry = ( String ) factoryCfg.getPartitionNexus().getRootDSE().get( "subschemaSubentry" )
+ String subschemaSubentry = ( String ) factoryCfg.getPartitionNexus().getRootDSE( null ).get( "subschemaSubentry" )
.get();
LdapDN subschemaSubentryDnName = new LdapDN( subschemaSubentry );
subschemaSubentryDnName.normalize( attrRegistry.getNormalizerMapping() );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java?view=diff&rev=528724&r1=528723&r2=528724
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java Fri Apr 13 17:47:57 2007
@@ -91,7 +91,7 @@
{
nexus = factoryCfg.getPartitionNexus();
normalizerMap = factoryCfg.getRegistries().getAttributeTypeRegistry().getNormalizerMapping();
- Attribute attr = nexus.getRootDSE().get( "subschemaSubentry" );
+ Attribute attr = nexus.getRootDSE( null ).get( "subschemaSubentry" );
subschemSubentryDn = new LdapDN( ( String ) attr.get() );
subschemSubentryDn.normalize( normalizerMap );
}
@@ -228,7 +228,7 @@
if ( ctx.getDn().getNormName().equals( subschemSubentryDn.getNormName() ) )
{
- return nexus.getRootDSE();
+ return nexus.getRootDSE( null );
}
// check if entry to lookup exists
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=528724&r1=528723&r2=528724
==============================================================================
--- 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 13 17:47:57 2007
@@ -117,9 +117,9 @@
}
- public Attributes getRootDSE( NextInterceptor next ) throws NamingException
+ public Attributes getRootDSE( NextInterceptor next, ServiceContext getRootDSEContext ) throws NamingException
{
- return next.getRootDSE();
+ return next.getRootDSE( getRootDSEContext );
}
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=528724&r1=528723&r2=528724
==============================================================================
--- 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 13 17:47:57 2007
@@ -119,9 +119,9 @@
/**
- * Filters {@link PartitionNexus#getRootDSE()} call.
+ * Filters {@link PartitionNexus#getRootDSE( ServiceContext )} call.
*/
- Attributes getRootDSE( NextInterceptor next ) throws NamingException;
+ Attributes getRootDSE( NextInterceptor next, ServiceContext getRootDSEContext ) 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=528724&r1=528723&r2=528724
==============================================================================
--- 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 13 17:47:57 2007
@@ -85,9 +85,9 @@
}
- public Attributes getRootDSE( NextInterceptor next ) throws NamingException
+ public Attributes getRootDSE( NextInterceptor next, ServiceContext getRootDSEContext ) throws NamingException
{
- return nexus.getRootDSE();
+ return nexus.getRootDSE( getRootDSEContext );
}
@@ -522,14 +522,14 @@
}
- public Attributes getRootDSE() throws NamingException
+ public Attributes getRootDSE( ServiceContext getRootDSEContext ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
NextInterceptor next = entry.nextInterceptor;
try
{
- return head.getRootDSE( next );
+ return head.getRootDSE( next, getRootDSEContext );
}
catch ( NamingException ne )
{
@@ -1019,14 +1019,14 @@
}
- public Attributes getRootDSE() throws NamingException
+ public Attributes getRootDSE( ServiceContext getRootDSEContext ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
try
{
- return interceptor.getRootDSE( next.nextInterceptor );
+ return interceptor.getRootDSE( next.nextInterceptor, getRootDSEContext );
}
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=528724&r1=528723&r2=528724
==============================================================================
--- 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 13 17:47:57 2007
@@ -52,9 +52,9 @@
/**
- * Calls the next interceptor's {@link Interceptor#getRootDSE(NextInterceptor)}.
+ * Calls the next interceptor's {@link Interceptor#getRootDSE(NextInterceptor, ServiceContext )}.
*/
- Attributes getRootDSE() throws NamingException;
+ Attributes getRootDSE( ServiceContext getRootDSEContext ) throws NamingException;
/**
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=528724&r1=528723&r2=528724
==============================================================================
--- 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 Fri Apr 13 17:47:57 2007
@@ -138,7 +138,7 @@
isDenormalizeOpAttrsEnabled = factoryCfg.getStartupConfiguration().isDenormalizeOpAttrsEnabled();
// stuff for dealing with subentries (garbage for now)
- String subschemaSubentry = ( String ) nexus.getRootDSE().get( "subschemaSubentry" ).get();
+ String subschemaSubentry = ( String ) nexus.getRootDSE( null ).get( "subschemaSubentry" ).get();
subschemaSubentryDn = new LdapDN( subschemaSubentry );
subschemaSubentryDn.normalize( factoryCfg.getRegistries().getAttributeTypeRegistry().getNormalizerMapping() );
}
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=528724&r1=528723&r2=528724
==============================================================================
--- 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 13 17:47:57 2007
@@ -638,7 +638,7 @@
}
- public Attributes getRootDSE()
+ public Attributes getRootDSE( ServiceContext getRootDSEContext )
{
return rootDSE;
}
@@ -764,7 +764,7 @@
// -----------------------------------------------------------
if ( ids == null || ids.length == 0 )
{
- SearchResult result = new SearchResult( "", null, ( Attributes ) getRootDSE().clone(), false );
+ SearchResult result = new SearchResult( "", null, ( Attributes ) getRootDSE( null ).clone(), false );
return new SingletonEnumeration( result );
}
@@ -815,14 +815,14 @@
// return everything
if ( containsAsterisk && containsPlus )
{
- SearchResult result = new SearchResult( "", null, ( Attributes ) getRootDSE().clone(), false );
+ SearchResult result = new SearchResult( "", null, ( Attributes ) getRootDSE( null ).clone(), false );
return new SingletonEnumeration( result );
}
Attributes attrs = new AttributesImpl();
if ( containsAsterisk )
{
- for ( NamingEnumeration ii = getRootDSE().getAll(); ii.hasMore(); /**/ )
+ for ( NamingEnumeration ii = getRootDSE( null ).getAll(); ii.hasMore(); /**/ )
{
// add all user attribute
Attribute attr = ( Attribute ) ii.next();
@@ -840,7 +840,7 @@
}
else if ( containsPlus )
{
- for ( NamingEnumeration ii = getRootDSE().getAll(); ii.hasMore(); /**/ )
+ for ( NamingEnumeration ii = getRootDSE( null ).getAll(); ii.hasMore(); /**/ )
{
// add all operational attributes
Attribute attr = ( Attribute ) ii.next();
@@ -858,7 +858,7 @@
}
else
{
- for ( NamingEnumeration ii = getRootDSE().getAll(); ii.hasMore(); /**/ )
+ for ( NamingEnumeration ii = getRootDSE( null ).getAll(); ii.hasMore(); /**/ )
{
// add user attributes specifically asked for
Attribute attr = ( Attribute ) ii.next();
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java?view=diff&rev=528724&r1=528723&r2=528724
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java Fri Apr 13 17:47:57 2007
@@ -182,7 +182,7 @@
*
* @return the attributes of the RootDSE
*/
- public abstract Attributes getRootDSE() throws NamingException;
+ public abstract Attributes getRootDSE( ServiceContext getRootDSEContext ) throws NamingException;
/**
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=528724&r1=528723&r2=528724
==============================================================================
--- 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 13 17:47:57 2007
@@ -680,20 +680,20 @@
}
- public Attributes getRootDSE() throws NamingException
+ public Attributes getRootDSE( ServiceContext getRootDSEContext ) throws NamingException
{
- return getRootDSE( null );
+ return getRootDSE( null, null );
}
- public Attributes getRootDSE( Collection bypass ) throws NamingException
+ public Attributes getRootDSE( ServiceContext getRootDSEContext, Collection bypass ) throws NamingException
{
ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation( this, caller, "getRootDSE", null, bypass ) );
try
{
- return this.configuration.getInterceptorChain().getRootDSE();
+ return this.configuration.getInterceptorChain().getRootDSE( getRootDSEContext );
}
finally
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?view=diff&rev=528724&r1=528723&r2=528724
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Fri Apr 13 17:47:57 2007
@@ -204,7 +204,7 @@
schemaManager = factoryCfg.getSchemaManager();
// stuff for dealing with subentries (garbage for now)
- String subschemaSubentry = ( String ) nexus.getRootDSE().get( "subschemaSubentry" ).get();
+ String subschemaSubentry = ( String ) nexus.getRootDSE( null ).get( "subschemaSubentry" ).get();
subschemaSubentryDn = new LdapDN( subschemaSubentry );
subschemaSubentryDn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
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=528724&r1=528723&r2=528724
==============================================================================
--- 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 13 17:47:57 2007
@@ -289,10 +289,10 @@
}
- public Attributes getRootDSE( NextInterceptor next ) throws NamingException
+ public Attributes getRootDSE( NextInterceptor next, ServiceContext getRootDSEContext ) throws NamingException
{
interceptors.add( this );
- return next.getRootDSE();
+ return next.getRootDSE( getRootDSEContext );
}
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java?view=diff&rev=528724&r1=528723&r2=528724
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java Fri Apr 13 17:47:57 2007
@@ -274,7 +274,7 @@
*/
public void purgeAgedData() throws NamingException
{
- Attributes rootDSE = nexus.getRootDSE();
+ Attributes rootDSE = nexus.getRootDSE( null );
Attribute namingContextsAttr = rootDSE.get( "namingContexts" );
if ( namingContextsAttr == null || namingContextsAttr.size() == 0 )
{
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java?view=diff&rev=528724&r1=528723&r2=528724
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java Fri Apr 13 17:47:57 2007
@@ -311,7 +311,7 @@
private void sendAllEntries( ReplicationContext ctx ) throws NamingException
{
- Attributes rootDSE = ctx.getServiceConfiguration().getPartitionNexus().getRootDSE();
+ Attributes rootDSE = ctx.getServiceConfiguration().getPartitionNexus().getRootDSE( null );
Attribute namingContextsAttr = rootDSE.get( "namingContexts" );
if ( namingContextsAttr == null || namingContextsAttr.size() == 0 )