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/15 21:08:15 UTC
svn commit: r529046 [1/5] - in /directory/apacheds/trunk/core/src:
main/java/org/apache/directory/server/core/
main/java/org/apache/directory/server/core/authn/
main/java/org/apache/directory/server/core/authz/
main/java/org/apache/directory/server/cor...
Author: elecharny
Date: Sun Apr 15 12:08:12 2007
New Revision: 529046
URL: http://svn.apache.org/viewvc?view=rev&rev=529046
Log:
Added a ListOperationContext
Switched from ServiceContext to OperationContext for every contexts, as suggested by Alex
Used opContext in arguments instead of xxxContext like listContext, lookupContext, etc.
Added:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/BindServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/CompareServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/EmptyOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/EmptyServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/EntryServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetRootDSEOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetRootDSEServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetSuffixOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetSuffixServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/LookupOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/LookupServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/ServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/RemoveContextPartitionOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/RemoveContextPartitionServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/RenameServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/ReplaceOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/ReplaceServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java
- copied, changed from r528981, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindServiceContext.java
Removed:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/BindServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/CompareServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/EmptyServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/EntryServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetRootDSEServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetSuffixServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/LookupServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/RemoveContextPartitionServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/RenameServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/ReplaceServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/ServiceContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindServiceContext.java
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
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/authn/SimpleAuthenticator.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/authz/DefaultAuthorizationService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventService.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/jndi/AbstractContextFactory.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.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/operational/OperationalAttributeService.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/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/partition/impl/btree/BTreePartition.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.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/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?view=diff&rev=529046&r1=529045&r2=529046
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Sun Apr 15 12:08:12 2007
@@ -41,10 +41,10 @@
import org.apache.directory.server.core.configuration.StartupConfiguration;
import org.apache.directory.server.core.interceptor.Interceptor;
import org.apache.directory.server.core.interceptor.InterceptorChain;
-import org.apache.directory.server.core.interceptor.context.AddContextPartitionServiceContext;
-import org.apache.directory.server.core.interceptor.context.AddServiceContext;
-import org.apache.directory.server.core.interceptor.context.EntryServiceContext;
-import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
+import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
+import org.apache.directory.server.core.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.jndi.AbstractContextFactory;
import org.apache.directory.server.core.jndi.DeadContext;
import org.apache.directory.server.core.jndi.PropertyKeys;
@@ -459,7 +459,7 @@
/*
* If the admin entry is there, then the database was already created
*/
- if ( !partitionNexus.hasEntry( new EntryServiceContext( PartitionNexus.getAdminName() ) ) )
+ if ( !partitionNexus.hasEntry( new EntryOperationContext( PartitionNexus.getAdminName() ) ) )
{
firstStart = true;
@@ -480,7 +480,7 @@
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
attributes.put( SchemaConstants.DISPLAY_NAME_AT, "Directory Superuser" );
- partitionNexus.add( new AddServiceContext( PartitionNexus.getAdminName(),
+ partitionNexus.add( new AddOperationContext( PartitionNexus.getAdminName(),
attributes ) );
}
@@ -492,7 +492,7 @@
LdapDN userDn = new LdapDN( "ou=users,ou=system" );
userDn.normalize( oidsMap );
- if ( !partitionNexus.hasEntry( new EntryServiceContext( userDn ) ) )
+ if ( !partitionNexus.hasEntry( new EntryOperationContext( userDn ) ) )
{
firstStart = true;
@@ -506,7 +506,7 @@
attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
- partitionNexus.add( new AddServiceContext( userDn, attributes ) );
+ partitionNexus.add( new AddOperationContext( userDn, attributes ) );
}
// -------------------------------------------------------------------
@@ -516,7 +516,7 @@
LdapDN groupDn = new LdapDN( "ou=groups,ou=system" );
groupDn.normalize( oidsMap );
- if ( !partitionNexus.hasEntry( new EntryServiceContext( groupDn ) ) )
+ if ( !partitionNexus.hasEntry( new EntryOperationContext( groupDn ) ) )
{
firstStart = true;
@@ -530,7 +530,7 @@
attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
- partitionNexus.add( new AddServiceContext( groupDn, attributes ) );
+ partitionNexus.add( new AddOperationContext( groupDn, attributes ) );
}
// -------------------------------------------------------------------
@@ -541,7 +541,7 @@
LdapDN normName = new LdapDN( "cn=administrators,ou=groups,ou=system" );
normName.normalize( oidsMap );
- if ( !partitionNexus.hasEntry( new EntryServiceContext( normName ) ) )
+ if ( !partitionNexus.hasEntry( new EntryOperationContext( normName ) ) )
{
firstStart = true;
@@ -555,7 +555,7 @@
attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
- partitionNexus.add( new AddServiceContext( normName, attributes ) );
+ partitionNexus.add( new AddOperationContext( normName, attributes ) );
Interceptor authzInterceptor = interceptorChain.get( "authorizationService" );
@@ -585,7 +585,7 @@
LdapDN configurationDn = new LdapDN( "ou=configuration,ou=system" );
configurationDn.normalize( oidsMap );
- if ( !partitionNexus.hasEntry( new EntryServiceContext( configurationDn ) ) )
+ if ( !partitionNexus.hasEntry( new EntryOperationContext( configurationDn ) ) )
{
firstStart = true;
@@ -599,7 +599,7 @@
attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
- partitionNexus.add( new AddServiceContext( configurationDn, attributes ) );
+ partitionNexus.add( new AddOperationContext( configurationDn, attributes ) );
}
// -------------------------------------------------------------------
@@ -609,7 +609,7 @@
LdapDN partitionsDn = new LdapDN( "ou=partitions,ou=configuration,ou=system" );
partitionsDn.normalize( oidsMap );
- if ( !partitionNexus.hasEntry( new EntryServiceContext( partitionsDn ) ) )
+ if ( !partitionNexus.hasEntry( new EntryOperationContext( partitionsDn ) ) )
{
firstStart = true;
@@ -623,7 +623,7 @@
attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
- partitionNexus.add( new AddServiceContext( partitionsDn, attributes ) );
+ partitionNexus.add( new AddOperationContext( partitionsDn, attributes ) );
}
// -------------------------------------------------------------------
@@ -633,7 +633,7 @@
LdapDN servicesDn = new LdapDN( "ou=services,ou=configuration,ou=system" );
servicesDn.normalize( oidsMap );
- if ( !partitionNexus.hasEntry( new EntryServiceContext( servicesDn ) ) )
+ if ( !partitionNexus.hasEntry( new EntryOperationContext( servicesDn ) ) )
{
firstStart = true;
@@ -647,7 +647,7 @@
attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
- partitionNexus.add( new AddServiceContext( servicesDn, attributes ) );
+ partitionNexus.add( new AddOperationContext( servicesDn, attributes ) );
}
// -------------------------------------------------------------------
@@ -657,7 +657,7 @@
LdapDN interceptorsDn = new LdapDN( "ou=interceptors,ou=configuration,ou=system" );
interceptorsDn.normalize( oidsMap );
- if ( !partitionNexus.hasEntry( new EntryServiceContext( interceptorsDn ) ) )
+ if ( !partitionNexus.hasEntry( new EntryOperationContext( interceptorsDn ) ) )
{
firstStart = true;
@@ -671,7 +671,7 @@
attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
- partitionNexus.add( new AddServiceContext( interceptorsDn, attributes ) );
+ partitionNexus.add( new AddOperationContext( interceptorsDn, attributes ) );
}
// -------------------------------------------------------------------
@@ -681,7 +681,7 @@
LdapDN sysPrefRootDn = new LdapDN( "prefNodeName=sysPrefRoot,ou=system");
sysPrefRootDn.normalize( oidsMap );
- if ( !partitionNexus.hasEntry( new EntryServiceContext( sysPrefRootDn ) ) )
+ if ( !partitionNexus.hasEntry( new EntryOperationContext( sysPrefRootDn ) ) )
{
firstStart = true;
@@ -696,7 +696,7 @@
attributes.put( SchemaConstants.CREATORS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED );
attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
- partitionNexus.add( new AddServiceContext( sysPrefRootDn, attributes ) );
+ partitionNexus.add( new AddOperationContext( sysPrefRootDn, attributes ) );
}
return firstStart;
@@ -714,7 +714,7 @@
LdapDN adminDn = new LdapDN( PartitionNexus.ADMIN_PRINCIPAL );
adminDn.normalize( configuration.getRegistries().getAttributeTypeRegistry().getNormalizerMapping() );
- Attributes adminEntry = partitionNexus.lookup( new LookupServiceContext( adminDn ) );
+ Attributes adminEntry = partitionNexus.lookup( new LookupOperationContext( adminDn ) );
Object userPassword = adminEntry.get( SchemaConstants.USER_PASSWORD_AT ).get();
if ( userPassword instanceof byte[] )
{
@@ -989,7 +989,7 @@
partitionNexus = new DefaultPartitionNexus( new AttributesImpl() );
partitionNexus.init( configuration, null );
- partitionNexus.addContextPartition( new AddContextPartitionServiceContext( schemaPartitionConfig ) );
+ partitionNexus.addContextPartition( new AddContextPartitionOperationContext( schemaPartitionConfig ) );
interceptorChain = new InterceptorChain();
interceptorChain.init( configuration );
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=529046&r1=529045&r2=529046
==============================================================================
--- 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 Sun Apr 15 12:08:12 2007
@@ -41,14 +41,14 @@
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.Interceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
-import org.apache.directory.server.core.interceptor.context.AddServiceContext;
-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.ModifyServiceContext;
-import org.apache.directory.server.core.interceptor.context.MoveAndRenameServiceContext;
-import org.apache.directory.server.core.interceptor.context.RenameServiceContext;
-import org.apache.directory.server.core.interceptor.context.MoveServiceContext;
-import org.apache.directory.server.core.interceptor.context.ServiceContext;
+import org.apache.directory.server.core.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.interceptor.context.BindOperationContext;
+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;
+import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
+import org.apache.directory.server.core.interceptor.context.OperationContext;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.LdapJndiProperties;
import org.apache.directory.server.core.jndi.ServerContext;
@@ -203,46 +203,46 @@
}
- public void add( NextInterceptor next, ServiceContext addContext ) throws NamingException
+ public void add( NextInterceptor next, OperationContext opContext ) throws NamingException
{
if ( IS_DEBUG )
{
log.debug( "Adding the entry " +
- AttributeUtils.toString( ((AddServiceContext)addContext).getEntry() ) +
- " for DN = '" + addContext.getDn().getUpName() + "'" );
+ AttributeUtils.toString( ((AddOperationContext)opContext).getEntry() ) +
+ " for DN = '" + opContext.getDn().getUpName() + "'" );
}
checkAuthenticated( MessageTypeEnum.ADD_REQUEST );
- next.add( addContext );
+ next.add( opContext );
}
- public void delete( NextInterceptor next, ServiceContext deleteContext ) throws NamingException
+ public void delete( NextInterceptor next, OperationContext opContext ) throws NamingException
{
if ( IS_DEBUG )
{
- log.debug( "Deleting name = '" + deleteContext.getDn().getUpName() + "'" );
+ log.debug( "Deleting name = '" + opContext.getDn().getUpName() + "'" );
}
checkAuthenticated( MessageTypeEnum.DEL_REQUEST );
- next.delete( deleteContext );
- invalidateAuthenticatorCaches( deleteContext.getDn() );
+ next.delete( opContext );
+ invalidateAuthenticatorCaches( opContext.getDn() );
}
- public LdapDN getMatchedName ( NextInterceptor next, ServiceContext getMatchedNameContext ) throws NamingException
+ public LdapDN getMatchedName ( NextInterceptor next, OperationContext opContext ) throws NamingException
{
if ( IS_DEBUG )
{
- log.debug( "Matching name = '" + getMatchedNameContext.getDn().getUpName() + "'" );
+ log.debug( "Matching name = '" + opContext.getDn().getUpName() + "'" );
}
checkAuthenticated();
- return next.getMatchedName( getMatchedNameContext );
+ return next.getMatchedName( opContext );
}
- public Attributes getRootDSE( NextInterceptor next, ServiceContext getRootDSEContext ) throws NamingException
+ public Attributes getRootDSE( NextInterceptor next, OperationContext opContext ) throws NamingException
{
if ( IS_DEBUG )
{
@@ -250,47 +250,47 @@
}
checkAuthenticated();
- return next.getRootDSE( getRootDSEContext );
+ return next.getRootDSE( opContext );
}
- public LdapDN getSuffix ( NextInterceptor next, ServiceContext getSuffixContext ) throws NamingException
+ public LdapDN getSuffix ( NextInterceptor next, OperationContext opContext ) throws NamingException
{
if ( IS_DEBUG )
{
- log.debug( "Getting suffix for name = '" + getSuffixContext.getDn().getUpName() + "'" );
+ log.debug( "Getting suffix for name = '" + opContext.getDn().getUpName() + "'" );
}
checkAuthenticated();
- return next.getSuffix( getSuffixContext );
+ return next.getSuffix( opContext );
}
- public boolean hasEntry( NextInterceptor next, ServiceContext entryContext ) throws NamingException
+ public boolean hasEntry( NextInterceptor next, OperationContext opContext ) throws NamingException
{
if ( IS_DEBUG )
{
- log.debug( "Testing if entry name = '" + entryContext.getDn().getUpName() + "' exists" );
+ log.debug( "Testing if entry name = '" + opContext.getDn().getUpName() + "' exists" );
}
checkAuthenticated();
- return next.hasEntry( entryContext );
+ return next.hasEntry( opContext );
}
- public NamingEnumeration list( NextInterceptor next, LdapDN base ) throws NamingException
+ public NamingEnumeration list( NextInterceptor next, OperationContext opContext ) throws NamingException
{
if ( IS_DEBUG )
{
- log.debug( "Listing base = '" + base.toString() + "'" );
+ log.debug( "Listing base = '" + opContext.getDn().getUpName() + "'" );
}
checkAuthenticated();
- return next.list( base );
+ return next.list( opContext );
}
- public Iterator listSuffixes ( NextInterceptor next, ServiceContext emptyContext ) throws NamingException
+ public Iterator listSuffixes ( NextInterceptor next, OperationContext opContext ) throws NamingException
{
if ( IS_DEBUG )
{
@@ -298,15 +298,15 @@
}
checkAuthenticated();
- return next.listSuffixes( emptyContext );
+ return next.listSuffixes( opContext );
}
- public Attributes lookup( NextInterceptor next, ServiceContext lookupContext ) throws NamingException
+ public Attributes lookup( NextInterceptor next, OperationContext opContext ) throws NamingException
{
if ( IS_DEBUG )
{
- LookupServiceContext ctx = (LookupServiceContext)lookupContext;
+ LookupOperationContext ctx = (LookupOperationContext)opContext;
List<String> attrIds = ctx.getAttrsId();
@@ -322,7 +322,7 @@
}
checkAuthenticated();
- return next.lookup( lookupContext );
+ return next.lookup( opContext );
}
private void invalidateAuthenticatorCaches( LdapDN principalDn )
@@ -340,18 +340,18 @@
}
- public void modify( NextInterceptor next, ServiceContext modifyContext ) throws NamingException
+ public void modify( NextInterceptor next, OperationContext opContext ) throws NamingException
{
if ( IS_DEBUG )
{
- log.debug( "Modifying name = '" + modifyContext.getDn().getUpName() +
+ log.debug( "Modifying name = '" + opContext.getDn().getUpName() +
"', modifs = " + AttributeUtils.toString(
- ((ModifyServiceContext)modifyContext).getMods() ) );
+ ((ModifyOperationContext)opContext).getMods() ) );
}
checkAuthenticated( MessageTypeEnum.MODIFY_REQUEST );
- next.modify( modifyContext );
- invalidateAuthenticatorCaches( modifyContext.getDn() );
+ next.modify( opContext );
+ invalidateAuthenticatorCaches( opContext.getDn() );
}
@@ -368,49 +368,49 @@
}
- public void rename( NextInterceptor next, ServiceContext renameContext ) throws NamingException
+ public void rename( NextInterceptor next, OperationContext opContext ) throws NamingException
{
if ( IS_DEBUG )
{
- log.debug( "Modifying name = '" + renameContext.getDn().getUpName() + "', new RDN = '" +
- ((RenameServiceContext)renameContext).getNewRdn() + "', " +
- "oldRDN = '" + ((RenameServiceContext)renameContext).getDelOldDn() + "'" );
+ log.debug( "Modifying name = '" + opContext.getDn().getUpName() + "', new RDN = '" +
+ ((RenameOperationContext)opContext).getNewRdn() + "', " +
+ "oldRDN = '" + ((RenameOperationContext)opContext).getDelOldDn() + "'" );
}
checkAuthenticated( MessageTypeEnum.MOD_DN_REQUEST );
- next.rename( renameContext );
- invalidateAuthenticatorCaches( renameContext.getDn() );
+ next.rename( opContext );
+ invalidateAuthenticatorCaches( opContext.getDn() );
}
- public void moveAndRename( NextInterceptor next, ServiceContext moveAndRenameContext )
+ public void moveAndRename( NextInterceptor next, OperationContext opContext )
throws NamingException
{
if ( IS_DEBUG )
{
- log.debug( "Moving name = '" + moveAndRenameContext.getDn().getUpName() + "' to name = '" +
- ((MoveAndRenameServiceContext)moveAndRenameContext).getParent() + "', new RDN = '" +
- ((MoveAndRenameServiceContext)moveAndRenameContext).getNewRdn() + "', oldRDN = '" +
- ((MoveAndRenameServiceContext)moveAndRenameContext).getDelOldDn() + "'" );
+ log.debug( "Moving name = '" + opContext.getDn().getUpName() + "' to name = '" +
+ ((MoveAndRenameOperationContext)opContext).getParent() + "', new RDN = '" +
+ ((MoveAndRenameOperationContext)opContext).getNewRdn() + "', oldRDN = '" +
+ ((MoveAndRenameOperationContext)opContext).getDelOldDn() + "'" );
}
checkAuthenticated( MessageTypeEnum.MOD_DN_REQUEST );
- next.moveAndRename( moveAndRenameContext );
- invalidateAuthenticatorCaches( moveAndRenameContext.getDn() );
+ next.moveAndRename( opContext );
+ invalidateAuthenticatorCaches( opContext.getDn() );
}
- public void move( NextInterceptor next, ServiceContext moveContext ) throws NamingException
+ public void move( NextInterceptor next, OperationContext opContext ) throws NamingException
{
if ( IS_DEBUG )
{
- log.debug( "Moving name = '" + moveContext.getDn().getUpName() + " to name = '" +
- ((MoveServiceContext)moveContext).getParent().getUpName() + "'" );
+ log.debug( "Moving name = '" + opContext.getDn().getUpName() + " to name = '" +
+ ((MoveOperationContext)opContext).getParent().getUpName() + "'" );
}
checkAuthenticated( MessageTypeEnum.MOD_DN_REQUEST );
- next.move( moveContext );
- invalidateAuthenticatorCaches( moveContext.getDn() );
+ next.move( opContext );
+ invalidateAuthenticatorCaches( opContext.getDn() );
}
@@ -459,12 +459,12 @@
}
- public void bind( NextInterceptor next, ServiceContext bindContext )
+ public void bind( NextInterceptor next, OperationContext opContext )
throws NamingException
{
// The DN is always normalized here
- LdapDN normBindDn = bindContext.getDn();
- String bindUpDn = bindContext.getDn().getUpName();
+ LdapDN normBindDn = opContext.getDn();
+ String bindUpDn = opContext.getDn().getUpName();
if ( IS_DEBUG )
{
@@ -493,7 +493,7 @@
// pick the first matching authenticator type
Collection<Authenticator> authenticators = null;
- for ( String mechanism:((BindServiceContext)bindContext).getMechanisms() )
+ for ( String mechanism:((BindOperationContext)opContext).getMechanisms() )
{
authenticators = getAuthenticators( mechanism );
@@ -508,7 +508,7 @@
log.debug( "No authenticators found, delegating bind to the nexus." );
// as a last resort try binding via the nexus
- next.bind( bindContext );
+ next.bind( opContext );
log.debug( "Nexus succeeded on bind operation." );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?view=diff&rev=529046&r1=529045&r2=529046
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Sun Apr 15 12:08:12 2007
@@ -34,7 +34,7 @@
import javax.naming.directory.Attributes;
import org.apache.commons.collections.map.LRUMap;
-import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.ServerContext;
@@ -266,7 +266,7 @@
try
{
- LookupServiceContext lookupContex = new LookupServiceContext( new String[] { SchemaConstants.USER_PASSWORD_AT } );
+ LookupOperationContext lookupContex = new LookupOperationContext( new String[] { SchemaConstants.USER_PASSWORD_AT } );
lookupContex.setDn( principalDn );
userEntry = proxy.lookup( lookupContex, USERLOOKUP_BYPASS );
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=529046&r1=529045&r2=529046
==============================================================================
--- 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 Sun Apr 15 12:08:12 2007
@@ -30,14 +30,14 @@
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.InterceptorChain;
import org.apache.directory.server.core.interceptor.NextInterceptor;
-import org.apache.directory.server.core.interceptor.context.AddServiceContext;
-import org.apache.directory.server.core.interceptor.context.CompareServiceContext;
-import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
-import org.apache.directory.server.core.interceptor.context.ModifyServiceContext;
-import org.apache.directory.server.core.interceptor.context.MoveAndRenameServiceContext;
-import org.apache.directory.server.core.interceptor.context.RenameServiceContext;
-import org.apache.directory.server.core.interceptor.context.MoveServiceContext;
-import org.apache.directory.server.core.interceptor.context.ServiceContext;
+import org.apache.directory.server.core.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.interceptor.context.CompareOperationContext;
+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;
+import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
+import org.apache.directory.server.core.interceptor.context.OperationContext;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.ServerContext;
@@ -250,7 +250,7 @@
{
LdapDN parentDn = ( LdapDN ) dn.clone();
parentDn.remove( dn.size() - 1 );
- entry = proxy.lookup( new LookupServiceContext( parentDn), PartitionNexusProxy.LOOKUP_BYPASS );
+ entry = proxy.lookup( new LookupOperationContext( parentDn), PartitionNexusProxy.LOOKUP_BYPASS );
}
Attribute subentries = AttributeUtils.getAttribute( entry, acSubentryType );
@@ -325,7 +325,7 @@
// will contain the subentryACI attributes that effect subentries
LdapDN parentDn = ( LdapDN ) dn.clone();
parentDn.remove( dn.size() - 1 );
- Attributes administrativeEntry = proxy.lookup( new LookupServiceContext( parentDn, new String[]
+ Attributes administrativeEntry = proxy.lookup( new LookupOperationContext( parentDn, new String[]
{ SUBENTRYACI_ATTR }) , PartitionNexusProxy.LOOKUP_BYPASS );
Attribute subentryAci = administrativeEntry.get( SUBENTRYACI_ATTR );
@@ -376,14 +376,14 @@
* -------------------------------------------------------------------------------
*/
- public void add( NextInterceptor next, ServiceContext addContext ) throws NamingException
+ public void add( NextInterceptor next, OperationContext addContext ) throws NamingException
{
// Access the principal requesting the operation, and bypass checks if it is the admin
Invocation invocation = InvocationStack.getInstance().peek();
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN principalDn = principal.getJndiName();
- Attributes entry = ((AddServiceContext)addContext).getEntry();
+ Attributes entry = ((AddOperationContext)addContext).getEntry();
LdapDN name = addContext.getDn();
// bypass authz code if we are disabled
@@ -448,14 +448,14 @@
}
- public void delete( NextInterceptor next, ServiceContext deleteContext ) throws NamingException
+ public void delete( NextInterceptor next, OperationContext deleteContext ) throws NamingException
{
LdapDN name = deleteContext.getDn();
// Access the principal requesting the operation, and bypass checks if it is the admin
Invocation invocation = InvocationStack.getInstance().peek();
PartitionNexusProxy proxy = invocation.getProxy();
- Attributes entry = proxy.lookup( new LookupServiceContext( name ) , PartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes entry = proxy.lookup( new LookupOperationContext( name ) , PartitionNexusProxy.LOOKUP_BYPASS );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN principalDn = principal.getJndiName();
@@ -490,16 +490,16 @@
}
- public void modify( NextInterceptor next, ServiceContext modifyContext ) throws NamingException
+ public void modify( NextInterceptor next, OperationContext modifyContext ) throws NamingException
{
// Access the principal requesting the operation, and bypass checks if it is the admin
Invocation invocation = InvocationStack.getInstance().peek();
PartitionNexusProxy proxy = invocation.getProxy();
LdapDN name = modifyContext.getDn();
- int modOp = ((ModifyServiceContext)modifyContext).getModOp();
- Attributes mods = ((ModifyServiceContext)modifyContext).getMods();
+ int modOp = ((ModifyOperationContext)modifyContext).getModOp();
+ Attributes mods = ((ModifyOperationContext)modifyContext).getMods();
- Attributes entry = proxy.lookup( new LookupServiceContext( name ), PartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes entry = proxy.lookup( new LookupOperationContext( name ), PartitionNexusProxy.LOOKUP_BYPASS );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN principalDn = principal.getJndiName();
@@ -568,7 +568,7 @@
// Access the principal requesting the operation, and bypass checks if it is the admin
Invocation invocation = InvocationStack.getInstance().peek();
PartitionNexusProxy proxy = invocation.getProxy();
- Attributes entry = proxy.lookup( new LookupServiceContext( name ), PartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes entry = proxy.lookup( new LookupOperationContext( name ), PartitionNexusProxy.LOOKUP_BYPASS );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN principalDn = principal.getJndiName();
@@ -627,12 +627,12 @@
}
- public boolean hasEntry( NextInterceptor next, ServiceContext entryContext ) throws NamingException
+ public boolean hasEntry( NextInterceptor next, OperationContext entryContext ) throws NamingException
{
LdapDN name = entryContext.getDn();
Invocation invocation = InvocationStack.getInstance().peek();
PartitionNexusProxy proxy = invocation.getProxy();
- Attributes entry = proxy.lookup( new LookupServiceContext( name ), PartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes entry = proxy.lookup( new LookupOperationContext( name ), PartitionNexusProxy.LOOKUP_BYPASS );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN principalDn = principal.getJndiName();
@@ -712,7 +712,7 @@
}
- public Attributes lookup( NextInterceptor next, ServiceContext lookupContext ) throws NamingException
+ public Attributes lookup( NextInterceptor next, OperationContext lookupContext ) throws NamingException
{
Invocation invocation = InvocationStack.getInstance().peek();
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
@@ -726,19 +726,19 @@
PartitionNexusProxy proxy = invocation.getProxy();
Attributes entry = proxy.lookup( lookupContext, PartitionNexusProxy.LOOKUP_BYPASS );
- checkLookupAccess( principal, ((LookupServiceContext)lookupContext).getDn(), entry );
+ checkLookupAccess( principal, ((LookupOperationContext)lookupContext).getDn(), entry );
return next.lookup( lookupContext );
}
- public void rename( NextInterceptor next, ServiceContext renameContext ) throws NamingException
+ public void rename( NextInterceptor next, OperationContext renameContext ) throws NamingException
{
LdapDN name = renameContext.getDn();
- String newRdn = ((RenameServiceContext)renameContext).getNewRdn();
+ String newRdn = ((RenameOperationContext)renameContext).getNewRdn();
// Access the principal requesting the operation, and bypass checks if it is the admin
Invocation invocation = InvocationStack.getInstance().peek();
PartitionNexusProxy proxy = invocation.getProxy();
- Attributes entry = proxy.lookup( new LookupServiceContext( name ), PartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes entry = proxy.lookup( new LookupOperationContext( name ), PartitionNexusProxy.LOOKUP_BYPASS );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN principalDn = principal.getJndiName();
LdapDN newName = ( LdapDN ) name.clone();
@@ -779,17 +779,17 @@
}
- public void moveAndRename( NextInterceptor next, ServiceContext moveAndRenameContext )
+ public void moveAndRename( NextInterceptor next, OperationContext moveAndRenameContext )
throws NamingException
{
LdapDN oriChildName = moveAndRenameContext.getDn();
- LdapDN newParentName = ((MoveAndRenameServiceContext)moveAndRenameContext).getParent();
- String newRn = ((MoveAndRenameServiceContext)moveAndRenameContext).getNewRdn();
+ LdapDN newParentName = ((MoveAndRenameOperationContext)moveAndRenameContext).getParent();
+ String newRn = ((MoveAndRenameOperationContext)moveAndRenameContext).getNewRdn();
// Access the principal requesting the operation, and bypass checks if it is the admin
Invocation invocation = InvocationStack.getInstance().peek();
PartitionNexusProxy proxy = invocation.getProxy();
- Attributes entry = proxy.lookup( new LookupServiceContext( oriChildName ), PartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes entry = proxy.lookup( new LookupOperationContext( oriChildName ), PartitionNexusProxy.LOOKUP_BYPASS );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
LdapDN principalDn = principal.getJndiName();
LdapDN newName = ( LdapDN ) newParentName.clone();
@@ -825,7 +825,7 @@
// will not be valid at the new location.
// This will certainly be fixed by the SubentryService,
// but after this service.
- Attributes importedEntry = proxy.lookup( new LookupServiceContext( oriChildName ),
+ Attributes importedEntry = proxy.lookup( new LookupOperationContext( oriChildName ),
PartitionNexusProxy.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS );
// As the target entry does not exist yet and so
// its subentry operational attributes are not there,
@@ -856,15 +856,15 @@
}
- public void move( NextInterceptor next, ServiceContext moveContext ) throws NamingException
+ public void move( NextInterceptor next, OperationContext moveContext ) throws NamingException
{
LdapDN oriChildName = moveContext.getDn();
- LdapDN newParentName = ((MoveServiceContext)moveContext).getParent();
+ LdapDN newParentName = ((MoveOperationContext)moveContext).getParent();
// Access the principal requesting the operation, and bypass checks if it is the admin
Invocation invocation = InvocationStack.getInstance().peek();
PartitionNexusProxy proxy = invocation.getProxy();
- Attributes entry = proxy.lookup( new LookupServiceContext( oriChildName ), PartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes entry = proxy.lookup( new LookupOperationContext( oriChildName ), PartitionNexusProxy.LOOKUP_BYPASS );
LdapDN newName = ( LdapDN ) newParentName.clone();
newName.add( oriChildName.get( oriChildName.size() - 1 ) );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
@@ -900,7 +900,7 @@
// will not be valid at the new location.
// This will certainly be fixed by the SubentryService,
// but after this service.
- Attributes importedEntry = proxy.lookup( new LookupServiceContext( oriChildName ),
+ Attributes importedEntry = proxy.lookup( new LookupOperationContext( oriChildName ),
PartitionNexusProxy.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS );
// As the target entry does not exist yet and so
// its subentry operational attributes are not there,
@@ -932,16 +932,18 @@
public static final SearchControls DEFAULT_SEARCH_CONTROLS = new SearchControls();
- public NamingEnumeration list( NextInterceptor next, LdapDN base ) throws NamingException
+ public NamingEnumeration list( NextInterceptor next, OperationContext opContext ) throws NamingException
{
Invocation invocation = InvocationStack.getInstance().peek();
ServerLdapContext ctx = ( ServerLdapContext ) invocation.getCaller();
LdapPrincipal user = ctx.getPrincipal();
- NamingEnumeration e = next.list( base );
+ NamingEnumeration e = next.list( opContext );
+
if ( isPrincipalAnAdministrator( user.getJndiName() ) || !enabled )
{
return e;
}
+
AuthorizationFilter authzFilter = new AuthorizationFilter();
return new SearchResultFilteringEnumeration( e, DEFAULT_SEARCH_CONTROLS, invocation, authzFilter );
}
@@ -973,9 +975,9 @@
}
- public boolean compare( NextInterceptor next, ServiceContext compareContext ) throws NamingException
+ public boolean compare( NextInterceptor next, OperationContext opContext ) throws NamingException
{
- CompareServiceContext ctx = (CompareServiceContext)compareContext;
+ CompareOperationContext ctx = (CompareOperationContext)opContext;
LdapDN name = ctx.getDn();
String oid = ctx.getOid();
Object value = ctx.getValue();
@@ -984,7 +986,7 @@
Invocation invocation = InvocationStack.getInstance().peek();
PartitionNexusProxy proxy = invocation.getProxy();
Attributes entry = proxy.lookup(
- new LookupServiceContext( name ),
+ new LookupOperationContext( name ),
PartitionNexusProxy.LOOKUP_BYPASS );
LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
@@ -992,7 +994,7 @@
if ( isPrincipalAnAdministrator( principalDn ) || !enabled )
{
- return next.compare( compareContext );
+ return next.compare( opContext );
}
Set userGroups = groupCache.getGroups( principalDn.toNormName() );
@@ -1006,11 +1008,11 @@
engine.checkPermission( proxy, userGroups, principalDn, principal.getAuthenticationLevel(), name, oid, value,
COMPARE_PERMS, tuples, entry );
- return next.compare( compareContext );
+ return next.compare( opContext );
}
- public LdapDN getMatchedName ( NextInterceptor next, ServiceContext getMatchedNameContext ) throws NamingException
+ public LdapDN getMatchedName ( NextInterceptor next, OperationContext opContext ) throws NamingException
{
// Access the principal requesting the operation, and bypass checks if it is the admin
Invocation invocation = InvocationStack.getInstance().peek();
@@ -1020,19 +1022,19 @@
if ( isPrincipalAnAdministrator( principalDn ) || !enabled )
{
- return next.getMatchedName( getMatchedNameContext );
+ return next.getMatchedName( opContext );
}
// get the present matched name
Attributes entry;
- LdapDN matched = next.getMatchedName( getMatchedNameContext );
+ LdapDN matched = next.getMatchedName( opContext );
// check if we have disclose on error permission for the entry at the matched dn
// if not remove rdn and check that until nothing is left in the name and return
// that but if permission is granted then short the process and return the dn
while ( matched.size() > 0 )
{
- entry = proxy.lookup( new LookupServiceContext( matched ), PartitionNexusProxy.GETMATCHEDDN_BYPASS );
+ entry = proxy.lookup( new LookupOperationContext( matched ), PartitionNexusProxy.GETMATCHEDDN_BYPASS );
Set userGroups = groupCache.getGroups( principalDn.toString() );
Collection<ACITuple> tuples = new HashSet<ACITuple>();
addPerscriptiveAciTuples( proxy, tuples, matched, entry );
@@ -1065,7 +1067,7 @@
* tests. If we hasPermission() returns false we immediately short the
* process and return false.
*/
- Attributes entry = invocation.getProxy().lookup( new LookupServiceContext( normName ), PartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes entry = invocation.getProxy().lookup( new LookupOperationContext( normName ), PartitionNexusProxy.LOOKUP_BYPASS );
ServerLdapContext ctx = ( ServerLdapContext ) invocation.getCaller();
LdapDN userDn = ctx.getPrincipal().getJndiName();
Set userGroups = groupCache.getGroups( userDn.toNormName() );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java?view=diff&rev=529046&r1=529045&r2=529046
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java Sun Apr 15 12:08:12 2007
@@ -41,8 +41,8 @@
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.Interceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
-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.LookupOperationContext;
+import org.apache.directory.server.core.interceptor.context.OperationContext;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.ServerContext;
@@ -128,7 +128,7 @@
{
// read in the administrators and cache their normalized names
Set<String> newAdministrators = new HashSet<String>( 2 );
- Attributes adminGroup = nexus.lookup( new LookupServiceContext( ADMIN_GROUP_DN_NORMALIZED ) );
+ Attributes adminGroup = nexus.lookup( new LookupOperationContext( ADMIN_GROUP_DN_NORMALIZED ) );
if ( adminGroup == null )
{
@@ -150,13 +150,13 @@
// Lookup, search and list operations need to be handled using a filter
// and so we need access to the filter service.
- public void delete( NextInterceptor nextInterceptor, ServiceContext deleteContext ) throws NamingException
+ public void delete( NextInterceptor nextInterceptor, OperationContext opContext ) throws NamingException
{
- LdapDN name = deleteContext.getDn();
+ LdapDN name = opContext.getDn();
if ( !enabled )
{
- nextInterceptor.delete( deleteContext );
+ nextInterceptor.delete( opContext );
return;
}
@@ -198,7 +198,7 @@
throw new LdapNoPermissionException( msg );
}
- nextInterceptor.delete( deleteContext );
+ nextInterceptor.delete( opContext );
}
@@ -230,16 +230,16 @@
* users to self access these resources. As far as we're concerned no one but
* the admin needs access.
*/
- public void modify( NextInterceptor nextInterceptor, ServiceContext modifyContext )
+ public void modify( NextInterceptor nextInterceptor, OperationContext opContext )
throws NamingException
{
if ( enabled )
{
- protectModifyAlterations( modifyContext.getDn() );
- nextInterceptor.modify( modifyContext );
+ protectModifyAlterations( opContext.getDn() );
+ nextInterceptor.modify( opContext );
// update administrators if we change administrators group
- if ( modifyContext.getDn().getNormName().equals( ADMIN_GROUP_DN_NORMALIZED.toNormName() ) )
+ if ( opContext.getDn().getNormName().equals( ADMIN_GROUP_DN_NORMALIZED.toNormName() ) )
{
loadAdministrators();
}
@@ -247,7 +247,7 @@
return;
}
- nextInterceptor.modify( modifyContext );
+ nextInterceptor.modify( opContext );
}
@@ -332,37 +332,37 @@
// o The administrator entry cannot be moved or renamed by anyone
// ------------------------------------------------------------------------
- public void rename( NextInterceptor nextInterceptor, ServiceContext renameContext )
+ public void rename( NextInterceptor nextInterceptor, OperationContext opContext )
throws NamingException
{
if ( enabled )
{
- protectDnAlterations( renameContext.getDn() );
+ protectDnAlterations( opContext.getDn() );
}
- nextInterceptor.rename( renameContext );
+ nextInterceptor.rename( opContext );
}
- public void move( NextInterceptor nextInterceptor, ServiceContext moveContext ) throws NamingException
+ public void move( NextInterceptor nextInterceptor, OperationContext opContext ) throws NamingException
{
if ( enabled )
{
- protectDnAlterations( moveContext.getDn() );
+ protectDnAlterations( opContext.getDn() );
}
- nextInterceptor.move( moveContext );
+ nextInterceptor.move( opContext );
}
- public void moveAndRename( NextInterceptor nextInterceptor, ServiceContext moveAndRenameContext ) throws NamingException
+ public void moveAndRename( NextInterceptor nextInterceptor, OperationContext opContext ) throws NamingException
{
if ( enabled )
{
- protectDnAlterations( moveAndRenameContext.getDn() );
+ protectDnAlterations( opContext.getDn() );
}
- nextInterceptor.moveAndRename( moveAndRenameContext );
+ nextInterceptor.moveAndRename( opContext );
}
@@ -409,16 +409,16 @@
}
- public Attributes lookup( NextInterceptor nextInterceptor, ServiceContext lookupContext ) throws NamingException
+ public Attributes lookup( NextInterceptor nextInterceptor, OperationContext opContext ) throws NamingException
{
- Attributes attributes = nextInterceptor.lookup( lookupContext );
+ Attributes attributes = nextInterceptor.lookup( opContext );
if ( !enabled || attributes == null )
{
return attributes;
}
- protectLookUp( ((LookupServiceContext)lookupContext).getDn() );
+ protectLookUp( ((LookupOperationContext)opContext).getDn() );
return attributes;
}
@@ -499,15 +499,17 @@
}
- public NamingEnumeration list( NextInterceptor nextInterceptor, LdapDN base ) throws NamingException
+ public NamingEnumeration list( NextInterceptor nextInterceptor, OperationContext opContext ) throws NamingException
{
- NamingEnumeration e = nextInterceptor.list( base );
+ NamingEnumeration e = nextInterceptor.list( opContext );
+
if ( !enabled )
{
return e;
}
Invocation invocation = InvocationStack.getInstance().peek();
+
return new SearchResultFilteringEnumeration( e, null, invocation, new SearchResultFilter()
{
public boolean accept( Invocation invocation, SearchResult result, SearchControls controls )
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java?view=diff&rev=529046&r1=529045&r2=529046
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java Sun Apr 15 12:08:12 2007
@@ -31,7 +31,7 @@
import org.apache.directory.server.core.event.Evaluator;
import org.apache.directory.server.core.event.ExpressionEvaluator;
-import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.server.core.subtree.RefinementEvaluator;
import org.apache.directory.server.core.subtree.RefinementLeafEvaluator;
@@ -165,7 +165,7 @@
throw new NullPointerException( "entryName" );
}
- Attributes userEntry = proxy.lookup( new LookupServiceContext( userName ), USER_LOOKUP_BYPASS );
+ Attributes userEntry = proxy.lookup( new LookupOperationContext( userName ), USER_LOOKUP_BYPASS );
// Determine the scope of the requested operation.
OperationScope scope;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java?view=diff&rev=529046&r1=529045&r2=529046
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java Sun Apr 15 12:08:12 2007
@@ -38,10 +38,10 @@
import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
-import org.apache.directory.server.core.interceptor.context.AddServiceContext;
-import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
-import org.apache.directory.server.core.interceptor.context.ModifyServiceContext;
-import org.apache.directory.server.core.interceptor.context.ServiceContext;
+import org.apache.directory.server.core.interceptor.context.AddOperationContext;
+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.OperationContext;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.partition.PartitionNexus;
@@ -116,7 +116,7 @@
*/
private void addCollectiveAttributes( LdapDN normName, Attributes entry, String[] retAttrs ) throws NamingException
{
- Attributes entryWithCAS = nexus.lookup( new LookupServiceContext( normName, new String[] { COLLECTIVE_ATTRIBUTE_SUBENTRIES } ) );
+ Attributes entryWithCAS = nexus.lookup( new LookupOperationContext( normName, new String[] { COLLECTIVE_ATTRIBUTE_SUBENTRIES } ) );
Attribute caSubentries = entryWithCAS.get( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
/*
@@ -187,7 +187,7 @@
{
String subentryDnStr = ( String ) caSubentries.get( ii );
LdapDN subentryDn = new LdapDN( subentryDnStr );
- Attributes subentry = nexus.lookup( new LookupServiceContext( subentryDn ) );
+ Attributes subentry = nexus.lookup( new LookupOperationContext( subentryDn ) );
NamingEnumeration attrIds = subentry.getIDs();
while ( attrIds.hasMore() )
@@ -281,16 +281,16 @@
// ------------------------------------------------------------------------
// Interceptor Method Overrides
// ------------------------------------------------------------------------
- public Attributes lookup( NextInterceptor nextInterceptor, ServiceContext lookupContext ) throws NamingException
+ public Attributes lookup( NextInterceptor nextInterceptor, OperationContext opContext ) throws NamingException
{
- Attributes result = nextInterceptor.lookup( lookupContext );
+ Attributes result = nextInterceptor.lookup( opContext );
if ( result == null )
{
return null;
}
- LookupServiceContext ctx = (LookupServiceContext)lookupContext;
+ LookupOperationContext ctx = (LookupOperationContext)opContext;
if ( ( ctx.getAttrsId() == null ) || ( ctx.getAttrsId().size() == 0 ) )
{
@@ -305,9 +305,9 @@
}
- public NamingEnumeration list( NextInterceptor nextInterceptor, LdapDN base ) throws NamingException
+ public NamingEnumeration list( NextInterceptor nextInterceptor, OperationContext opContext ) throws NamingException
{
- NamingEnumeration e = nextInterceptor.list( base );
+ NamingEnumeration e = nextInterceptor.list( opContext );
Invocation invocation = InvocationStack.getInstance().peek();
return new SearchResultFilteringEnumeration( e, new SearchControls(), invocation, SEARCH_FILTER );
}
@@ -325,18 +325,18 @@
// Partial Schema Checking
// ------------------------------------------------------------------------
- public void add( NextInterceptor next, ServiceContext addContext ) throws NamingException
+ public void add( NextInterceptor next, OperationContext opContext ) throws NamingException
{
- collectiveAttributesSchemaChecker.checkAdd( addContext.getDn(), ((AddServiceContext)addContext).getEntry() );
- super.add( next, addContext );
+ collectiveAttributesSchemaChecker.checkAdd( opContext.getDn(), ((AddOperationContext)opContext).getEntry() );
+ super.add( next, opContext );
}
- public void modify( NextInterceptor next, ServiceContext modifyContext ) throws NamingException
+ public void modify( NextInterceptor next, OperationContext opContext ) throws NamingException
{
- ModifyServiceContext ctx = (ModifyServiceContext)modifyContext;
+ ModifyOperationContext ctx = (ModifyOperationContext)opContext;
collectiveAttributesSchemaChecker.checkModify( ctx.getDn(), ctx.getModOp(), ctx.getMods() );
- super.modify( next, modifyContext );
+ super.modify( next, opContext );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java?view=diff&rev=529046&r1=529045&r2=529046
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java Sun Apr 15 12:08:12 2007
@@ -26,7 +26,7 @@
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
-import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -95,7 +95,7 @@
public void checkModify( LdapDN normName, ModificationItemImpl[] mods ) throws NamingException
{
- Attributes originalEntry = nexus.lookup( new LookupServiceContext( normName ) );
+ Attributes originalEntry = nexus.lookup( new LookupOperationContext( normName ) );
Attributes targetEntry = SchemaUtils.getTargetEntry( mods, originalEntry );
Attribute targetObjectClasses = targetEntry.get( SchemaConstants.OBJECT_CLASS_AT );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java?view=diff&rev=529046&r1=529045&r2=529046
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java Sun Apr 15 12:08:12 2007
@@ -31,7 +31,7 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.referral.ReferralLut;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
@@ -176,7 +176,7 @@
{
LdapDN prefetchedDn = new LdapDN( prefetched.getName() );
prefetchedDn.normalize( normalizerMap );
- refs = nexus.lookup( new LookupServiceContext( prefetchedDn ) ).get( REF_ATTR );
+ refs = nexus.lookup( new LookupOperationContext( prefetchedDn ) ).get( REF_ATTR );
}
if ( refs == null )
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventService.java?view=diff&rev=529046&r1=529045&r2=529046
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventService.java Sun Apr 15 12:08:12 2007
@@ -33,13 +33,13 @@
import org.apache.directory.server.core.configuration.InterceptorConfiguration;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
-import org.apache.directory.server.core.interceptor.context.AddServiceContext;
-import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
-import org.apache.directory.server.core.interceptor.context.RenameServiceContext;
-import org.apache.directory.server.core.interceptor.context.ModifyServiceContext;
-import org.apache.directory.server.core.interceptor.context.MoveAndRenameServiceContext;
-import org.apache.directory.server.core.interceptor.context.MoveServiceContext;
-import org.apache.directory.server.core.interceptor.context.ServiceContext;
+import org.apache.directory.server.core.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
+import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
+import org.apache.directory.server.core.interceptor.context.OperationContext;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.normalization.NormalizingVisitor;
@@ -236,11 +236,11 @@
}
- public void add( NextInterceptor next, ServiceContext addContext ) throws NamingException
+ public void add( NextInterceptor next, OperationContext opContext ) throws NamingException
{
- super.add( next, addContext );
- LdapDN name = addContext.getDn();
- Attributes entry = ((AddServiceContext)addContext).getEntry();
+ super.add( next, opContext );
+ LdapDN name = opContext.getDn();
+ Attributes entry = ((AddOperationContext)opContext).getEntry();
Set selecting = getSelectingSources( name, entry );
@@ -267,11 +267,11 @@
}
- public void delete( NextInterceptor next, ServiceContext deleteContext ) throws NamingException
+ public void delete( NextInterceptor next, OperationContext opContext ) throws NamingException
{
- LdapDN name = deleteContext.getDn();
- Attributes entry = nexus.lookup( new LookupServiceContext( name ) );
- super.delete( next, deleteContext );
+ LdapDN name = opContext.getDn();
+ Attributes entry = nexus.lookup( new LookupOperationContext( name ) );
+ super.delete( next, opContext );
Set selecting = getSelectingSources( name, entry );
if ( selecting.isEmpty() )
@@ -299,7 +299,7 @@
private void notifyOnModify( LdapDN name, ModificationItemImpl[] mods, Attributes oriEntry ) throws NamingException
{
- Attributes entry = nexus.lookup( new LookupServiceContext( name ) );
+ Attributes entry = nexus.lookup( new LookupOperationContext( name ) );
Set selecting = getSelectingSources( name, entry );
if ( selecting.isEmpty() )
{
@@ -324,13 +324,13 @@
}
- public void modify( NextInterceptor next, ServiceContext modifyContext ) throws NamingException
+ public void modify( NextInterceptor next, OperationContext opContext ) throws NamingException
{
- ModifyServiceContext ctx = (ModifyServiceContext)modifyContext;
+ ModifyOperationContext ctx = (ModifyOperationContext)opContext;
Invocation invocation = InvocationStack.getInstance().peek();
PartitionNexusProxy proxy = invocation.getProxy();
- Attributes oriEntry = proxy.lookup( new LookupServiceContext( ctx.getDn() ), PartitionNexusProxy.LOOKUP_BYPASS );
- super.modify( next, modifyContext );
+ Attributes oriEntry = proxy.lookup( new LookupOperationContext( ctx.getDn() ), PartitionNexusProxy.LOOKUP_BYPASS );
+ super.modify( next, opContext );
// package modifications in ModItem format for event delivery
ModificationItemImpl[] modItems = new ModificationItemImpl[ctx.getMods().size()];
@@ -349,7 +349,7 @@
{
Invocation invocation = InvocationStack.getInstance().peek();
PartitionNexusProxy proxy = invocation.getProxy();
- Attributes oriEntry = proxy.lookup( new LookupServiceContext( name ), PartitionNexusProxy.LOOKUP_BYPASS );
+ Attributes oriEntry = proxy.lookup( new LookupOperationContext( name ), PartitionNexusProxy.LOOKUP_BYPASS );
super.modify( next, name, mods );
notifyOnModify( name, mods, oriEntry );
}
@@ -357,7 +357,7 @@
private void notifyOnNameChange( LdapDN oldName, LdapDN newName ) throws NamingException
{
- Attributes entry = nexus.lookup( new LookupServiceContext( newName ) );
+ Attributes entry = nexus.lookup( new LookupOperationContext( newName ) );
Set selecting = getSelectingSources( oldName, entry );
if ( selecting.isEmpty() )
{
@@ -382,33 +382,33 @@
}
- public void rename( NextInterceptor next, ServiceContext renameContext ) throws NamingException
+ public void rename( NextInterceptor next, OperationContext opContext ) throws NamingException
{
- super.rename( next, renameContext );
- LdapDN newName = ( LdapDN ) renameContext.getDn().clone();
+ super.rename( next, opContext );
+ LdapDN newName = ( LdapDN ) opContext.getDn().clone();
newName.remove( newName.size() - 1 );
- newName.add( ((RenameServiceContext)renameContext).getNewRdn() );
+ newName.add( ((RenameOperationContext)opContext).getNewRdn() );
newName.normalize( attributeRegistry.getNormalizerMapping() );
- notifyOnNameChange( renameContext.getDn(), newName );
+ notifyOnNameChange( opContext.getDn(), newName );
}
- public void moveAndRename( NextInterceptor next, ServiceContext moveAndRenameContext )
+ public void moveAndRename( NextInterceptor next, OperationContext opContext )
throws NamingException
{
- super.moveAndRename( next, moveAndRenameContext );
- LdapDN newName = ( LdapDN ) ((MoveAndRenameServiceContext)moveAndRenameContext).getParent().clone();
- newName.add( ((MoveAndRenameServiceContext)moveAndRenameContext).getNewRdn() );
- notifyOnNameChange( moveAndRenameContext.getDn(), newName );
+ super.moveAndRename( next, opContext );
+ LdapDN newName = ( LdapDN ) ((MoveAndRenameOperationContext)opContext).getParent().clone();
+ newName.add( ((MoveAndRenameOperationContext)opContext).getNewRdn() );
+ notifyOnNameChange( opContext.getDn(), newName );
}
- public void move( NextInterceptor next, ServiceContext moveContext ) throws NamingException
+ public void move( NextInterceptor next, OperationContext opContext ) throws NamingException
{
- super.move( next, moveContext );
- LdapDN oriChildName = moveContext.getDn();
+ super.move( next, opContext );
+ LdapDN oriChildName = opContext.getDn();
- LdapDN newName = ( LdapDN ) ((MoveServiceContext)moveContext).getParent().clone();
+ LdapDN newName = ( LdapDN ) ((MoveOperationContext)opContext).getParent().clone();
newName.add( oriChildName.get( oriChildName.size() - 1 ) );
notifyOnNameChange( oriChildName, newName );
}