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 2010/06/15 23:15:06 UTC
svn commit: r955056 [4/5] - in /directory:
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/
apacheds/trunk/core-api/src/main/java/org/apache/directory/...
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Tue Jun 15 21:15:04 2010
@@ -297,41 +297,41 @@ public class CollectiveAttributeIntercep
// Interceptor Method Overrides
// ------------------------------------------------------------------------
- public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext ) throws LdapException
+ public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext lookupContext ) throws LdapException
{
- Entry result = nextInterceptor.lookup( opContext );
+ Entry result = nextInterceptor.lookup( lookupContext );
if ( result == null )
{
return null;
}
- if ( ( opContext.getAttrsId() == null ) || ( opContext.getAttrsId().size() == 0 ) )
+ if ( ( lookupContext.getAttrsId() == null ) || ( lookupContext.getAttrsId().size() == 0 ) )
{
- addCollectiveAttributes( opContext, result, SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
+ addCollectiveAttributes( lookupContext, result, SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
}
else
{
- addCollectiveAttributes( opContext, result, opContext.getAttrsIdArray() );
+ addCollectiveAttributes( lookupContext, result, lookupContext.getAttrsIdArray() );
}
return result;
}
- public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext )
+ public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext listContext )
throws LdapException
{
- EntryFilteringCursor cursor = nextInterceptor.list( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.list( listContext );
cursor.addEntryFilter( SEARCH_FILTER );
return cursor;
}
- public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext )
+ public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext searchContext )
throws LdapException
{
- EntryFilteringCursor cursor = nextInterceptor.search( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.search( searchContext );
cursor.addEntryFilter( SEARCH_FILTER );
return cursor;
}
@@ -349,10 +349,10 @@ public class CollectiveAttributeIntercep
}
- public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws LdapException
+ public void modify( NextInterceptor next, ModifyOperationContext modifyContext ) throws LdapException
{
- collectiveAttributesSchemaChecker.checkModify( opContext );
+ collectiveAttributesSchemaChecker.checkModify( modifyContext );
- next.modify( opContext );
+ next.modify( modifyContext );
}
}
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?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- 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 Tue Jun 15 21:15:04 2010
@@ -74,10 +74,10 @@ public class CollectiveAttributesSchemaC
}
- public void checkModify( ModifyOperationContext opContext ) throws LdapException
+ public void checkModify( ModifyOperationContext modifyContext ) throws LdapException
{
- List<Modification> mods = opContext.getModItems();
- Entry originalEntry = opContext.getEntry();
+ List<Modification> mods = modifyContext.getModItems();
+ Entry originalEntry = modifyContext.getEntry();
Entry targetEntry = ( Entry ) SchemaUtils.getTargetEntry( mods, originalEntry );
EntryAttribute targetObjectClasses = targetEntry.get( SchemaConstants.OBJECT_CLASS_AT );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Tue Jun 15 21:15:04 2010
@@ -163,10 +163,10 @@ public class EventInterceptor extends Ba
}
- public void delete( NextInterceptor next, final DeleteOperationContext opContext ) throws LdapException
+ public void delete( NextInterceptor next, final DeleteOperationContext deleteContext ) throws LdapException
{
- List<RegistrationEntry> selecting = getSelectingRegistrations( opContext.getDn(), opContext.getEntry() );
- next.delete( opContext );
+ List<RegistrationEntry> selecting = getSelectingRegistrations( deleteContext.getDn(), deleteContext.getEntry() );
+ next.delete( deleteContext );
if ( selecting.isEmpty() )
{
@@ -177,19 +177,19 @@ public class EventInterceptor extends Ba
{
if ( EventType.isDelete( registration.getCriteria().getEventMask() ) )
{
- fire( opContext, EventType.DELETE, registration.getListener() );
+ fire( deleteContext, EventType.DELETE, registration.getListener() );
}
}
}
- public void modify( NextInterceptor next, final ModifyOperationContext opContext ) throws LdapException
+ public void modify( NextInterceptor next, final ModifyOperationContext modifyContext ) throws LdapException
{
- Entry oriEntry = opContext.getEntry();
+ Entry oriEntry = modifyContext.getEntry();
- List<RegistrationEntry> selecting = getSelectingRegistrations( opContext.getDn(), oriEntry );
+ List<RegistrationEntry> selecting = getSelectingRegistrations( modifyContext.getDn(), oriEntry );
- next.modify( opContext );
+ next.modify( modifyContext );
if ( selecting.isEmpty() )
{
@@ -197,25 +197,25 @@ public class EventInterceptor extends Ba
}
// Get the modified entry
- Entry alteredEntry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
- opContext.setAlteredEntry( ( ClonedServerEntry ) alteredEntry );
+ Entry alteredEntry = modifyContext.lookup( modifyContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
+ modifyContext.setAlteredEntry( ( ClonedServerEntry ) alteredEntry );
for ( final RegistrationEntry registration : selecting )
{
if ( EventType.isModify( registration.getCriteria().getEventMask() ) )
{
- fire( opContext, EventType.MODIFY, registration.getListener() );
+ fire( modifyContext, EventType.MODIFY, registration.getListener() );
}
}
}
- public void rename( NextInterceptor next, RenameOperationContext opContext ) throws LdapException
+ public void rename( NextInterceptor next, RenameOperationContext renameContext ) throws LdapException
{
- Entry oriEntry = opContext.getEntry().getOriginalEntry();
- List<RegistrationEntry> selecting = getSelectingRegistrations( opContext.getDn(), oriEntry );
+ Entry oriEntry = renameContext.getEntry().getOriginalEntry();
+ List<RegistrationEntry> selecting = getSelectingRegistrations( renameContext.getDn(), oriEntry );
- next.rename( opContext );
+ next.rename( renameContext );
if ( selecting.isEmpty() )
{
@@ -223,14 +223,14 @@ public class EventInterceptor extends Ba
}
// Get the modifed entry
- Entry alteredEntry = opContext.lookup( opContext.getNewDn(), ByPassConstants.LOOKUP_BYPASS );
- opContext.setModifiedEntry( ( ClonedServerEntry ) alteredEntry );
+ Entry alteredEntry = renameContext.lookup( renameContext.getNewDn(), ByPassConstants.LOOKUP_BYPASS );
+ renameContext.setModifiedEntry( ( ClonedServerEntry ) alteredEntry );
for ( final RegistrationEntry registration : selecting )
{
if ( EventType.isRename( registration.getCriteria().getEventMask() ) )
{
- fire( opContext, EventType.RENAME, registration.getListener() );
+ fire( renameContext, EventType.RENAME, registration.getListener() );
}
}
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Tue Jun 15 21:15:04 2010
@@ -206,9 +206,9 @@ public class ExceptionInterceptor extend
* Checks to make sure the entry being deleted exists, and has no children, otherwise throws the appropriate
* LdapException.
*/
- public void delete( NextInterceptor nextInterceptor, DeleteOperationContext opContext ) throws LdapException
+ public void delete( NextInterceptor nextInterceptor, DeleteOperationContext deleteContext ) throws LdapException
{
- DN dn = opContext.getDn();
+ DN dn = deleteContext.getDn();
if ( dn.equals( subschemSubentryDn ) )
{
@@ -216,7 +216,7 @@ public class ExceptionInterceptor extend
subschemSubentryDn ) );
}
- nextInterceptor.delete( opContext );
+ nextInterceptor.delete( deleteContext );
// Update the alias cache
synchronized ( notAliasCache )
@@ -232,36 +232,36 @@ public class ExceptionInterceptor extend
/**
* Checks to see the base being searched exists, otherwise throws the appropriate LdapException.
*/
- public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext )
+ public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext listContext )
throws LdapException
{
- if ( opContext.getDn().getNormName().equals( subschemSubentryDn.getNormName() ) )
+ if ( listContext.getDn().getNormName().equals( subschemSubentryDn.getNormName() ) )
{
// there is nothing under the schema subentry
- return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), opContext );
+ return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), listContext );
}
// check if entry to search exists
String msg = "Attempt to search under non-existant entry: ";
- assertHasEntry( opContext, msg, opContext.getDn() );
+ assertHasEntry( listContext, msg, listContext.getDn() );
- return nextInterceptor.list( opContext );
+ return nextInterceptor.list( listContext );
}
/**
* Checks to see the base being searched exists, otherwise throws the appropriate LdapException.
*/
- public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext ) throws LdapException
+ public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext lookupContext ) throws LdapException
{
- DN dn = opContext.getDn();
+ DN dn = lookupContext.getDn();
if ( dn.equals( subschemSubentryDn ) )
{
return nexus.getRootDSE( null );
}
- Entry result = nextInterceptor.lookup( opContext );
+ Entry result = nextInterceptor.lookup( lookupContext );
if ( result == null )
{
@@ -278,26 +278,26 @@ public class ExceptionInterceptor extend
/**
* Checks to see the entry being modified exists, otherwise throws the appropriate LdapException.
*/
- public void modify( NextInterceptor nextInterceptor, ModifyOperationContext opContext ) throws LdapException
+ public void modify( NextInterceptor nextInterceptor, ModifyOperationContext modifyContext ) throws LdapException
{
// check if entry to modify exists
String msg = "Attempt to modify non-existant entry: ";
// handle operations against the schema subentry in the schema service
// and never try to look it up in the nexus below
- if ( opContext.getDn().equals( subschemSubentryDn ) )
+ if ( modifyContext.getDn().equals( subschemSubentryDn ) )
{
- nextInterceptor.modify( opContext );
+ nextInterceptor.modify( modifyContext );
return;
}
// Check that the entry we read at the beginning exists. If
// not, we will throw an exception here
- assertHasEntry( opContext, msg );
+ assertHasEntry( modifyContext, msg );
- Entry entry = opContext.getEntry();
+ Entry entry = modifyContext.getEntry();
- List<Modification> items = opContext.getModItems();
+ List<Modification> items = modifyContext.getModItems();
// Check that we aren't adding a value that already exists in the current entry
for ( Modification item : items )
@@ -328,22 +328,22 @@ public class ExceptionInterceptor extend
// it would also be more complex.
synchronized ( notAliasCache )
{
- if ( notAliasCache.containsKey( opContext.getDn().getNormName() ) )
+ if ( notAliasCache.containsKey( modifyContext.getDn().getNormName() ) )
{
- notAliasCache.remove( opContext.getDn().getNormName() );
+ notAliasCache.remove( modifyContext.getDn().getNormName() );
}
}
- nextInterceptor.modify( opContext );
+ nextInterceptor.modify( modifyContext );
}
/**
* Checks to see the entry being renamed exists, otherwise throws the appropriate LdapException.
*/
- public void rename( NextInterceptor nextInterceptor, RenameOperationContext opContext ) throws LdapException
+ public void rename( NextInterceptor nextInterceptor, RenameOperationContext renameContext ) throws LdapException
{
- DN dn = opContext.getDn();
+ DN dn = renameContext.getDn();
if ( dn.equals( subschemSubentryDn ) )
{
@@ -352,9 +352,9 @@ public class ExceptionInterceptor extend
}
// check to see if target entry exists
- DN newDn = opContext.getNewDn();
+ DN newDn = renameContext.getNewDn();
- if ( nextInterceptor.hasEntry( new EntryOperationContext( opContext.getSession(), newDn ) ) )
+ if ( nextInterceptor.hasEntry( new EntryOperationContext( renameContext.getSession(), newDn ) ) )
{
LdapEntryAlreadyExistsException e;
e = new LdapEntryAlreadyExistsException( I18n.err( I18n.ERR_250_ENTRY_ALREADY_EXISTS, newDn.getName() ) );
@@ -371,7 +371,7 @@ public class ExceptionInterceptor extend
}
}
- nextInterceptor.rename( opContext );
+ nextInterceptor.rename( renameContext );
}
@@ -433,20 +433,20 @@ public class ExceptionInterceptor extend
/**
* Checks to see the entry being searched exists, otherwise throws the appropriate LdapException.
*/
- public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext )
+ public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext searchContext )
throws LdapException
{
- DN base = opContext.getDn();
+ DN base = searchContext.getDn();
try
{
- EntryFilteringCursor cursor = nextInterceptor.search( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.search( searchContext );
if ( !cursor.next() && !base.isEmpty()
&& !( subschemSubentryDn.getNormName() ).equalsIgnoreCase( base.getNormName() ) )
{
// We just check that the entry exists only if we didn't found any entry
- assertHasEntry( opContext, "Attempt to search under non-existant entry:", opContext.getDn() );
+ assertHasEntry( searchContext, "Attempt to search under non-existant entry:", searchContext.getDn() );
}
return cursor;
@@ -454,7 +454,7 @@ public class ExceptionInterceptor extend
catch ( Exception ne )
{
String msg = I18n.err( I18n.ERR_259 );
- assertHasEntry( opContext, msg, opContext.getDn() );
+ assertHasEntry( searchContext, msg, searchContext.getDn() );
throw new LdapOperationException( msg );
}
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java Tue Jun 15 21:15:04 2010
@@ -150,7 +150,7 @@ public class JournalInterceptor extends
/**
* {@inheritDoc}
*/
- public void delete( NextInterceptor next, DeleteOperationContext opContext ) throws LdapException
+ public void delete( NextInterceptor next, DeleteOperationContext deleteContext ) throws LdapException
{
long opRevision = 0;
@@ -161,14 +161,14 @@ public class JournalInterceptor extends
// Store the deleted entry
LdifEntry ldif = new LdifEntry();
ldif.setChangeType( ChangeType.Delete );
- ldif.setDn( opContext.getDn() );
+ ldif.setDn( deleteContext.getDn() );
journal.log( getPrincipal(), opRevision, ldif );
}
try
{
- next.delete( opContext );
+ next.delete( deleteContext );
if ( journalEnabled )
{
@@ -192,7 +192,7 @@ public class JournalInterceptor extends
/**
* {@inheritDoc}
*/
- public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws LdapException
+ public void modify( NextInterceptor next, ModifyOperationContext modifyContext ) throws LdapException
{
long opRevision = 0;
@@ -203,10 +203,10 @@ public class JournalInterceptor extends
// Store the modified entry
LdifEntry ldif = new LdifEntry();
ldif.setChangeType( ChangeType.Modify );
- ldif.setDn( opContext.getDn() );
+ ldif.setDn( modifyContext.getDn() );
// Store the modifications
- for ( Modification modification:opContext.getModItems() )
+ for ( Modification modification:modifyContext.getModItems() )
{
ldif.addModificationItem( modification );
}
@@ -216,7 +216,7 @@ public class JournalInterceptor extends
try
{
- next.modify( opContext );
+ next.modify( modifyContext );
if ( journalEnabled )
{
@@ -239,7 +239,7 @@ public class JournalInterceptor extends
/**
* {@inheritDoc}
*/
- public void rename ( NextInterceptor next, RenameOperationContext opContext ) throws LdapException
+ public void rename ( NextInterceptor next, RenameOperationContext renameContext ) throws LdapException
{
long opRevision = 0;
@@ -250,16 +250,16 @@ public class JournalInterceptor extends
// Store the renamed entry
LdifEntry ldif = new LdifEntry();
ldif.setChangeType( ChangeType.ModRdn );
- ldif.setDn( opContext.getDn() );
- ldif.setNewRdn( opContext.getNewRdn().getNormName() );
- ldif.setDeleteOldRdn( opContext.getDeleteOldRdn() );
+ ldif.setDn( renameContext.getDn() );
+ ldif.setNewRdn( renameContext.getNewRdn().getNormName() );
+ ldif.setDeleteOldRdn( renameContext.getDeleteOldRdn() );
journal.log( getPrincipal(), opRevision, ldif );
}
try
{
- next.rename( opContext );
+ next.rename( renameContext );
if ( journalEnabled )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java Tue Jun 15 21:15:04 2010
@@ -171,10 +171,10 @@ public class TimerInterceptor implements
/**
* {@inheritDoc}
*/
- public void bind( NextInterceptor next, BindOperationContext opContext ) throws LdapException
+ public void bind( NextInterceptor next, BindOperationContext bindContext ) throws LdapException
{
long t0 = System.nanoTime();
- next.bind( opContext );
+ next.bind( bindContext );
long delta = System.nanoTime() - t0;
if ( IS_DEBUG_STATS )
@@ -229,10 +229,10 @@ public class TimerInterceptor implements
/**
* {@inheritDoc}
*/
- public void delete( NextInterceptor next, DeleteOperationContext opContext ) throws LdapException
+ public void delete( NextInterceptor next, DeleteOperationContext deleteContext ) throws LdapException
{
long t0 = System.nanoTime();
- next.delete( opContext );
+ next.delete( deleteContext );
long delta = System.nanoTime() - t0;
if ( IS_DEBUG_STATS )
@@ -274,11 +274,11 @@ public class TimerInterceptor implements
/**
* {@inheritDoc}
*/
- public Entry getRootDSE( NextInterceptor next, GetRootDSEOperationContext opContext )
+ public Entry getRootDSE( NextInterceptor next, GetRootDSEOperationContext getRootDseContext )
throws LdapException
{
long t0 = System.nanoTime();
- Entry rootDSE = next.getRootDSE( opContext );
+ Entry rootDSE = next.getRootDSE( getRootDseContext );
long delta = System.nanoTime() - t0;
if ( IS_DEBUG_STATS )
@@ -305,10 +305,10 @@ public class TimerInterceptor implements
/**
* {@inheritDoc}
*/
- public boolean hasEntry( NextInterceptor next, EntryOperationContext opContext ) throws LdapException
+ public boolean hasEntry( NextInterceptor next, EntryOperationContext hasEntryContext ) throws LdapException
{
long t0 = System.nanoTime();
- boolean hasEntry = next.hasEntry( opContext );
+ boolean hasEntry = next.hasEntry( hasEntryContext );
long delta = System.nanoTime() - t0;
if ( IS_DEBUG_STATS )
@@ -343,10 +343,10 @@ public class TimerInterceptor implements
/**
* {@inheritDoc}
*/
- public EntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws LdapException
+ public EntryFilteringCursor list( NextInterceptor next, ListOperationContext listContext ) throws LdapException
{
long t0 = System.nanoTime();
- EntryFilteringCursor cursor = next.list( opContext );
+ EntryFilteringCursor cursor = next.list( listContext );
long delta = System.nanoTime() - t0;
if ( IS_DEBUG_STATS )
@@ -373,10 +373,10 @@ public class TimerInterceptor implements
/**
* {@inheritDoc}
*/
- public Entry lookup( NextInterceptor next, LookupOperationContext opContext ) throws LdapException
+ public Entry lookup( NextInterceptor next, LookupOperationContext lookupContext ) throws LdapException
{
long t0 = System.nanoTime();
- Entry entry = next.lookup( opContext );
+ Entry entry = next.lookup( lookupContext );
long delta = System.nanoTime() - t0;
if ( IS_DEBUG_STATS )
@@ -403,10 +403,10 @@ public class TimerInterceptor implements
/**
* {@inheritDoc}
*/
- public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws LdapException
+ public void modify( NextInterceptor next, ModifyOperationContext modifyContext ) throws LdapException
{
long t0 = System.nanoTime();
- next.modify( opContext );
+ next.modify( modifyContext );
long delta = System.nanoTime() - t0;
if ( IS_DEBUG_STATS )
@@ -487,10 +487,10 @@ public class TimerInterceptor implements
/**
* {@inheritDoc}
*/
- public void rename( NextInterceptor next, RenameOperationContext opContext ) throws LdapException
+ public void rename( NextInterceptor next, RenameOperationContext renameContext ) throws LdapException
{
long t0 = System.nanoTime();
- next.rename( opContext );
+ next.rename( renameContext );
long delta = System.nanoTime() - t0;
if ( IS_DEBUG_STATS )
@@ -515,10 +515,10 @@ public class TimerInterceptor implements
/**
* {@inheritDoc}
*/
- public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws LdapException
+ public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext searchContext ) throws LdapException
{
long t0 = System.nanoTime();
- EntryFilteringCursor cursor = next.search( opContext );
+ EntryFilteringCursor cursor = next.search( searchContext );
long delta = System.nanoTime() - t0;
if ( IS_DEBUG_STATS )
@@ -545,10 +545,10 @@ public class TimerInterceptor implements
/**
* {@inheritDoc}
*/
- public void unbind( NextInterceptor next, UnbindOperationContext opContext ) throws LdapException
+ public void unbind( NextInterceptor next, UnbindOperationContext unbindContext ) throws LdapException
{
long t0 = System.nanoTime();
- next.unbind( opContext );
+ next.unbind( unbindContext );
long delta = System.nanoTime() - t0;
if ( IS_DEBUG_STATS )
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Tue Jun 15 21:15:04 2010
@@ -122,54 +122,54 @@ public class NormalizationInterceptor ex
/**
* {@inheritDoc}
*/
- public void delete( NextInterceptor nextInterceptor, DeleteOperationContext opContext ) throws LdapException
+ public void delete( NextInterceptor nextInterceptor, DeleteOperationContext deleteContext ) throws LdapException
{
- DN dn = opContext.getDn();
+ DN dn = deleteContext.getDn();
if ( !dn.isNormalized() )
{
dn.normalize( schemaManager.getNormalizerMapping() );
}
- nextInterceptor.delete( opContext );
+ nextInterceptor.delete( deleteContext );
}
/**
* {@inheritDoc}
*/
- public void modify( NextInterceptor nextInterceptor, ModifyOperationContext opContext ) throws LdapException
+ public void modify( NextInterceptor nextInterceptor, ModifyOperationContext modifyContext ) throws LdapException
{
- if ( !opContext.getDn().isNormalized() )
+ if ( !modifyContext.getDn().isNormalized() )
{
- opContext.getDn().normalize( schemaManager.getNormalizerMapping() );
+ modifyContext.getDn().normalize( schemaManager.getNormalizerMapping() );
}
- nextInterceptor.modify( opContext );
+ nextInterceptor.modify( modifyContext );
}
/**
* {@inheritDoc}
*/
- public void rename( NextInterceptor nextInterceptor, RenameOperationContext opContext ) throws LdapException
+ public void rename( NextInterceptor nextInterceptor, RenameOperationContext renameContext ) throws LdapException
{
// Normalize the new RDN and the DN if needed
- if ( !opContext.getDn().isNormalized() )
+ if ( !renameContext.getDn().isNormalized() )
{
- opContext.getDn().normalize( schemaManager.getNormalizerMapping() );
+ renameContext.getDn().normalize( schemaManager.getNormalizerMapping() );
}
- opContext.getNewRdn().normalize( schemaManager.getNormalizerMapping() );
+ renameContext.getNewRdn().normalize( schemaManager.getNormalizerMapping() );
- if ( !opContext.getNewDn().isNormalized() )
+ if ( !renameContext.getNewDn().isNormalized() )
{
- opContext.getNewDn().normalize( schemaManager.getNormalizerMapping() );
+ renameContext.getNewDn().normalize( schemaManager.getNormalizerMapping() );
}
// Push to the next interceptor
- nextInterceptor.rename( opContext );
+ nextInterceptor.rename( renameContext );
}
@@ -241,17 +241,17 @@ public class NormalizationInterceptor ex
/**
* {@inheritDoc}
*/
- public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext )
+ public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext searchContext )
throws LdapException
{
- DN dn = opContext.getDn();
+ DN dn = searchContext.getDn();
if ( !dn.isNormalized() )
{
dn.normalize( schemaManager.getNormalizerMapping() );
}
- ExprNode filter = opContext.getFilter();
+ ExprNode filter = searchContext.getFilter();
// Normalize the filter
ExprNode result = ( ExprNode ) filter.accept( normVisitor );
@@ -260,14 +260,14 @@ public class NormalizationInterceptor ex
{
LOG
.warn( "undefined filter based on undefined attributeType not evaluted at all. Returning empty enumeration." );
- return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), opContext );
+ return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), searchContext );
}
else
{
- opContext.setFilter( result );
+ searchContext.setFilter( result );
// TODO Normalize the returned Attributes, storing the UP attributes to format the returned values.
- return nextInterceptor.search( opContext );
+ return nextInterceptor.search( searchContext );
}
}
@@ -275,21 +275,21 @@ public class NormalizationInterceptor ex
/**
* {@inheritDoc}
*/
- public boolean hasEntry( NextInterceptor nextInterceptor, EntryOperationContext opContext ) throws LdapException
+ public boolean hasEntry( NextInterceptor nextInterceptor, EntryOperationContext hasEntryContext ) throws LdapException
{
- opContext.getDn().normalize( schemaManager.getNormalizerMapping() );
- return nextInterceptor.hasEntry( opContext );
+ hasEntryContext.getDn().normalize( schemaManager.getNormalizerMapping() );
+ return nextInterceptor.hasEntry( hasEntryContext );
}
/**
* {@inheritDoc}
*/
- public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext )
+ public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext listContext )
throws LdapException
{
- opContext.getDn().normalize( schemaManager.getNormalizerMapping() );
- return nextInterceptor.list( opContext );
+ listContext.getDn().normalize( schemaManager.getNormalizerMapping() );
+ return nextInterceptor.list( listContext );
}
@@ -319,19 +319,19 @@ public class NormalizationInterceptor ex
/**
* {@inheritDoc}
*/
- public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext ) throws LdapException
+ public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext lookupContext ) throws LdapException
{
- opContext.getDn().normalize( schemaManager.getNormalizerMapping() );
+ lookupContext.getDn().normalize( schemaManager.getNormalizerMapping() );
- List<String> attrIds = opContext.getAttrsId();
+ List<String> attrIds = lookupContext.getAttrsId();
if ( ( attrIds != null ) && ( attrIds.size() > 0 ) )
{
// We have to normalize the requested IDs
- opContext.setAttrsId( normalizeAttrsId( opContext.getAttrsIdArray() ) );
+ lookupContext.setAttrsId( normalizeAttrsId( lookupContext.getAttrsIdArray() ) );
}
- return nextInterceptor.lookup( opContext );
+ return nextInterceptor.lookup( lookupContext );
}
@@ -374,10 +374,10 @@ public class NormalizationInterceptor ex
/**
* {@inheritDoc}
*/
- public void bind( NextInterceptor next, BindOperationContext opContext ) throws LdapException
+ public void bind( NextInterceptor next, BindOperationContext bindContext ) throws LdapException
{
- opContext.getDn().normalize( schemaManager.getNormalizerMapping() );
- next.bind( opContext );
+ bindContext.getDn().normalize( schemaManager.getNormalizerMapping() );
+ next.bind( bindContext );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Tue Jun 15 21:15:04 2010
@@ -243,16 +243,16 @@ public class OperationalAttributeInterce
/**
* {@inheritDoc}
*/
- public void modify( NextInterceptor nextInterceptor, ModifyOperationContext opContext ) throws LdapException
+ public void modify( NextInterceptor nextInterceptor, ModifyOperationContext modifyContext ) throws LdapException
{
// We must check that the user hasn't injected either the modifiersName
// or the modifyTimestamp operational attributes : they are not supposed to be
// added at this point EXCEPT in cases of replication by a admin user.
// If so, remove them, and if there are no more attributes, simply return.
// otherwise, inject those values into the list of modifications
- List<Modification> mods = opContext.getModItems();
+ List<Modification> mods = modifyContext.getModItems();
- boolean isAdmin = opContext.getSession().getAuthenticatedPrincipal().getDN().equals( adminDn );
+ boolean isAdmin = modifyContext.getSession().getAuthenticatedPrincipal().getDN().equals( adminDn );
boolean modifierAtPresent = false;
boolean modifiedTimeAtPresent = false;
@@ -313,17 +313,17 @@ public class OperationalAttributeInterce
}
// Go down in the chain
- nextInterceptor.modify( opContext );
+ nextInterceptor.modify( modifyContext );
}
- public void rename( NextInterceptor nextInterceptor, RenameOperationContext opContext ) throws LdapException
+ public void rename( NextInterceptor nextInterceptor, RenameOperationContext renameContext ) throws LdapException
{
- Entry entry = ((ClonedServerEntry)opContext.getEntry() ).getClonedEntry();
+ Entry entry = ((ClonedServerEntry)renameContext.getEntry() ).getClonedEntry();
entry.put( SchemaConstants.MODIFIERS_NAME_AT, getPrincipal().getName() );
entry.put( SchemaConstants.MODIFY_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
- nextInterceptor.rename( opContext );
+ nextInterceptor.rename( renameContext );
}
@@ -355,22 +355,22 @@ public class OperationalAttributeInterce
}
- public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext ) throws LdapException
+ public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext lookupContext ) throws LdapException
{
- Entry result = nextInterceptor.lookup( opContext );
+ Entry result = nextInterceptor.lookup( lookupContext );
if ( result == null )
{
return null;
}
- if ( opContext.getAttrsId() == null )
+ if ( lookupContext.getAttrsId() == null )
{
filterOperationalAttributes( result );
}
- else if ( ( opContext.getAllOperational() == null ) || ( opContext.getAllOperational() == false ) )
+ else if ( ( lookupContext.getAllOperational() == null ) || ( lookupContext.getAllOperational() == false ) )
{
- filter( opContext, result );
+ filter( lookupContext, result );
}
denormalizeEntryOpAttrs( result );
@@ -378,22 +378,22 @@ public class OperationalAttributeInterce
}
- public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext )
+ public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext listContext )
throws LdapException
{
- EntryFilteringCursor cursor = nextInterceptor.list( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.list( listContext );
cursor.addEntryFilter( SEARCH_FILTER );
return cursor;
}
- public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext )
+ public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext searchContext )
throws LdapException
{
- EntryFilteringCursor cursor = nextInterceptor.search( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.search( searchContext );
- if ( opContext.isAllOperationalAttributes()
- || ( opContext.getReturningAttributes() != null && !opContext.getReturningAttributes().isEmpty() ) )
+ if ( searchContext.isAllOperationalAttributes()
+ || ( searchContext.getReturningAttributes() != null && !searchContext.getReturningAttributes().isEmpty() ) )
{
if ( service.isDenormalizeOpAttrsEnabled() )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Tue Jun 15 21:15:04 2010
@@ -582,9 +582,9 @@ public class DefaultPartitionNexus exten
/* (non-Javadoc)
* @see org.apache.directory.server.core.partition.PartitionNexus#hasEntry(org.apache.directory.server.core.interceptor.context.EntryOperationContext)
*/
- public boolean hasEntry( EntryOperationContext opContext ) throws LdapException
+ public boolean hasEntry( EntryOperationContext hasEntryContext ) throws LdapException
{
- DN dn = opContext.getDn();
+ DN dn = hasEntryContext.getDn();
if ( IS_DEBUG )
{
@@ -597,26 +597,26 @@ public class DefaultPartitionNexus exten
}
Partition backend = getPartition( dn );
- return backend.hasEntry( opContext );
+ return backend.hasEntry( hasEntryContext );
}
/* (non-Javadoc)
* @see org.apache.directory.server.core.partition.PartitionNexus#list(org.apache.directory.server.core.interceptor.context.ListOperationContext)
*/
- public EntryFilteringCursor list( ListOperationContext opContext ) throws LdapException
+ public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
{
- Partition backend = getPartition( opContext.getDn() );
- return backend.list( opContext );
+ Partition backend = getPartition( listContext.getDn() );
+ return backend.list( listContext );
}
/* (non-Javadoc)
* @see org.apache.directory.server.core.partition.PartitionNexus#lookup(org.apache.directory.server.core.interceptor.context.LookupOperationContext)
*/
- public ClonedServerEntry lookup( LookupOperationContext opContext ) throws LdapException
+ public ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws LdapException
{
- DN dn = opContext.getDn();
+ DN dn = lookupContext.getDn();
// This is for the case we do a lookup on the rootDSE
if ( dn.size() == 0 )
@@ -624,13 +624,13 @@ public class DefaultPartitionNexus exten
ClonedServerEntry retval = new ClonedServerEntry( rootDSE );
Set<AttributeType> attributeTypes = rootDSE.getAttributeTypes();
- if ( opContext.getAttrsId() != null && !opContext.getAttrsId().isEmpty() )
+ if ( lookupContext.getAttrsId() != null && !lookupContext.getAttrsId().isEmpty() )
{
for ( AttributeType attributeType : attributeTypes )
{
String oid = attributeType.getOid();
- if ( !opContext.getAttrsId().contains( oid ) )
+ if ( !lookupContext.getAttrsId().contains( oid ) )
{
retval.removeAttributes( attributeType );
}
@@ -644,7 +644,7 @@ public class DefaultPartitionNexus exten
}
Partition backend = getPartition( dn );
- return backend.lookup( opContext );
+ return backend.lookup( lookupContext );
}
@@ -710,16 +710,16 @@ public class DefaultPartitionNexus exten
/* (non-Javadoc)
* @see org.apache.directory.server.core.partition.PartitionNexus#rename(org.apache.directory.server.core.interceptor.context.RenameOperationContext)
*/
- public void rename( RenameOperationContext opContext ) throws LdapException
+ public void rename( RenameOperationContext renameContext ) throws LdapException
{
- Partition backend = getPartition( opContext.getDn() );
- backend.rename( opContext );
+ Partition backend = getPartition( renameContext.getDn() );
+ backend.rename( renameContext );
}
- private EntryFilteringCursor searchRootDSE( SearchOperationContext searchOperationContext ) throws LdapException
+ private EntryFilteringCursor searchRootDSE( SearchOperationContext searchContext ) throws LdapException
{
- SearchControls searchControls = searchOperationContext.getSearchControls();
+ SearchControls searchControls = searchContext.getSearchControls();
String[] ids = searchControls.getReturningAttributes();
@@ -730,7 +730,7 @@ public class DefaultPartitionNexus exten
if ( ( ids == null ) || ( ids.length == 0 ) )
{
Entry rootDSE = getRootDSE( null );
- return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( rootDSE ), searchOperationContext );
+ return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( rootDSE ), searchContext );
}
// -----------------------------------------------------------
@@ -739,9 +739,9 @@ public class DefaultPartitionNexus exten
// -----------------------------------------------------------
Set<String> realIds = new HashSet<String>();
- boolean allUserAttributes = searchOperationContext.isAllUserAttributes();
- boolean allOperationalAttributes = searchOperationContext.isAllOperationalAttributes();
- boolean noAttribute = searchOperationContext.isNoAttributes();
+ boolean allUserAttributes = searchContext.isAllUserAttributes();
+ boolean allOperationalAttributes = searchContext.isAllOperationalAttributes();
+ boolean noAttribute = searchContext.isNoAttributes();
for ( String id : ids )
{
@@ -761,19 +761,19 @@ public class DefaultPartitionNexus exten
if ( noAttribute )
{
Entry serverEntry = new DefaultEntry( schemaManager, DN.EMPTY_DN );
- return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( serverEntry ), searchOperationContext );
+ return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( serverEntry ), searchContext );
}
// return everything
if ( allUserAttributes && allOperationalAttributes )
{
Entry rootDSE = getRootDSE( null );
- return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( rootDSE ), searchOperationContext );
+ return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( rootDSE ), searchContext );
}
Entry serverEntry = new DefaultEntry( schemaManager, DN.EMPTY_DN );
- Entry rootDSE = getRootDSE( new GetRootDSEOperationContext( searchOperationContext.getSession() ) );
+ Entry rootDSE = getRootDSE( new GetRootDSEOperationContext( searchContext.getSession() ) );
for ( EntryAttribute attribute : rootDSE )
{
@@ -793,18 +793,18 @@ public class DefaultPartitionNexus exten
}
}
- return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( serverEntry ), searchOperationContext );
+ return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( serverEntry ), searchContext );
}
/* (non-Javadoc)
* @see org.apache.directory.server.core.partition.PartitionNexus#search(org.apache.directory.server.core.interceptor.context.SearchOperationContext)
*/
- public EntryFilteringCursor search( SearchOperationContext opContext ) throws LdapException
+ public EntryFilteringCursor search( SearchOperationContext searchContext ) throws LdapException
{
- DN base = opContext.getDn();
- SearchControls searchCtls = opContext.getSearchControls();
- ExprNode filter = opContext.getFilter();
+ DN base = searchContext.getDn();
+ SearchControls searchCtls = searchContext.getSearchControls();
+ ExprNode filter = searchContext.getFilter();
// TODO since we're handling the *, and + in the EntryFilteringCursor
// we may not need this code: we need see if this is actually the
@@ -835,23 +835,23 @@ public class DefaultPartitionNexus exten
*/
if ( ( filter instanceof PresenceNode ) && isObjectScope && isSearchAll )
{
- return searchRootDSE( opContext );
+ return searchRootDSE( searchContext );
}
else if ( isObjectScope && ( !isSearchAll ) )
{
- return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), opContext );
+ return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), searchContext );
}
else if ( isOnelevelScope )
{
List<EntryFilteringCursor> cursors = new ArrayList<EntryFilteringCursor>();
for ( Partition p : partitions.values() )
{
- opContext.setDn( p.getSuffix() );
- opContext.setScope( SearchScope.OBJECT );
- cursors.add( p.search( opContext ) );
+ searchContext.setDn( p.getSuffix() );
+ searchContext.setScope( SearchScope.OBJECT );
+ cursors.add( p.search( searchContext ) );
}
- return new CursorList( cursors, opContext );
+ return new CursorList( cursors, searchContext );
}
else if ( isSublevelScope )
{
@@ -863,13 +863,13 @@ public class DefaultPartitionNexus exten
if ( entry != null )
{
Partition backend = getPartition( entry.getDn() );
- opContext.setDn( entry.getDn() );
- cursors.add( backend.search( opContext ) );
+ searchContext.setDn( entry.getDn() );
+ cursors.add( backend.search( searchContext ) );
}
}
// don't feed the above Cursors' list to a BaseEntryFilteringCursor it is skipping the naming context entry of each partition
- return new CursorList( cursors, opContext );
+ return new CursorList( cursors, searchContext );
}
// TODO : handle searches based on the RootDSE
@@ -882,7 +882,7 @@ public class DefaultPartitionNexus exten
}
Partition backend = getPartition( base );
- return backend.search( opContext );
+ return backend.search( searchContext );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Tue Jun 15 21:15:04 2010
@@ -265,12 +265,12 @@ public class ReferralInterceptor extends
*
* If the entry does not exist in the server, we will get a NoSuchObject error
*/
- public void delete( NextInterceptor next, DeleteOperationContext opContext ) throws LdapException
+ public void delete( NextInterceptor next, DeleteOperationContext deleteContext ) throws LdapException
{
// First delete the entry into the server
- next.delete( opContext );
+ next.delete( deleteContext );
- Entry entry = opContext.getEntry();
+ Entry entry = deleteContext.getEntry();
// Check if the entry exists and is a referral itself
// If so, we have to update the referralManager
@@ -339,17 +339,17 @@ public class ReferralInterceptor extends
/**
* {@inheritDoc}
**/
- public void rename( NextInterceptor next, RenameOperationContext opContext ) throws LdapException
+ public void rename( NextInterceptor next, RenameOperationContext renameContext ) throws LdapException
{
// Check if the entry is a referral itself
- boolean isReferral = isReferral( opContext.getEntry() );
+ boolean isReferral = isReferral( renameContext.getEntry() );
- next.rename( opContext );
+ next.rename( renameContext );
if ( isReferral )
{
// Update the referralManager
- LookupOperationContext lookupContext = new LookupOperationContext( opContext.getSession(), opContext
+ LookupOperationContext lookupContext = new LookupOperationContext( renameContext.getSession(), renameContext
.getNewDn() );
Entry newEntry = nexus.lookup( lookupContext );
@@ -357,7 +357,7 @@ public class ReferralInterceptor extends
referralManager.lockWrite();
referralManager.addReferral( newEntry );
- referralManager.removeReferral( opContext.getEntry().getOriginalEntry() );
+ referralManager.removeReferral( renameContext.getEntry().getOriginalEntry() );
referralManager.unlock();
}
@@ -367,12 +367,12 @@ public class ReferralInterceptor extends
/**
* Modify an entry in the server.
*/
- public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws LdapException
+ public void modify( NextInterceptor next, ModifyOperationContext modifyContext ) throws LdapException
{
- DN dn = opContext.getDn();
+ DN dn = modifyContext.getDn();
// handle a normal modify without following referrals
- next.modify( opContext );
+ next.modify( modifyContext );
// Check if we are trying to modify the schema or the rootDSE,
// if so, we don't modify the referralManager
@@ -387,7 +387,7 @@ public class ReferralInterceptor extends
// TODO: this can be spare, as we already have the altered entry
// into the opContext, but for an unknow reason, this will fail
// on eferral tests...
- LookupOperationContext lookupContext = new LookupOperationContext( opContext.getSession(), dn );
+ LookupOperationContext lookupContext = new LookupOperationContext( modifyContext.getSession(), dn );
Entry newEntry = nexus.lookup( lookupContext );
@@ -400,7 +400,7 @@ public class ReferralInterceptor extends
if ( referralManager.isReferral( newEntry.getDn() ) )
{
- referralManager.removeReferral( opContext.getEntry() );
+ referralManager.removeReferral( modifyContext.getEntry() );
referralManager.addReferral( newEntry );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Tue Jun 15 21:15:04 2010
@@ -388,10 +388,10 @@ public class SchemaInterceptor extends B
}
- public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext )
+ public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext listContext )
throws LdapException
{
- EntryFilteringCursor cursor = nextInterceptor.list( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.list( listContext );
cursor.addEntryFilter( binaryAttributeFilter );
return cursor;
}
@@ -666,12 +666,12 @@ public class SchemaInterceptor extends B
}
- public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext )
+ public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext searchContext )
throws LdapException
{
- DN base = opContext.getDn();
- SearchControls searchCtls = opContext.getSearchControls();
- ExprNode filter = opContext.getFilter();
+ DN base = searchContext.getDn();
+ SearchControls searchCtls = searchContext.getSearchControls();
+ ExprNode filter = searchContext.getFilter();
// We have to eliminate bad attributes from the request, accordingly
// to RFC 2251, chap. 4.5.1. Basically, all unknown attributes are removed
@@ -689,7 +689,7 @@ public class SchemaInterceptor extends B
// Deal with the normal case : searching for a normal value (not subSchemaSubEntry)
if ( !subschemaSubentryDnNorm.equals( baseNormForm ) )
{
- EntryFilteringCursor cursor = nextInterceptor.search( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.search( searchContext );
if ( searchCtls.getReturningAttributes() != null )
{
@@ -728,7 +728,7 @@ public class SchemaInterceptor extends B
}
else
{
- return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), opContext );
+ return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), searchContext );
}
String nodeOid = schemaManager.getAttributeTypeRegistry().getOidByName( node.getAttribute() );
@@ -741,11 +741,11 @@ public class SchemaInterceptor extends B
// call.setBypass( true );
Entry serverEntry = schemaService.getSubschemaEntry( searchCtls.getReturningAttributes() );
serverEntry.setDn( base );
- return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( serverEntry ), opContext );
+ return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( serverEntry ), searchContext );
}
else
{
- return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), opContext );
+ return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), searchContext );
}
}
else if ( filter instanceof PresenceNode )
@@ -759,23 +759,23 @@ public class SchemaInterceptor extends B
Entry serverEntry = schemaService.getSubschemaEntry( searchCtls.getReturningAttributes() );
serverEntry.setDn( base );
EntryFilteringCursor cursor = new BaseEntryFilteringCursor(
- new SingletonCursor<Entry>( serverEntry ), opContext );
+ new SingletonCursor<Entry>( serverEntry ), searchContext );
return cursor;
}
}
}
// In any case not handled previously, just return an empty result
- return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), opContext );
+ return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), searchContext );
}
/**
* Search for an entry, using its DN. Binary attributes and ObjectClass attribute are removed.
*/
- public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext ) throws LdapException
+ public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext lookupContext ) throws LdapException
{
- Entry result = nextInterceptor.lookup( opContext );
+ Entry result = nextInterceptor.lookup( lookupContext );
if ( result == null )
{
@@ -967,12 +967,12 @@ public class SchemaInterceptor extends B
}
- public void rename( NextInterceptor next, RenameOperationContext opContext ) throws LdapException
+ public void rename( NextInterceptor next, RenameOperationContext renameContext ) throws LdapException
{
- DN oldDn = opContext.getDn();
- RDN newRdn = opContext.getNewRdn();
- boolean deleteOldRn = opContext.getDeleteOldRdn();
- Entry entry = opContext.getEntry().getClonedEntry();
+ DN oldDn = renameContext.getDn();
+ RDN newRdn = renameContext.getNewRdn();
+ boolean deleteOldRn = renameContext.getDeleteOldRdn();
+ Entry entry = renameContext.getEntry().getClonedEntry();
/*
* Note: This is only a consistency checks, to the ensure that all
@@ -1016,11 +1016,11 @@ public class SchemaInterceptor extends B
}
// Substitute the RDN and check if the new entry is correct
- entry.setDn( opContext.getNewDn() );
+ entry.setDn( renameContext.getNewDn() );
- check( opContext.getNewDn(), entry );
+ check( renameContext.getNewDn(), entry );
- next.rename( opContext );
+ next.rename( renameContext );
}
@@ -1221,7 +1221,7 @@ public class SchemaInterceptor extends B
/**
* {@inheritDoc}
*/
- public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws LdapException
+ public void modify( NextInterceptor next, ModifyOperationContext modifyContext ) throws LdapException
{
// A modification on a simple entry will be done in three steps :
// - get the original entry (it should already been in the context)
@@ -1238,15 +1238,15 @@ public class SchemaInterceptor extends B
// First, check that the entry is either a subschemaSubentry or a schema element.
// This is the case if it's a child of cn=schema or ou=schema
- DN dn = opContext.getDn();
+ DN dn = modifyContext.getDn();
// Gets the stored entry on which the modification must be applied
if ( dn.equals( subschemaSubentryDn ) )
{
- LOG.debug( "Modification attempt on schema subentry {}: \n{}", dn, opContext );
+ LOG.debug( "Modification attempt on schema subentry {}: \n{}", dn, modifyContext );
// We can get rid of the modifiersName and modifyTimestamp, they are useless.
- List<Modification> mods = opContext.getModItems();
+ List<Modification> mods = modifyContext.getModItems();
List<Modification> cleanMods = new ArrayList<Modification>();
for ( Modification mod : mods )
@@ -1259,20 +1259,20 @@ public class SchemaInterceptor extends B
}
}
- opContext.setModItems( cleanMods );
+ modifyContext.setModItems( cleanMods );
// Now that the entry has been modified, update the SSSE
- schemaSubEntryManager.modifySchemaSubentry( opContext, opContext
+ schemaSubEntryManager.modifySchemaSubentry( modifyContext, modifyContext
.hasRequestControl( CascadeControl.CONTROL_OID ) );
return;
}
- Entry entry = opContext.getEntry();
- List<Modification> modifications = opContext.getModItems();
+ Entry entry = modifyContext.getEntry();
+ List<Modification> modifications = modifyContext.getModItems();
checkModifyEntry( dn, entry, modifications );
- next.modify( opContext );
+ next.modify( modifyContext );
}
@@ -1316,7 +1316,6 @@ public class SchemaInterceptor extends B
break;
}
}
-
}
}
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java Tue Jun 15 21:15:04 2010
@@ -155,9 +155,9 @@ public class SchemaSubentryManager
/* (non-Javadoc)
* @see org.apache.directory.server.core.schema.SchemaChangeManager#modifySchemaSubentry(org.apache.directory.server.core.interceptor.context.ModifyOperationContext, org.apache.directory.server.core.entry.Entry, org.apache.directory.server.core.entry.Entry, boolean)
*/
- public void modifySchemaSubentry( ModifyOperationContext opContext, boolean doCascadeModify ) throws LdapException
+ public void modifySchemaSubentry( ModifyOperationContext modifyContext, boolean doCascadeModify ) throws LdapException
{
- for ( Modification mod : opContext.getModItems() )
+ for ( Modification mod : modifyContext.getModItems() )
{
String opAttrOid = schemaManager.getAttributeTypeRegistry().getOidByName( mod.getAttribute().getId() );
@@ -166,11 +166,11 @@ public class SchemaSubentryManager
switch ( mod.getOperation() )
{
case ADD_ATTRIBUTE :
- modifyAddOperation( opContext, opAttrOid, serverAttribute, doCascadeModify );
+ modifyAddOperation( modifyContext, opAttrOid, serverAttribute, doCascadeModify );
break;
case REMOVE_ATTRIBUTE :
- modifyRemoveOperation( opContext, opAttrOid, serverAttribute );
+ modifyRemoveOperation( modifyContext, opAttrOid, serverAttribute );
break;
case REPLACE_ATTRIBUTE :
@@ -187,7 +187,7 @@ public class SchemaSubentryManager
/* (non-Javadoc)
* @see org.apache.directory.server.core.schema.SchemaChangeManager#modifySchemaSubentry(org.apache.directory.server.core.interceptor.context.ModifyOperationContext, org.apache.directory.shared.ldap.name.DN, int, org.apache.directory.server.core.entry.Entry, org.apache.directory.server.core.entry.Entry, org.apache.directory.server.core.entry.Entry, boolean)
*/
- public void modifySchemaSubentry( ModifyOperationContext opContext, DN name, int modOp, Entry mods,
+ public void modifySchemaSubentry( ModifyOperationContext modifyContext, DN name, int modOp, Entry mods,
Entry subentry, Entry targetSubentry, boolean doCascadeModify ) throws Exception
{
Set<AttributeType> attributeTypes = mods.getAttributeTypes();
@@ -197,7 +197,7 @@ public class SchemaSubentryManager
case( DirContext.ADD_ATTRIBUTE ):
for ( AttributeType attributeType:attributeTypes )
{
- modifyAddOperation( opContext, attributeType.getOid(),
+ modifyAddOperation( modifyContext, attributeType.getOid(),
mods.get( attributeType ), doCascadeModify );
}
@@ -206,7 +206,7 @@ public class SchemaSubentryManager
case( DirContext.REMOVE_ATTRIBUTE ):
for ( AttributeType attributeType:attributeTypes )
{
- modifyRemoveOperation( opContext, attributeType.getOid(),
+ modifyRemoveOperation( modifyContext, attributeType.getOid(),
mods.get( attributeType ) );
}
@@ -231,7 +231,7 @@ public class SchemaSubentryManager
* @throws Exception if there are problems updating the registries and the
* schema partition
*/
- private void modifyRemoveOperation( ModifyOperationContext opContext, String opAttrOid,
+ private void modifyRemoveOperation( ModifyOperationContext modifyContext, String opAttrOid,
EntryAttribute mods ) throws LdapException
{
int index = opAttr2handlerIndex.get( opAttrOid );
@@ -243,7 +243,7 @@ public class SchemaSubentryManager
for ( LdapComparatorDescription comparatorDescription : comparatorDescriptions )
{
- subentryModifier.delete( opContext, comparatorDescription );
+ subentryModifier.delete( modifyContext, comparatorDescription );
}
break;
case( NORMALIZER_INDEX ):
@@ -251,7 +251,7 @@ public class SchemaSubentryManager
for ( NormalizerDescription normalizerDescription : normalizerDescriptions )
{
- subentryModifier.delete( opContext, normalizerDescription );
+ subentryModifier.delete( modifyContext, normalizerDescription );
}
break;
@@ -261,7 +261,7 @@ public class SchemaSubentryManager
for ( SyntaxCheckerDescription syntaxCheckerDescription : syntaxCheckerDescriptions )
{
- subentryModifier.delete( opContext, syntaxCheckerDescription );
+ subentryModifier.delete( modifyContext, syntaxCheckerDescription );
}
break;
@@ -271,7 +271,7 @@ public class SchemaSubentryManager
for ( LdapSyntax syntax : syntaxes )
{
- subentryModifier.deleteSchemaObject( opContext, syntax );
+ subentryModifier.deleteSchemaObject( modifyContext, syntax );
}
break;
@@ -281,7 +281,7 @@ public class SchemaSubentryManager
for ( MatchingRule mr : mrs )
{
- subentryModifier.deleteSchemaObject( opContext, mr );
+ subentryModifier.deleteSchemaObject( modifyContext, mr );
}
break;
@@ -291,7 +291,7 @@ public class SchemaSubentryManager
for ( AttributeType at : ats )
{
- subentryModifier.deleteSchemaObject( opContext, at );
+ subentryModifier.deleteSchemaObject( modifyContext, at );
}
break;
@@ -301,7 +301,7 @@ public class SchemaSubentryManager
for ( ObjectClass oc : ocs )
{
- subentryModifier.deleteSchemaObject( opContext, oc );
+ subentryModifier.deleteSchemaObject( modifyContext, oc );
}
break;
@@ -311,7 +311,7 @@ public class SchemaSubentryManager
for ( MatchingRuleUse mru : mrus )
{
- subentryModifier.deleteSchemaObject( opContext, mru );
+ subentryModifier.deleteSchemaObject( modifyContext, mru );
}
break;
@@ -321,7 +321,7 @@ public class SchemaSubentryManager
for ( DITStructureRule dsr : dsrs )
{
- subentryModifier.deleteSchemaObject( opContext, dsr );
+ subentryModifier.deleteSchemaObject( modifyContext, dsr );
}
break;
@@ -331,7 +331,7 @@ public class SchemaSubentryManager
for ( DITContentRule dcr : dcrs )
{
- subentryModifier.deleteSchemaObject( opContext, dcr );
+ subentryModifier.deleteSchemaObject( modifyContext, dcr );
}
break;
@@ -341,7 +341,7 @@ public class SchemaSubentryManager
for ( NameForm nf : nfs )
{
- subentryModifier.deleteSchemaObject( opContext, nf );
+ subentryModifier.deleteSchemaObject( modifyContext, nf );
}
break;
@@ -362,7 +362,7 @@ public class SchemaSubentryManager
* @throws Exception if there are problems updating the registries and the
* schema partition
*/
- private void modifyAddOperation( ModifyOperationContext opContext, String opAttrOid,
+ private void modifyAddOperation( ModifyOperationContext modifyContext, String opAttrOid,
EntryAttribute mods, boolean doCascadeModify ) throws LdapException
{
if ( doCascadeModify )
@@ -379,7 +379,7 @@ public class SchemaSubentryManager
for ( LdapComparatorDescription comparatorDescription : comparatorDescriptions )
{
- subentryModifier.add( opContext, comparatorDescription );
+ subentryModifier.add( modifyContext, comparatorDescription );
}
break;
@@ -389,7 +389,7 @@ public class SchemaSubentryManager
for ( NormalizerDescription normalizerDescription : normalizerDescriptions )
{
- subentryModifier.add( opContext, normalizerDescription );
+ subentryModifier.add( modifyContext, normalizerDescription );
}
break;
@@ -399,7 +399,7 @@ public class SchemaSubentryManager
for ( SyntaxCheckerDescription syntaxCheckerDescription : syntaxCheckerDescriptions )
{
- subentryModifier.add( opContext, syntaxCheckerDescription );
+ subentryModifier.add( modifyContext, syntaxCheckerDescription );
}
break;
@@ -409,7 +409,7 @@ public class SchemaSubentryManager
for ( LdapSyntax syntax : syntaxes )
{
- subentryModifier.addSchemaObject( opContext, syntax );
+ subentryModifier.addSchemaObject( modifyContext, syntax );
}
break;
@@ -419,7 +419,7 @@ public class SchemaSubentryManager
for ( MatchingRule mr : mrs )
{
- subentryModifier.addSchemaObject( opContext, mr );
+ subentryModifier.addSchemaObject( modifyContext, mr );
}
break;
@@ -429,7 +429,7 @@ public class SchemaSubentryManager
for ( AttributeType at : ats )
{
- subentryModifier.addSchemaObject( opContext, at );
+ subentryModifier.addSchemaObject( modifyContext, at );
}
break;
@@ -439,7 +439,7 @@ public class SchemaSubentryManager
for ( ObjectClass oc : ocs )
{
- subentryModifier.addSchemaObject( opContext, oc );
+ subentryModifier.addSchemaObject( modifyContext, oc );
}
break;
@@ -449,7 +449,7 @@ public class SchemaSubentryManager
for ( MatchingRuleUse mru : mrus )
{
- subentryModifier.addSchemaObject( opContext, mru );
+ subentryModifier.addSchemaObject( modifyContext, mru );
}
break;
@@ -459,7 +459,7 @@ public class SchemaSubentryManager
for ( DITStructureRule dsr : dsrs )
{
- subentryModifier.addSchemaObject( opContext, dsr );
+ subentryModifier.addSchemaObject( modifyContext, dsr );
}
break;
@@ -469,7 +469,7 @@ public class SchemaSubentryManager
for ( DITContentRule dcr : dcrs )
{
- subentryModifier.addSchemaObject( opContext, dcr );
+ subentryModifier.addSchemaObject( modifyContext, dcr );
}
break;
@@ -479,7 +479,7 @@ public class SchemaSubentryManager
for ( NameForm nf : nfs )
{
- subentryModifier.addSchemaObject( opContext, nf );
+ subentryModifier.addSchemaObject( modifyContext, nf );
}
break;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Tue Jun 15 21:15:04 2010
@@ -252,12 +252,12 @@ public class SubentryInterceptor extends
// Methods/Code dealing with Subentry Visibility
// -----------------------------------------------------------------------
- public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext )
+ public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext listContext )
throws LdapException
{
- EntryFilteringCursor cursor = nextInterceptor.list( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.list( listContext );
- if ( !isSubentryVisible( opContext ) )
+ if ( !isSubentryVisible( listContext ) )
{
cursor.addEntryFilter( new HideSubentriesFilter() );
}
@@ -266,19 +266,19 @@ public class SubentryInterceptor extends
}
- public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext )
+ public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext searchContext )
throws LdapException
{
- EntryFilteringCursor cursor = nextInterceptor.search( opContext );
+ EntryFilteringCursor cursor = nextInterceptor.search( searchContext );
// object scope searches by default return subentries
- if ( opContext.getScope() == SearchScope.OBJECT )
+ if ( searchContext.getScope() == SearchScope.OBJECT )
{
return cursor;
}
// for subtree and one level scope we filter
- if ( !isSubentryVisible( opContext ) )
+ if ( !isSubentryVisible( searchContext ) )
{
cursor.addEntryFilter( new HideSubentriesFilter() );
}
@@ -602,15 +602,15 @@ public class SubentryInterceptor extends
// Methods dealing subentry deletion
// -----------------------------------------------------------------------
- public void delete( NextInterceptor next, DeleteOperationContext opContext ) throws LdapException
+ public void delete( NextInterceptor next, DeleteOperationContext deleteContext ) throws LdapException
{
- DN name = opContext.getDn();
- Entry entry = opContext.getEntry();
+ DN name = deleteContext.getDn();
+ Entry entry = deleteContext.getEntry();
EntryAttribute objectClasses = entry.get( objectClassType );
if ( objectClasses.contains( SchemaConstants.SUBENTRY_OC ) )
{
- next.delete( opContext );
+ next.delete( deleteContext );
SubtreeSpecification ss = subentryCache.removeSubentry( name.getNormName() ).getSubtreeSpecification();
@@ -634,7 +634,7 @@ public class SubentryInterceptor extends
controls.setReturningAttributes( new String[]
{ SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
- SearchOperationContext searchOperationContext = new SearchOperationContext( opContext.getSession(), baseDn,
+ SearchOperationContext searchOperationContext = new SearchOperationContext( deleteContext.getSession(), baseDn,
filter, controls );
searchOperationContext.setAliasDerefMode( AliasDerefMode.NEVER_DEREF_ALIASES );
@@ -650,7 +650,7 @@ public class SubentryInterceptor extends
if ( evaluator.evaluate( ss, apName, dn, candidate ) )
{
- nexus.modify( new ModifyOperationContext( opContext.getSession(), dn, getOperationalModsForRemove(
+ nexus.modify( new ModifyOperationContext( deleteContext.getSession(), dn, getOperationalModsForRemove(
name, candidate ) ) );
}
}
@@ -664,7 +664,7 @@ public class SubentryInterceptor extends
}
else
{
- next.delete( opContext );
+ next.delete( deleteContext );
}
}
@@ -1093,12 +1093,12 @@ public class SubentryInterceptor extends
/**
* {@inheritDoc}
*/
- public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws LdapException
+ public void modify( NextInterceptor next, ModifyOperationContext modifyContext ) throws LdapException
{
- DN dn = opContext.getDn();
- List<Modification> mods = opContext.getModItems();
+ DN dn = modifyContext.getDn();
+ List<Modification> mods = modifyContext.getModItems();
- Entry entry = opContext.getEntry();
+ Entry entry = modifyContext.getEntry();
EntryAttribute objectClasses = entry.get( objectClassType );
boolean isSubtreeSpecificationModification = false;
@@ -1132,7 +1132,7 @@ public class SubentryInterceptor extends
}
subentryCache.setSubentry( dn.getNormName(), ssNew, getSubentryTypes( entry, mods ) );
- next.modify( opContext );
+ next.modify( modifyContext );
// search for all entries selected by the old SS and remove references to subentry
DN apName = ( DN ) dn.clone();
@@ -1146,7 +1146,7 @@ public class SubentryInterceptor extends
controls.setReturningAttributes( new String[]
{ SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
- SearchOperationContext searchOperationContext = new SearchOperationContext( opContext.getSession(),
+ SearchOperationContext searchOperationContext = new SearchOperationContext( modifyContext.getSession(),
oldBaseDn, filter, controls );
searchOperationContext.setAliasDerefMode( AliasDerefMode.NEVER_DEREF_ALIASES );
@@ -1162,7 +1162,7 @@ public class SubentryInterceptor extends
if ( evaluator.evaluate( ssOld, apName, candidateDn, candidate ) )
{
- nexus.modify( new ModifyOperationContext( opContext.getSession(), candidateDn,
+ nexus.modify( new ModifyOperationContext( modifyContext.getSession(), candidateDn,
getOperationalModsForRemove( dn, candidate ) ) );
}
}
@@ -1178,7 +1178,7 @@ public class SubentryInterceptor extends
DN newBaseDn = ( DN ) apName.clone();
newBaseDn.addAll( ssNew.getBase() );
- searchOperationContext = new SearchOperationContext( opContext.getSession(), newBaseDn, filter, controls );
+ searchOperationContext = new SearchOperationContext( modifyContext.getSession(), newBaseDn, filter, controls );
searchOperationContext.setAliasDerefMode( AliasDerefMode.NEVER_DEREF_ALIASES );
subentries = nexus.search( searchOperationContext );
@@ -1193,7 +1193,7 @@ public class SubentryInterceptor extends
if ( evaluator.evaluate( ssNew, apName, candidateDn, candidate ) )
{
- nexus.modify( new ModifyOperationContext( opContext.getSession(), candidateDn,
+ nexus.modify( new ModifyOperationContext( modifyContext.getSession(), candidateDn,
getOperationalModsForAdd( candidate, operational ) ) );
}
}
@@ -1205,17 +1205,17 @@ public class SubentryInterceptor extends
}
else
{
- next.modify( opContext );
+ next.modify( modifyContext );
if ( !objectClasses.contains( SchemaConstants.SUBENTRY_OC ) )
{
- Entry newEntry = opContext.getAlteredEntry();
+ Entry newEntry = modifyContext.getAlteredEntry();
List<Modification> subentriesOpAttrMods = getModsOnEntryModification( dn, entry, newEntry );
if ( subentriesOpAttrMods.size() > 0 )
{
- nexus.modify( new ModifyOperationContext( opContext.getSession(), dn, subentriesOpAttrMods ) );
+ nexus.modify( new ModifyOperationContext( modifyContext.getSession(), dn, subentriesOpAttrMods ) );
}
}
}
@@ -1462,7 +1462,7 @@ public class SubentryInterceptor extends
*/
public class HideSubentriesFilter implements EntryFilter
{
- public boolean accept( SearchingOperationContext operation, ClonedServerEntry entry ) throws Exception
+ public boolean accept( SearchingOperationContext searchContext, ClonedServerEntry entry ) throws Exception
{
String dn = entry.getDn().getNormName();
@@ -1493,7 +1493,7 @@ public class SubentryInterceptor extends
*/
public class HideEntriesFilter implements EntryFilter
{
- public boolean accept( SearchingOperationContext operation, ClonedServerEntry entry ) throws Exception
+ public boolean accept( SearchingOperationContext searchContext, ClonedServerEntry entry ) throws Exception
{
String dn = entry.getDn().getNormName();
@@ -1576,5 +1576,4 @@ public class SubentryInterceptor extends
return modList;
}
-
}