You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/06/14 05:22:12 UTC
svn commit: r414035 [3/8] - in /directory/trunks/apacheds: ./ core-plugin/
core-shared/ core-unit/
core-unit/src/main/java/org/apache/directory/server/core/unit/
core-unit/src/test/java/org/apache/directory/server/core/
core-unit/src/test/java/org/apac...
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java?rev=414035&r1=414034&r2=414035&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java Tue Jun 13 20:22:05 2006
@@ -30,7 +30,7 @@
import org.apache.directory.server.core.subtree.SubentryService;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
-import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import javax.naming.NamingException;
@@ -135,7 +135,7 @@
for ( int ii = 0; ii < subentries.size(); ii++ )
{
String subentryDnStr = ( String ) subentries.get( ii );
- Name subentryDn = new LdapName( subentryDnStr );
+ LdapDN subentryDn = new LdapDN( subentryDnStr );
Attributes subentry = nexus.lookup( subentryDn );
NamingEnumeration attrIds = subentry.getIDs();
while ( attrIds.hasMore() )
@@ -236,7 +236,7 @@
// Interceptor Method Overrides
// ------------------------------------------------------------------------
- public Attributes lookup( NextInterceptor nextInterceptor, Name name ) throws NamingException
+ public Attributes lookup( NextInterceptor nextInterceptor, LdapDN name ) throws NamingException
{
Attributes result = nextInterceptor.lookup( name );
if ( result == null )
@@ -246,9 +246,9 @@
filter( result );
return result;
}
+
-
- public Attributes lookup( NextInterceptor nextInterceptor, Name name, String[] attrIds ) throws NamingException
+ public Attributes lookup( NextInterceptor nextInterceptor, LdapDN name, String[] attrIds ) throws NamingException
{
Attributes result = nextInterceptor.lookup( name, attrIds );
if ( result == null )
@@ -261,7 +261,7 @@
}
- public NamingEnumeration list( NextInterceptor nextInterceptor, Name base ) throws NamingException
+ public NamingEnumeration list( NextInterceptor nextInterceptor, LdapDN base ) throws NamingException
{
NamingEnumeration e = nextInterceptor.list( base );
Invocation invocation = InvocationStack.getInstance().peek();
@@ -269,7 +269,7 @@
}
- public NamingEnumeration search( NextInterceptor nextInterceptor, Name base, Map env, ExprNode filter,
+ public NamingEnumeration search( NextInterceptor nextInterceptor, LdapDN base, Map env, ExprNode filter,
SearchControls searchCtls ) throws NamingException
{
NamingEnumeration e = nextInterceptor.search( base, env, filter, searchCtls );
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java?rev=414035&r1=414034&r2=414035&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java Tue Jun 13 20:22:05 2006
@@ -33,7 +33,7 @@
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmDirectoryPartition;
import org.apache.directory.server.core.schema.MatchingRuleRegistry;
import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
-import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.Normalizer;
@@ -188,7 +188,7 @@
*/
public Name getNormalizedSuffix( Normalizer normalizer ) throws NamingException
{
- return new LdapName( normalizer.normalize( suffix ).toString() );
+ return new LdapDN( normalizer.normalize( suffix ).toString() );
}
@@ -200,7 +200,7 @@
suffix = suffix.trim();
try
{
- new LdapName( suffix );
+ new LdapDN( suffix );
}
catch ( NamingException e )
{
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/RemoveDirectoryPartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/RemoveDirectoryPartitionConfiguration.java?rev=414035&r1=414034&r2=414035&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/RemoveDirectoryPartitionConfiguration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/RemoveDirectoryPartitionConfiguration.java Tue Jun 13 20:22:05 2006
@@ -19,12 +19,11 @@
package org.apache.directory.server.core.configuration;
-import javax.naming.Name;
import javax.naming.NamingException;
import org.apache.directory.server.core.partition.DirectoryPartition;
import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
-import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.name.LdapDN;
/**
@@ -38,16 +37,16 @@
{
private static final long serialVersionUID = -6690435863387769527L;
- private final Name suffix;
+ private final LdapDN suffix;
- public RemoveDirectoryPartitionConfiguration(String suffix) throws NamingException
+ public RemoveDirectoryPartitionConfiguration( String suffix ) throws NamingException
{
- this( new LdapName( suffix.trim() ) );
+ this( new LdapDN( suffix.trim() ) );
}
- public RemoveDirectoryPartitionConfiguration(Name suffix)
+ public RemoveDirectoryPartitionConfiguration( LdapDN suffix )
{
if ( suffix == null )
{
@@ -58,7 +57,7 @@
}
- public Name getSuffix()
+ public LdapDN getSuffix()
{
return suffix;
}
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java?rev=414035&r1=414034&r2=414035&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java Tue Jun 13 20:22:05 2006
@@ -21,7 +21,6 @@
import java.util.List;
import java.util.NoSuchElementException;
-import javax.naming.Name;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
@@ -30,10 +29,11 @@
import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
import org.apache.directory.server.core.referral.ReferralLut;
+import org.apache.directory.server.core.schema.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.codec.util.LdapURL;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
-import org.apache.directory.shared.ldap.name.DnParser;
+import org.apache.directory.shared.ldap.name.LdapDN;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,7 +52,6 @@
private final List referrals = new ArrayList();
private final NamingEnumeration underlying;
private final ReferralLut lut;
- private final DnParser parser;
private final DirectoryPartitionNexus nexus;
private final boolean doThrow;
private final int scope;
@@ -60,11 +59,10 @@
private int refIndex = -1;
- public ReferralHandlingEnumeration(NamingEnumeration underlying, ReferralLut lut, DnParser parser,
- DirectoryPartitionNexus nexus, int scope, boolean doThrow) throws NamingException
+ public ReferralHandlingEnumeration( NamingEnumeration underlying, ReferralLut lut, AttributeTypeRegistry registry,
+ DirectoryPartitionNexus nexus, int scope, boolean doThrow ) throws NamingException
{
this.underlying = underlying;
- this.parser = parser;
this.doThrow = doThrow;
this.lut = lut;
this.scope = scope;
@@ -78,7 +76,9 @@
while ( underlying.hasMore() )
{
SearchResult result = ( SearchResult ) underlying.next();
- Name dn = parser.parse( result.getName() );
+ LdapDN dn = new LdapDN( result.getName() );
+ dn.normalize();
+
if ( lut.isReferral( dn ) )
{
referrals.add( result );
@@ -164,7 +164,9 @@
Attribute refs = prefetched.getAttributes().get( REF_ATTR );
if ( refs == null )
{
- refs = nexus.lookup( parser.parse( prefetched.getName() ) ).get( REF_ATTR );
+ LdapDN prefetchedDn = new LdapDN( prefetched.getName() );
+ prefetchedDn.normalize();
+ refs = nexus.lookup( prefetchedDn ).get( REF_ATTR );
}
if ( refs == null )
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilteringEnumeration.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilteringEnumeration.java?rev=414035&r1=414034&r2=414035&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilteringEnumeration.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilteringEnumeration.java Tue Jun 13 20:22:05 2006
@@ -36,7 +36,7 @@
import org.apache.directory.shared.ldap.exception.OperationAbandonedException;
import org.apache.directory.shared.ldap.message.AbandonListener;
import org.apache.directory.shared.ldap.message.AbandonableRequest;
-import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.name.LdapDN;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -245,7 +245,8 @@
DirContext ctx = ( DirContext ) invocation.getCaller();
Hashtable env = ctx.getEnvironment();
Attributes attrs = result.getAttributes();
- Name name = new LdapName( result.getName() );
+ Name name = new LdapDN( result.getName() );
+
try
{
Object obj = DirectoryManager.getObjectInstance( null, name, ctx, env, attrs );
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java?rev=414035&r1=414034&r2=414035&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java Tue Jun 13 20:22:05 2006
@@ -23,14 +23,22 @@
import org.apache.directory.server.core.interceptor.NextInterceptor;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
+import org.apache.directory.server.core.normalization.NormalizingVisitor;
import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.core.schema.ConcreteNameComponentNormalizer;
import org.apache.directory.server.core.schema.OidRegistry;
import org.apache.directory.shared.ldap.filter.BranchNode;
import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.LeafNode;
import org.apache.directory.shared.ldap.filter.ScopeNode;
import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.naming.Name;
import javax.naming.NamingException;
@@ -53,19 +61,24 @@
*/
public class EventService extends BaseInterceptor
{
+ private static Logger log = LoggerFactory.getLogger( EventService.class );
private DirectoryPartitionNexus nexus;
private Map sources = new HashMap();
private Evaluator evaluator = null;
+ private AttributeTypeRegistry attributeRegistry;
+ private NormalizingVisitor visitor;
-
+
public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
{
super.init( factoryCfg, cfg );
OidRegistry oidRegistry = factoryCfg.getGlobalRegistries().getOidRegistry();
- AttributeTypeRegistry attrRegistry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
- evaluator = new ExpressionEvaluator( oidRegistry, attrRegistry );
+ attributeRegistry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
+ evaluator = new ExpressionEvaluator( oidRegistry, attributeRegistry );
nexus = factoryCfg.getPartitionNexus();
+ NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( attributeRegistry, oidRegistry );
+ visitor = new NormalizingVisitor( ncn, factoryCfg.getGlobalRegistries().getOidRegistry() );
}
@@ -79,14 +92,71 @@
* @param namingListener the naming listener to register
*/
public void addNamingListener( EventContext ctx, Name name, ExprNode filter, SearchControls searchControls,
- NamingListener namingListener )
+ NamingListener namingListener ) throws NamingException
{
- ScopeNode scope = new ScopeNode( DerefAliasesEnum.NEVERDEREFALIASES, name.toString(), searchControls
- .getSearchScope() );
- BranchNode and = new BranchNode( BranchNode.AND );
- and.addNode( scope );
- and.addNode( filter );
- EventSourceRecord rec = new EventSourceRecord( name, and, ctx, searchControls, namingListener );
+ LdapDN normalizedBaseDn = new LdapDN( name );
+ normalizedBaseDn.normalize();
+
+ // -------------------------------------------------------------------
+ // must normalize the filter here: need to handle special cases
+ // -------------------------------------------------------------------
+
+ if ( filter.isLeaf() )
+ {
+ LeafNode ln = ( LeafNode ) filter;
+ if ( !attributeRegistry.hasAttributeType( ln.getAttribute() ) )
+ {
+ StringBuffer buf = new StringBuffer();
+ buf.append( "undefined filter based on undefined attributeType '" );
+ buf.append( ln.getAttribute() );
+ buf.append( "' not evaluted at all. Only using scope node." );
+ log.warn( buf.toString() );
+ filter = null;
+ }
+ else
+ {
+ filter.accept( visitor );
+ }
+ }
+ else
+ {
+ filter.accept( visitor );
+
+ // Check that after pruning/normalization we have a valid branch node at the top
+ BranchNode child = ( BranchNode ) filter;
+
+ // If the remaining filter branch node has no children set filter to null
+ if ( child.getChildren().size() == 0 )
+ {
+ log.warn( "Undefined branchnode filter without child nodes not evaluted at all. " +
+ "Only using scope node." );
+ filter = null;
+ }
+
+ // Now for AND & OR nodes with a single child left replace them with their child
+ if ( child.getChildren().size() == 1 && child.getOperator() != BranchNode.NOT )
+ {
+ filter = child.getChild();
+ }
+ }
+
+
+ ScopeNode scope = new ScopeNode( DerefAliasesEnum.NEVERDEREFALIASES, normalizedBaseDn.toNormName(),
+ searchControls.getSearchScope() );
+
+ if ( filter != null )
+ {
+ BranchNode and = new BranchNode( BranchNode.AND );
+ and.addNode( scope );
+ and.addNode( filter );
+ filter = and;
+ }
+ else
+ {
+ filter = scope;
+ }
+
+ EventSourceRecord rec = new EventSourceRecord( name, filter, ctx, searchControls, namingListener );
Object obj = sources.get( namingListener );
if ( obj == null )
@@ -98,6 +168,7 @@
List list = new ArrayList();
list.add( obj );
list.add( rec );
+ sources.put( namingListener, list );
}
else if ( obj instanceof List )
{
@@ -142,9 +213,9 @@
}
- public void add( NextInterceptor next, String upName, Name normName, Attributes entry ) throws NamingException
+ public void add( NextInterceptor next, LdapDN normName, Attributes entry ) throws NamingException
{
- super.add( next, upName, normName, entry );
+ super.add( next, normName, entry );
Set selecting = getSelectingSources( normName, entry );
if ( selecting.isEmpty() )
{
@@ -160,7 +231,7 @@
if ( listener instanceof NamespaceChangeListener )
{
NamespaceChangeListener nclistener = ( NamespaceChangeListener ) listener;
- Binding binding = new Binding( upName, entry, false );
+ Binding binding = new Binding( normName.toUpName(), entry, false );
nclistener.objectAdded( new NamingEvent( rec.getEventContext(), NamingEvent.OBJECT_ADDED, binding,
null, entry ) );
}
@@ -168,7 +239,7 @@
}
- public void delete( NextInterceptor next, Name name ) throws NamingException
+ public void delete( NextInterceptor next, LdapDN name ) throws NamingException
{
Attributes entry = nexus.lookup( name );
super.delete( next, name );
@@ -187,7 +258,7 @@
if ( listener instanceof NamespaceChangeListener )
{
NamespaceChangeListener nclistener = ( NamespaceChangeListener ) listener;
- Binding binding = new Binding( name.toString(), entry, false );
+ Binding binding = new Binding( name.toUpName(), entry, false );
nclistener.objectRemoved( new NamingEvent( rec.getEventContext(), NamingEvent.OBJECT_REMOVED, null,
binding, entry ) );
}
@@ -195,7 +266,7 @@
}
- private void notifyOnModify( Name name, ModificationItem[] mods, Attributes oriEntry ) throws NamingException
+ private void notifyOnModify( LdapDN name, ModificationItem[] mods, Attributes oriEntry ) throws NamingException
{
Attributes entry = nexus.lookup( name );
Set selecting = getSelectingSources( name, entry );
@@ -213,8 +284,8 @@
if ( listener instanceof ObjectChangeListener )
{
ObjectChangeListener oclistener = ( ObjectChangeListener ) listener;
- Binding before = new Binding( name.toString(), oriEntry, false );
- Binding after = new Binding( name.toString(), entry, false );
+ Binding before = new Binding( name.toUpName(), oriEntry, false );
+ Binding after = new Binding( name.toUpName(), entry, false );
oclistener.objectChanged( new NamingEvent( rec.getEventContext(), NamingEvent.OBJECT_CHANGED, after,
before, mods ) );
}
@@ -222,7 +293,7 @@
}
- public void modify( NextInterceptor next, Name name, int modOp, Attributes mods ) throws NamingException
+ public void modify( NextInterceptor next, LdapDN name, int modOp, Attributes mods ) throws NamingException
{
Invocation invocation = InvocationStack.getInstance().peek();
DirectoryPartitionNexusProxy proxy = invocation.getProxy();
@@ -240,7 +311,7 @@
}
- public void modify( NextInterceptor next, Name name, ModificationItem[] mods ) throws NamingException
+ public void modify( NextInterceptor next, LdapDN name, ModificationItem[] mods ) throws NamingException
{
Invocation invocation = InvocationStack.getInstance().peek();
DirectoryPartitionNexusProxy proxy = invocation.getProxy();
@@ -250,7 +321,7 @@
}
- private void notifyOnNameChange( Name oldName, Name newName ) throws NamingException
+ private void notifyOnNameChange( LdapDN oldName, LdapDN newName ) throws NamingException
{
Attributes entry = nexus.lookup( newName );
Set selecting = getSelectingSources( oldName, entry );
@@ -268,8 +339,8 @@
if ( listener instanceof NamespaceChangeListener )
{
NamespaceChangeListener nclistener = ( NamespaceChangeListener ) listener;
- Binding oldBinding = new Binding( oldName.toString(), entry, false );
- Binding newBinding = new Binding( newName.toString(), entry, false );
+ Binding oldBinding = new Binding( oldName.toUpName(), entry, false );
+ Binding newBinding = new Binding( newName.toUpName(), entry, false );
nclistener.objectRenamed( new NamingEvent( rec.getEventContext(), NamingEvent.OBJECT_RENAMED,
newBinding, oldBinding, entry ) );
}
@@ -277,36 +348,37 @@
}
- public void modifyRn( NextInterceptor next, Name name, String newRn, boolean deleteOldRn ) throws NamingException
+ public void modifyRn( NextInterceptor next, LdapDN name, String newRn, boolean deleteOldRn ) throws NamingException
{
super.modifyRn( next, name, newRn, deleteOldRn );
- Name newName = ( Name ) name.clone();
+ LdapDN newName = ( LdapDN ) name.clone();
newName.remove( newName.size() - 1 );
newName.add( newRn );
+ newName.normalize();
notifyOnNameChange( name, newName );
}
- public void move( NextInterceptor next, Name oriChildName, Name newParentName, String newRn, boolean deleteOldRn )
+ public void move( NextInterceptor next, LdapDN oriChildName, LdapDN newParentName, String newRn, boolean deleteOldRn )
throws NamingException
{
super.move( next, oriChildName, newParentName, newRn, deleteOldRn );
- Name newName = ( Name ) newParentName.clone();
+ LdapDN newName = ( LdapDN ) newParentName.clone();
newName.add( newRn );
notifyOnNameChange( oriChildName, newName );
}
- public void move( NextInterceptor next, Name oriChildName, Name newParentName ) throws NamingException
+ public void move( NextInterceptor next, LdapDN oriChildName, LdapDN newParentName ) throws NamingException
{
super.move( next, oriChildName, newParentName );
- Name newName = ( Name ) newParentName.clone();
+ LdapDN newName = ( LdapDN ) newParentName.clone();
newName.add( oriChildName.get( oriChildName.size() - 1 ) );
notifyOnNameChange( oriChildName, newName );
}
- Set getSelectingSources( Name name, Attributes entry ) throws NamingException
+ Set getSelectingSources( LdapDN name, Attributes entry ) throws NamingException
{
if ( sources.isEmpty() )
{
@@ -321,7 +393,7 @@
if ( obj instanceof EventSourceRecord )
{
EventSourceRecord rec = ( EventSourceRecord ) obj;
- if ( evaluator.evaluate( rec.getFilter(), name.toString(), entry ) )
+ if ( evaluator.evaluate( rec.getFilter(), name.toNormName(), entry ) )
{
selecting.add( obj );
}
@@ -332,7 +404,7 @@
for ( int ii = 0; ii < records.size(); ii++ )
{
EventSourceRecord rec = ( EventSourceRecord ) records.get( ii );
- if ( evaluator.evaluate( rec.getFilter(), name.toString(), entry ) )
+ if ( evaluator.evaluate( rec.getFilter(), name.toNormName(), entry ) )
{
selecting.add( obj );
}
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=414035&r1=414034&r2=414035&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Tue Jun 13 20:22:05 2006
@@ -24,6 +24,7 @@
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
+import org.apache.directory.server.core.ServerUtils;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
import org.apache.directory.server.core.schema.OidRegistry;
import org.apache.directory.shared.ldap.NotImplementedException;
@@ -67,8 +68,8 @@
*
* @param substringEvaluator
*/
- public LeafEvaluator(OidRegistry oidRegistry, AttributeTypeRegistry attributeTypeRegistry,
- SubstringEvaluator substringEvaluator) throws NamingException
+ public LeafEvaluator( OidRegistry oidRegistry, AttributeTypeRegistry attributeTypeRegistry,
+ SubstringEvaluator substringEvaluator ) throws NamingException
{
this.oidRegistry = oidRegistry;
this.attributeTypeRegistry = attributeTypeRegistry;
@@ -138,7 +139,8 @@
String attrId = node.getAttribute();
// get the attribute associated with the node
- Attribute attr = entry.get( attrId );
+ AttributeType type = attributeTypeRegistry.lookup( oidRegistry.getOid( attrId ) );
+ Attribute attr = ServerUtils.getAttribute( type, entry );
// If we do not have the attribute just return false
if ( null == attr )
@@ -199,14 +201,15 @@
* @param entry the perspective candidate
* @return the ava evaluation on the perspective candidate
*/
- private boolean evalPresence( String attrId, Attributes entry )
+ private boolean evalPresence( String attrId, Attributes entry ) throws NamingException
{
if ( entry == null )
{
return false;
}
- return null != entry.get( attrId );
+ AttributeType type = attributeTypeRegistry.lookup( oidRegistry.getOid( attrId ) );
+ return null != ServerUtils.getAttribute( type, entry );
}
@@ -225,7 +228,8 @@
Comparator comparator = getComparator( node.getAttribute() );
// get the attribute associated with the node
- Attribute attr = entry.get( node.getAttribute() );
+ AttributeType type = attributeTypeRegistry.lookup( oidRegistry.getOid( node.getAttribute() ) );
+ Attribute attr = ServerUtils.getAttribute( type, entry );
// If we do not have the attribute just return false
if ( null == attr )
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java?rev=414035&r1=414034&r2=414035&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java Tue Jun 13 20:22:05 2006
@@ -18,13 +18,12 @@
import javax.naming.NamingException;
-import javax.naming.Name;
import javax.naming.directory.SearchControls;
import javax.naming.directory.Attributes;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.ScopeNode;
-import org.apache.directory.shared.ldap.name.DnParser;
+import org.apache.directory.shared.ldap.name.LdapDN;
/**
@@ -35,12 +34,8 @@
*/
public class ScopeEvaluator implements Evaluator
{
- private DnParser parser = null;
-
-
public ScopeEvaluator() throws NamingException
{
- parser = new DnParser();
}
@@ -58,8 +53,8 @@
case ( SearchControls.ONELEVEL_SCOPE ):
if ( dn.endsWith( snode.getBaseDn() ) )
{
- Name candidateDn = parser.parse( dn );
- Name scopeDn = parser.parse( snode.getBaseDn() );
+ LdapDN candidateDn = new LdapDN( dn );
+ LdapDN scopeDn = new LdapDN( snode.getBaseDn() );
return ( scopeDn.size() + 1 ) == candidateDn.size();
}
case ( SearchControls.SUBTREE_SCOPE ):
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java?rev=414035&r1=414034&r2=414035&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java Tue Jun 13 20:22:05 2006
@@ -19,7 +19,6 @@
import java.util.Map;
-import javax.naming.Name;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.*;
@@ -36,7 +35,7 @@
import org.apache.directory.shared.ldap.exception.*;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.name.LdapDN;
/**
@@ -76,35 +75,46 @@
* In the pre-invocation state this interceptor method checks to see if the entry to be added already exists. If it
* does an exception is raised.
*/
- public void add( NextInterceptor nextInterceptor, String upName, Name normName, Attributes entry )
+ public void add( NextInterceptor nextInterceptor, LdapDN normName, Attributes entry )
throws NamingException
{
// check if the entry already exists
if ( nextInterceptor.hasEntry( normName ) )
{
NamingException ne = new LdapNameAlreadyBoundException( normName.toString() + " already exists!" );
- ne.setResolvedName( new LdapName( upName ) );
+ ne.setResolvedName( new LdapDN( normName.toUpName() ) );
throw ne;
}
- Name parentDn = normName.getPrefix( 1 );
-
- // check if we don't have the parent to add to
- assertHasEntry( nextInterceptor, "Attempt to add under non-existant parent: ", parentDn );
+ LdapDN parentDn = ( LdapDN ) normName.clone();
+ parentDn.remove( normName.size() - 1 );
// check if we're trying to add to a parent that is an alias
- Attributes attrs = nextInterceptor.lookup( normName.getPrefix( 1 ) );
+ Attributes attrs = null;
+
+ try
+ {
+ attrs = nextInterceptor.lookup( parentDn );
+ }
+ catch ( Exception e )
+ {
+ LdapNameNotFoundException e2 = new LdapNameNotFoundException( "Parent " + parentDn.toUpName()
+ + " not found" );
+ e2.setResolvedName( new LdapDN( nexus.getMatchedName( parentDn ).toUpName() ) );
+ throw e2;
+ }
+
Attribute objectClass = attrs.get( "objectClass" );
if ( objectClass.contains( "alias" ) )
{
- String msg = "Attempt to add entry to alias '" + upName + "' not allowed.";
+ String msg = "Attempt to add entry to alias '" + normName.toUpName() + "' not allowed.";
ResultCodeEnum rc = ResultCodeEnum.ALIASPROBLEM;
NamingException e = new LdapNamingException( msg, rc );
- e.setResolvedName( parentDn );
+ e.setResolvedName( new LdapDN( parentDn.toUpName() ) );
throw e;
}
- nextInterceptor.add( upName, normName, entry );
+ nextInterceptor.add( normName, entry );
}
@@ -112,7 +122,7 @@
* Checks to make sure the entry being deleted exists, and has no children, otherwise throws the appropriate
* LdapException.
*/
- public void delete( NextInterceptor nextInterceptor, Name name ) throws NamingException
+ public void delete( NextInterceptor nextInterceptor, LdapDN name ) throws NamingException
{
// check if entry to delete exists
String msg = "Attempt to delete non-existant entry: ";
@@ -130,7 +140,7 @@
if ( hasChildren )
{
LdapContextNotEmptyException e = new LdapContextNotEmptyException();
- e.setResolvedName( name );
+ e.setResolvedName( new LdapDN( name.toUpName() ) );
throw e;
}
@@ -141,7 +151,7 @@
/**
* Checks to see the base being searched exists, otherwise throws the appropriate LdapException.
*/
- public NamingEnumeration list( NextInterceptor nextInterceptor, Name baseName ) throws NamingException
+ public NamingEnumeration list( NextInterceptor nextInterceptor, LdapDN baseName ) throws NamingException
{
// check if entry to search exists
String msg = "Attempt to search under non-existant entry: ";
@@ -154,7 +164,7 @@
/**
* Checks to make sure the entry being looked up exists other wise throws the appropriate LdapException.
*/
- public Attributes lookup( NextInterceptor nextInterceptor, Name name ) throws NamingException
+ public Attributes lookup( NextInterceptor nextInterceptor, LdapDN name ) throws NamingException
{
String msg = "Attempt to lookup non-existant entry: ";
assertHasEntry( nextInterceptor, msg, name );
@@ -166,7 +176,7 @@
/**
* Checks to see the base being searched exists, otherwise throws the appropriate LdapException.
*/
- public Attributes lookup( NextInterceptor nextInterceptor, Name name, String[] attrIds ) throws NamingException
+ public Attributes lookup( NextInterceptor nextInterceptor, LdapDN name, String[] attrIds ) throws NamingException
{
// check if entry to lookup exists
String msg = "Attempt to lookup non-existant entry: ";
@@ -179,7 +189,7 @@
/**
* Checks to see the entry being modified exists, otherwise throws the appropriate LdapException.
*/
- public void modify( NextInterceptor nextInterceptor, Name name, int modOp, Attributes attrs )
+ public void modify( NextInterceptor nextInterceptor, LdapDN name, int modOp, Attributes attrs )
throws NamingException
{
// check if entry to modify exists
@@ -216,7 +226,7 @@
/**
* Checks to see the entry being modified exists, otherwise throws the appropriate LdapException.
*/
- public void modify( NextInterceptor nextInterceptor, Name name, ModificationItem[] items ) throws NamingException
+ public void modify( NextInterceptor nextInterceptor, LdapDN name, ModificationItem[] items ) throws NamingException
{
// check if entry to modify exists
String msg = "Attempt to modify non-existant entry: ";
@@ -250,7 +260,7 @@
/**
* Checks to see the entry being renamed exists, otherwise throws the appropriate LdapException.
*/
- public void modifyRn( NextInterceptor nextInterceptor, Name dn, String newRn, boolean deleteOldRn )
+ public void modifyRn( NextInterceptor nextInterceptor, LdapDN dn, String newRn, boolean deleteOldRn )
throws NamingException
{
// check if entry to rename exists
@@ -258,12 +268,15 @@
assertHasEntry( nextInterceptor, msg, dn );
// check to see if target entry exists
- Name target = dn.getPrefix( 1 ).add( newRn );
- if ( nextInterceptor.hasEntry( target ) )
- {
- LdapNameAlreadyBoundException e = null;
- e = new LdapNameAlreadyBoundException( "target entry " + target + " already exists!" );
- e.setResolvedName( target );
+ LdapDN newDn = ( LdapDN ) dn.clone();
+ newDn.remove( dn.size() - 1 );
+ newDn.add( newRn );
+ newDn.normalize();
+ if ( nextInterceptor.hasEntry( newDn ) )
+ {
+ LdapNameAlreadyBoundException e;
+ e = new LdapNameAlreadyBoundException( "target entry " + newDn.toUpName() + " already exists!" );
+ e.setResolvedName( new LdapDN( newDn.toUpName() ) );
throw e;
}
@@ -275,7 +288,7 @@
* Checks to see the entry being moved exists, and so does its parent, otherwise throws the appropriate
* LdapException.
*/
- public void move( NextInterceptor nextInterceptor, Name oriChildName, Name newParentName ) throws NamingException
+ public void move( NextInterceptor nextInterceptor, LdapDN oriChildName, LdapDN newParentName ) throws NamingException
{
// check if child to move exists
String msg = "Attempt to move to non-existant parent: ";
@@ -287,13 +300,18 @@
// check to see if target entry exists
String rdn = oriChildName.get( oriChildName.size() - 1 );
- Name target = ( Name ) newParentName.clone();
+ LdapDN target = ( LdapDN ) newParentName.clone();
target.add( rdn );
if ( nextInterceptor.hasEntry( target ) )
{
- LdapNameAlreadyBoundException e = null;
- e = new LdapNameAlreadyBoundException( "target entry " + target + " already exists!" );
- e.setResolvedName( target );
+ // we must calculate the resolved name using the user provided Rdn value
+ String upRdn = new LdapDN( oriChildName.toUpName() ).get( oriChildName.size() - 1 );
+ LdapDN upTarget = ( LdapDN ) newParentName.clone();
+ upTarget.add( upRdn );
+
+ LdapNameAlreadyBoundException e;
+ e = new LdapNameAlreadyBoundException( "target entry " + upTarget.toUpName() + " already exists!" );
+ e.setResolvedName( new LdapDN( upTarget.toUpName() ) );
throw e;
}
@@ -305,7 +323,7 @@
* Checks to see the entry being moved exists, and so does its parent, otherwise throws the appropriate
* LdapException.
*/
- public void move( NextInterceptor nextInterceptor, Name oriChildName, Name newParentName, String newRn,
+ public void move( NextInterceptor nextInterceptor, LdapDN oriChildName, LdapDN newParentName, String newRn,
boolean deleteOldRn ) throws NamingException
{
// check if child to move exists
@@ -317,13 +335,18 @@
assertHasEntry( nextInterceptor, msg, newParentName );
// check to see if target entry exists
- Name target = ( Name ) newParentName.clone();
+ LdapDN target = ( LdapDN ) newParentName.clone();
target.add( newRn );
+ target.normalize();
if ( nextInterceptor.hasEntry( target ) )
{
- LdapNameAlreadyBoundException e = null;
- e = new LdapNameAlreadyBoundException( "target entry " + target + " already exists!" );
- e.setResolvedName( target );
+ // we must calculate the resolved name using the user provided Rdn value
+ LdapDN upTarget = ( LdapDN ) newParentName.clone();
+ upTarget.add( newRn );
+
+ LdapNameAlreadyBoundException e;
+ e = new LdapNameAlreadyBoundException( "target entry " + upTarget.toUpName() + " already exists!" );
+ e.setResolvedName( new LdapDN( upTarget.toUpName() ) );
throw e;
}
@@ -334,7 +357,7 @@
/**
* Checks to see the entry being searched exists, otherwise throws the appropriate LdapException.
*/
- public NamingEnumeration search( NextInterceptor nextInterceptor, Name base, Map env, ExprNode filter,
+ public NamingEnumeration search( NextInterceptor nextInterceptor, LdapDN base, Map env, ExprNode filter,
SearchControls searchCtls ) throws NamingException
{
String msg = "Attempt to search under non-existant entry: ";
@@ -364,13 +387,13 @@
* @param dn the distinguished name of the entry that is asserted
* @throws NamingException if the entry does not exist
*/
- private void assertHasEntry( NextInterceptor nextInterceptor, String msg, Name dn ) throws NamingException
+ private void assertHasEntry( NextInterceptor nextInterceptor, String msg, LdapDN dn ) throws NamingException
{
Invocation invocation = InvocationStack.getInstance().peek();
DirectoryPartitionNexusProxy proxy = invocation.getProxy();
if ( !nextInterceptor.hasEntry( dn ) )
{
- LdapNameNotFoundException e = null;
+ LdapNameNotFoundException e;
if ( msg != null )
{
@@ -381,7 +404,7 @@
e = new LdapNameNotFoundException( dn.toString() );
}
- e.setResolvedName( proxy.getMatchedName( dn, false ) );
+ e.setResolvedName( new LdapDN( proxy.getMatchedName( dn ).toUpName() ) );
throw e;
}
}
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?rev=414035&r1=414034&r2=414035&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java Tue Jun 13 20:22:05 2006
@@ -22,7 +22,6 @@
import java.util.Map;
import javax.naming.Context;
-import javax.naming.Name;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
@@ -37,6 +36,7 @@
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.jndi.ServerContext;
import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.name.LdapDN;
/**
@@ -96,21 +96,21 @@
// Interceptor's Invoke Method
// ------------------------------------------------------------------------
- public void add( NextInterceptor next, String upName, Name normName, Attributes entry ) throws NamingException
+ public void add(NextInterceptor next, LdapDN normName, Attributes entry) throws NamingException
{
- next.add( upName, normName, entry );
+ next.add(normName, entry );
}
- public void delete( NextInterceptor next, Name name ) throws NamingException
+ public void delete( NextInterceptor next, LdapDN name ) throws NamingException
{
next.delete( name );
}
- public Name getMatchedName( NextInterceptor next, Name dn, boolean normalized ) throws NamingException
+ public LdapDN getMatchedName ( NextInterceptor next, LdapDN dn ) throws NamingException
{
- return next.getMatchedName( dn, normalized );
+ return next.getMatchedName( dn );
}
@@ -120,81 +120,81 @@
}
- public Name getSuffix( NextInterceptor next, Name dn, boolean normalized ) throws NamingException
+ public LdapDN getSuffix ( NextInterceptor next, LdapDN dn ) throws NamingException
{
- return next.getSuffix( dn, normalized );
+ return next.getSuffix( dn );
}
- public boolean hasEntry( NextInterceptor next, Name name ) throws NamingException
+ public boolean hasEntry( NextInterceptor next, LdapDN name ) throws NamingException
{
return next.hasEntry( name );
}
- public boolean isSuffix( NextInterceptor next, Name name ) throws NamingException
+ public boolean isSuffix( NextInterceptor next, LdapDN name ) throws NamingException
{
return next.isSuffix( name );
}
- public NamingEnumeration list( NextInterceptor next, Name base ) throws NamingException
+ public NamingEnumeration list( NextInterceptor next, LdapDN base ) throws NamingException
{
return next.list( base );
}
- public Iterator listSuffixes( NextInterceptor next, boolean normalized ) throws NamingException
+ public Iterator listSuffixes ( NextInterceptor next ) throws NamingException
{
- return next.listSuffixes( normalized );
+ return next.listSuffixes();
}
- public Attributes lookup( NextInterceptor next, Name dn, String[] attrIds ) throws NamingException
+ public Attributes lookup( NextInterceptor next, LdapDN dn, String[] attrIds ) throws NamingException
{
return next.lookup( dn, attrIds );
}
- public Attributes lookup( NextInterceptor next, Name name ) throws NamingException
+ public Attributes lookup( NextInterceptor next, LdapDN name ) throws NamingException
{
return next.lookup( name );
}
- public void modify( NextInterceptor next, Name name, int modOp, Attributes mods ) throws NamingException
+ public void modify( NextInterceptor next, LdapDN name, int modOp, Attributes mods ) throws NamingException
{
next.modify( name, modOp, mods );
}
- public void modify( NextInterceptor next, Name name, ModificationItem[] mods ) throws NamingException
+ public void modify( NextInterceptor next, LdapDN name, ModificationItem[] mods ) throws NamingException
{
next.modify( name, mods );
}
- public void modifyRn( NextInterceptor next, Name name, String newRn, boolean deleteOldRn ) throws NamingException
+ public void modifyRn( NextInterceptor next, LdapDN name, String newRn, boolean deleteOldRn ) throws NamingException
{
next.modifyRn( name, newRn, deleteOldRn );
}
- public void move( NextInterceptor next, Name oriChildName, Name newParentName, String newRn, boolean deleteOldRn )
+ public void move( NextInterceptor next, LdapDN oriChildName, LdapDN newParentName, String newRn, boolean deleteOldRn )
throws NamingException
{
next.move( oriChildName, newParentName, newRn, deleteOldRn );
}
- public void move( NextInterceptor next, Name oriChildName, Name newParentName ) throws NamingException
+ public void move( NextInterceptor next, LdapDN oriChildName, LdapDN newParentName ) throws NamingException
{
next.move( oriChildName, newParentName );
}
- public NamingEnumeration search( NextInterceptor next, Name base, Map env, ExprNode filter,
- SearchControls searchCtls ) throws NamingException
+ public NamingEnumeration search( NextInterceptor next, LdapDN base, Map env, ExprNode filter,
+ SearchControls searchCtls ) throws NamingException
{
return next.search( base, env, filter, searchCtls );
}
@@ -206,26 +206,26 @@
}
- public void removeContextPartition( NextInterceptor next, Name suffix ) throws NamingException
+ public void removeContextPartition( NextInterceptor next, LdapDN suffix ) throws NamingException
{
next.removeContextPartition( suffix );
}
- public boolean compare( NextInterceptor next, Name name, String oid, Object value ) throws NamingException
+ public boolean compare( NextInterceptor next, LdapDN name, String oid, Object value ) throws NamingException
{
return next.compare( name, oid, value );
}
- public void bind( NextInterceptor next, Name bindDn, byte[] credentials, List mechanisms, String saslAuthId )
+ public void bind( NextInterceptor next, LdapDN bindDn, byte[] credentials, List mechanisms, String saslAuthId )
throws NamingException
{
next.bind( bindDn, credentials, mechanisms, saslAuthId );
}
- public void unbind( NextInterceptor next, Name bindDn ) throws NamingException
+ public void unbind( NextInterceptor next, LdapDN bindDn ) throws NamingException
{
next.unbind( bindDn );
}
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?rev=414035&r1=414034&r2=414035&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java Tue Jun 13 20:22:05 2006
@@ -21,7 +21,6 @@
import java.util.List;
import java.util.Map;
-import javax.naming.Name;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
@@ -34,6 +33,7 @@
import org.apache.directory.server.core.partition.DirectoryPartition;
import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.name.LdapDN;
/**
@@ -122,21 +122,21 @@
/**
- * Filters {@link DirectoryPartitionNexus#getMatchedName(Name, boolean)} call.
+ * Filters {@link DirectoryPartitionNexus#getMatchedName(org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
- Name getMatchedName( NextInterceptor next, Name name, boolean normalized ) throws NamingException;
+ LdapDN getMatchedName ( NextInterceptor next, LdapDN name ) throws NamingException;
/**
- * Filters {@link DirectoryPartitionNexus#getSuffix(Name, boolean)} call.
+ * Filters {@link DirectoryPartitionNexus#getSuffix(org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
- Name getSuffix( NextInterceptor next, Name name, boolean normalized ) throws NamingException;
+ LdapDN getSuffix ( NextInterceptor next, LdapDN name ) throws NamingException;
/**
- * Filters {@link DirectoryPartitionNexus#listSuffixes(boolean)} call.
+ * Filters {@link DirectoryPartitionNexus#listSuffixes()} call.
*/
- Iterator listSuffixes( NextInterceptor next, boolean normalized ) throws NamingException;
+ Iterator listSuffixes ( NextInterceptor next ) throws NamingException;
/**
@@ -146,107 +146,106 @@
/**
- * Filters {@link DirectoryPartitionNexus#removeContextPartition(Name)} call.
+ * Filters {@link DirectoryPartitionNexus#removeContextPartition(org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
- void removeContextPartition( NextInterceptor next, Name suffix ) throws NamingException;
+ void removeContextPartition( NextInterceptor next, LdapDN suffix ) throws NamingException;
/**
- * Filters {@link DirectoryPartitionNexus#compare(Name,String,Object)} call.
+ * Filters {@link DirectoryPartitionNexus#compare(org.apache.directory.shared.ldap.name.LdapDN,String,Object)} call.
*/
- boolean compare( NextInterceptor next, Name name, String oid, Object value ) throws NamingException;
+ boolean compare( NextInterceptor next, LdapDN name, String oid, Object value ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#delete(Name)} call.
+ * Filters {@link DirectoryPartition#delete(org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
- void delete( NextInterceptor next, Name name ) throws NamingException;
+ void delete( NextInterceptor next, LdapDN name ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#add(String, Name, Attributes)} call.
+ * Filters {@link DirectoryPartition#add(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.Attributes)} call.
*/
- void add( NextInterceptor next, String userProvidedName, Name normalizedName, Attributes entry )
- throws NamingException;
+ void add( NextInterceptor next, LdapDN name, Attributes entry ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#modify(Name, int, Attributes)} call.
+ * Filters {@link DirectoryPartition#modify(org.apache.directory.shared.ldap.name.LdapDN,int,javax.naming.directory.Attributes)} call.
*/
- void modify( NextInterceptor next, Name name, int modOp, Attributes attributes ) throws NamingException;
+ void modify( NextInterceptor next, LdapDN name, int modOp, Attributes attributes ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#modify(Name, ModificationItem[])} call.
+ * Filters {@link DirectoryPartition#modify(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.ModificationItem[])} call.
*/
- void modify( NextInterceptor next, Name name, ModificationItem[] items ) throws NamingException;
+ void modify( NextInterceptor next, LdapDN name, ModificationItem[] items ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#list(Name)} call.
+ * Filters {@link DirectoryPartition#list(org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
- NamingEnumeration list( NextInterceptor next, Name baseName ) throws NamingException;
+ NamingEnumeration list( NextInterceptor next, LdapDN baseName ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#search(Name, Map, ExprNode, SearchControls)} call.
+ * Filters {@link DirectoryPartition#search(org.apache.directory.shared.ldap.name.LdapDN,java.util.Map,org.apache.directory.shared.ldap.filter.ExprNode,javax.naming.directory.SearchControls)} call.
*/
- NamingEnumeration search( NextInterceptor next, Name baseName, Map environment, ExprNode filter,
- SearchControls searchControls ) throws NamingException;
+ NamingEnumeration search( NextInterceptor next, LdapDN baseName, Map environment, ExprNode filter,
+ SearchControls searchControls ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#lookup(Name)} call.
+ * Filters {@link DirectoryPartition#lookup(org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
- Attributes lookup( NextInterceptor next, Name name ) throws NamingException;
+ Attributes lookup( NextInterceptor next, LdapDN name ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#lookup(Name, String[])} call.
+ * Filters {@link DirectoryPartition#lookup(org.apache.directory.shared.ldap.name.LdapDN,String[])} call.
*/
- Attributes lookup( NextInterceptor next, Name dn, String[] attrIds ) throws NamingException;
+ Attributes lookup( NextInterceptor next, LdapDN dn, String[] attrIds ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#lookup(Name, String[])} call.
+ * Filters {@link DirectoryPartition#lookup(org.apache.directory.shared.ldap.name.LdapDN,String[])} call.
*/
- boolean hasEntry( NextInterceptor next, Name name ) throws NamingException;
+ boolean hasEntry( NextInterceptor next, LdapDN name ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#isSuffix(Name)} call.
+ * Filters {@link DirectoryPartition#isSuffix(org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
- boolean isSuffix( NextInterceptor next, Name name ) throws NamingException;
+ boolean isSuffix( NextInterceptor next, LdapDN name ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#modifyRn(Name, String, boolean)} call.
+ * Filters {@link DirectoryPartition#modifyRn(org.apache.directory.shared.ldap.name.LdapDN,String,boolean)} call.
*/
- void modifyRn( NextInterceptor next, Name name, String newRn, boolean deleteOldRn ) throws NamingException;
+ void modifyRn( NextInterceptor next, LdapDN name, String newRn, boolean deleteOldRn ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#move(Name, Name)} call.
+ * Filters {@link DirectoryPartition#move(org.apache.directory.shared.ldap.name.LdapDN,org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
- void move( NextInterceptor next, Name oldName, Name newParentName ) throws NamingException;
+ void move( NextInterceptor next, LdapDN oldName, LdapDN newParentName ) throws NamingException;
/**
- * Filters {@link DirectoryPartition#move(Name, Name, String, boolean)} call.
+ * Filters {@link DirectoryPartition#move(org.apache.directory.shared.ldap.name.LdapDN,org.apache.directory.shared.ldap.name.LdapDN,String,boolean)} call.
*/
- void move( NextInterceptor next, Name oldName, Name newParentName, String newRn, boolean deleteOldRn )
+ void move( NextInterceptor next, LdapDN oldName, LdapDN newParentName, String newRn, boolean deleteOldRn )
throws NamingException;
/**
- * Filters {@link DirectoryPartition#bind(Name, byte[], List, String)} call.
+ * Filters {@link DirectoryPartition#bind(org.apache.directory.shared.ldap.name.LdapDN,byte[],java.util.List,String)} call.
*/
- void bind( NextInterceptor next, Name bindDn, byte[] credentials, List mechanisms, String saslAuthId )
+ void bind( NextInterceptor next, LdapDN bindDn, byte[] credentials, List mechanisms, String saslAuthId )
throws NamingException;
/**
- * Filters {@link DirectoryPartition#unbind(Name)} call.
+ * Filters {@link DirectoryPartition#unbind(org.apache.directory.shared.ldap.name.LdapDN)} call.
*/
- void unbind( NextInterceptor next, Name bindDn ) throws NamingException;
+ void unbind( NextInterceptor next, LdapDN bindDn ) throws NamingException;
}
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?rev=414035&r1=414034&r2=414035&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java Tue Jun 13 20:22:05 2006
@@ -20,7 +20,6 @@
import java.util.*;
import javax.naming.ConfigurationException;
-import javax.naming.Name;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
@@ -36,6 +35,7 @@
import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.name.LdapDN;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,7 +67,7 @@
}
- public boolean compare( NextInterceptor next, Name name, String oid, Object value ) throws NamingException
+ public boolean compare( NextInterceptor next, LdapDN name, String oid, Object value ) throws NamingException
{
return nexus.compare( name, oid, value );
}
@@ -79,99 +79,99 @@
}
- public Name getMatchedName( NextInterceptor next, Name dn, boolean normalized ) throws NamingException
+ public LdapDN getMatchedName ( NextInterceptor next, LdapDN dn ) throws NamingException
{
- return ( Name ) nexus.getMatchedName( dn, normalized ).clone();
+ return ( LdapDN ) nexus.getMatchedName( dn ).clone();
}
- public Name getSuffix( NextInterceptor next, Name dn, boolean normalized ) throws NamingException
+ public LdapDN getSuffix ( NextInterceptor next, LdapDN dn ) throws NamingException
{
- return ( Name ) nexus.getSuffix( dn, normalized ).clone();
+ return ( LdapDN ) nexus.getSuffix( dn ).clone();
}
- public Iterator listSuffixes( NextInterceptor next, boolean normalized ) throws NamingException
+ public Iterator listSuffixes ( NextInterceptor next ) throws NamingException
{
- return nexus.listSuffixes( normalized );
+ return nexus.listSuffixes();
}
- public void delete( NextInterceptor next, Name name ) throws NamingException
+ public void delete( NextInterceptor next, LdapDN name ) throws NamingException
{
nexus.delete( name );
}
- public void add( NextInterceptor next, String upName, Name normName, Attributes entry ) throws NamingException
+ public void add(NextInterceptor next, LdapDN normName, Attributes entry) throws NamingException
{
- nexus.add( upName, normName, entry );
+ nexus.add( normName, entry );
}
- public void modify( NextInterceptor next, Name name, int modOp, Attributes mods ) throws NamingException
+ public void modify( NextInterceptor next, LdapDN name, int modOp, Attributes mods ) throws NamingException
{
nexus.modify( name, modOp, mods );
}
- public void modify( NextInterceptor next, Name name, ModificationItem[] mods ) throws NamingException
+ public void modify( NextInterceptor next, LdapDN name, ModificationItem[] mods ) throws NamingException
{
nexus.modify( name, mods );
}
- public NamingEnumeration list( NextInterceptor next, Name base ) throws NamingException
+ public NamingEnumeration list( NextInterceptor next, LdapDN base ) throws NamingException
{
return nexus.list( base );
}
- public NamingEnumeration search( NextInterceptor next, Name base, Map env, ExprNode filter,
+ public NamingEnumeration search( NextInterceptor next, LdapDN base, Map env, ExprNode filter,
SearchControls searchCtls ) throws NamingException
{
return nexus.search( base, env, filter, searchCtls );
}
- public Attributes lookup( NextInterceptor next, Name name ) throws NamingException
+ public Attributes lookup( NextInterceptor next, LdapDN name ) throws NamingException
{
return ( Attributes ) nexus.lookup( name ).clone();
}
- public Attributes lookup( NextInterceptor next, Name dn, String[] attrIds ) throws NamingException
+ public Attributes lookup( NextInterceptor next, LdapDN dn, String[] attrIds ) throws NamingException
{
return ( Attributes ) nexus.lookup( dn, attrIds ).clone();
}
- public boolean hasEntry( NextInterceptor next, Name name ) throws NamingException
+ public boolean hasEntry( NextInterceptor next, LdapDN name ) throws NamingException
{
return nexus.hasEntry( name );
}
- public boolean isSuffix( NextInterceptor next, Name name ) throws NamingException
+ public boolean isSuffix( NextInterceptor next, LdapDN name ) throws NamingException
{
return nexus.isSuffix( name );
}
- public void modifyRn( NextInterceptor next, Name name, String newRn, boolean deleteOldRn )
+ public void modifyRn( NextInterceptor next, LdapDN name, String newRn, boolean deleteOldRn )
throws NamingException
{
nexus.modifyRn( name, newRn, deleteOldRn );
}
- public void move( NextInterceptor next, Name oriChildName, Name newParentName ) throws NamingException
+ public void move( NextInterceptor next, LdapDN oriChildName, LdapDN newParentName ) throws NamingException
{
nexus.move( oriChildName, newParentName );
}
- public void move( NextInterceptor next, Name oriChildName, Name newParentName, String newRn, boolean deleteOldRn )
+ public void move( NextInterceptor next, LdapDN oriChildName, LdapDN newParentName, String newRn, boolean deleteOldRn )
throws NamingException
{
nexus.move( oriChildName, newParentName, newRn, deleteOldRn );
@@ -185,20 +185,20 @@
}
- public void removeContextPartition( NextInterceptor next, Name suffix ) throws NamingException
+ public void removeContextPartition( NextInterceptor next, LdapDN suffix ) throws NamingException
{
nexus.removeContextPartition( suffix );
}
- public void bind( NextInterceptor next, Name bindDn, byte[] credentials, List mechanisms, String saslAuthId )
+ public void bind( NextInterceptor next, LdapDN bindDn, byte[] credentials, List mechanisms, String saslAuthId )
throws NamingException
{
nexus.bind( bindDn, credentials, mechanisms, saslAuthId );
}
- public void unbind( NextInterceptor next, Name bindDn ) throws NamingException
+ public void unbind( NextInterceptor next, LdapDN bindDn ) throws NamingException
{
nexus.unbind( bindDn );
}
@@ -544,14 +544,14 @@
}
- public Name getMatchedName( Name name, boolean normalized ) throws NamingException
+ public LdapDN getMatchedName( LdapDN name ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
NextInterceptor next = entry.nextInterceptor;
try
{
- return head.getMatchedName( next, name, normalized );
+ return head.getMatchedName( next, name );
}
catch ( NamingException ne )
{
@@ -565,14 +565,14 @@
}
- public Name getSuffix( Name name, boolean normalized ) throws NamingException
+ public LdapDN getSuffix ( LdapDN name ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
NextInterceptor next = entry.nextInterceptor;
try
{
- return head.getSuffix( next, name, normalized );
+ return head.getSuffix( next, name );
}
catch ( NamingException ne )
{
@@ -586,7 +586,7 @@
}
- public boolean compare( Name name, String oid, Object value ) throws NamingException
+ public boolean compare( LdapDN name, String oid, Object value ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
@@ -607,14 +607,14 @@
}
- public Iterator listSuffixes( boolean normalized ) throws NamingException
+ public Iterator listSuffixes() throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
NextInterceptor next = entry.nextInterceptor;
try
{
- return head.listSuffixes( next, normalized );
+ return head.listSuffixes( next );
}
catch ( NamingException ne )
{
@@ -649,7 +649,7 @@
}
- public void removeContextPartition( Name suffix ) throws NamingException
+ public void removeContextPartition( LdapDN suffix ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
@@ -670,7 +670,7 @@
}
- public void delete( Name name ) throws NamingException
+ public void delete( LdapDN name ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
@@ -690,14 +690,14 @@
}
- public void add( String upName, Name normName, Attributes entry ) throws NamingException
+ public void add( LdapDN normName, Attributes entry ) throws NamingException
{
Entry node = getStartingEntry();
Interceptor head = node.configuration.getInterceptor();
NextInterceptor next = node.nextInterceptor;
try
{
- head.add( next, upName, normName, entry );
+ head.add( next, normName, entry );
}
catch ( NamingException ne )
{
@@ -710,7 +710,7 @@
}
- public void bind( Name bindDn, byte[] credentials, List mechanisms, String saslAuthId ) throws NamingException
+ public void bind( LdapDN bindDn, byte[] credentials, List mechanisms, String saslAuthId ) throws NamingException
{
Entry node = getStartingEntry();
Interceptor head = node.configuration.getInterceptor();
@@ -730,7 +730,7 @@
}
- public void unbind( Name bindDn ) throws NamingException
+ public void unbind( LdapDN bindDn ) throws NamingException
{
Entry node = getStartingEntry();
Interceptor head = node.configuration.getInterceptor();
@@ -750,7 +750,7 @@
}
- public void modify( Name name, int modOp, Attributes mods ) throws NamingException
+ public void modify( LdapDN name, int modOp, Attributes mods ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
@@ -770,7 +770,7 @@
}
- public void modify( Name name, ModificationItem[] mods ) throws NamingException
+ public void modify( LdapDN name, ModificationItem[] mods ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
@@ -790,7 +790,7 @@
}
- public NamingEnumeration list( Name base ) throws NamingException
+ public NamingEnumeration list( LdapDN base ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
@@ -811,7 +811,7 @@
}
- public NamingEnumeration search( Name base, Map env, ExprNode filter, SearchControls searchCtls )
+ public NamingEnumeration search( LdapDN base, Map env, ExprNode filter, SearchControls searchCtls )
throws NamingException
{
Entry entry = getStartingEntry();
@@ -833,7 +833,7 @@
}
- public Attributes lookup( Name name ) throws NamingException
+ public Attributes lookup( LdapDN name ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
@@ -854,7 +854,7 @@
}
- public Attributes lookup( Name dn, String[] attrIds ) throws NamingException
+ public Attributes lookup( LdapDN dn, String[] attrIds ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
@@ -875,7 +875,7 @@
}
- public boolean hasEntry( Name name ) throws NamingException
+ public boolean hasEntry( LdapDN name ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
@@ -896,7 +896,7 @@
}
- public boolean isSuffix( Name name ) throws NamingException
+ public boolean isSuffix( LdapDN name ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
@@ -917,7 +917,7 @@
}
- public void modifyRn( Name name, String newRn, boolean deleteOldRn ) throws NamingException
+ public void modifyRn( LdapDN name, String newRn, boolean deleteOldRn ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
@@ -937,7 +937,7 @@
}
- public void move( Name oriChildName, Name newParentName ) throws NamingException
+ public void move( LdapDN oriChildName, LdapDN newParentName ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
@@ -957,7 +957,7 @@
}
- public void move( Name oriChildName, Name newParentName, String newRn, boolean deleteOldRn ) throws NamingException
+ public void move( LdapDN oriChildName, LdapDN newParentName, String newRn, boolean deleteOldRn ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
@@ -1040,7 +1040,7 @@
}
- public boolean compare( Name name, String oid, Object value ) throws NamingException
+ public boolean compare( LdapDN name, String oid, Object value ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
@@ -1082,14 +1082,14 @@
}
- public Name getMatchedName( Name dn, boolean normalized ) throws NamingException
+ public LdapDN getMatchedName ( LdapDN dn ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
try
{
- return interceptor.getMatchedName( next.nextInterceptor, dn, normalized );
+ return interceptor.getMatchedName( next.nextInterceptor, dn );
}
catch ( NamingException ne )
{
@@ -1103,14 +1103,14 @@
}
- public Name getSuffix( Name dn, boolean normalized ) throws NamingException
+ public LdapDN getSuffix ( LdapDN dn ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
try
{
- return interceptor.getSuffix( next.nextInterceptor, dn, normalized );
+ return interceptor.getSuffix( next.nextInterceptor, dn );
}
catch ( NamingException ne )
{
@@ -1124,14 +1124,14 @@
}
- public Iterator listSuffixes( boolean normalized ) throws NamingException
+ public Iterator listSuffixes () throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
try
{
- return interceptor.listSuffixes( next.nextInterceptor, normalized );
+ return interceptor.listSuffixes( next.nextInterceptor );
}
catch ( NamingException ne )
{
@@ -1145,7 +1145,7 @@
}
- public void delete( Name name ) throws NamingException
+ public void delete( LdapDN name ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
@@ -1165,14 +1165,14 @@
}
- public void add( String upName, Name normName, Attributes entry ) throws NamingException
+ public void add( LdapDN normName, Attributes entry ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
try
{
- interceptor.add( next.nextInterceptor, upName, normName, entry );
+ interceptor.add( next.nextInterceptor, normName, entry );
}
catch ( NamingException ne )
{
@@ -1185,7 +1185,7 @@
}
- public void modify( Name name, int modOp, Attributes mods ) throws NamingException
+ public void modify( LdapDN name, int modOp, Attributes mods ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
@@ -1205,7 +1205,7 @@
}
- public void modify( Name name, ModificationItem[] mods ) throws NamingException
+ public void modify( LdapDN name, ModificationItem[] mods ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
@@ -1225,7 +1225,7 @@
}
- public NamingEnumeration list( Name base ) throws NamingException
+ public NamingEnumeration list( LdapDN base ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
@@ -1246,7 +1246,7 @@
}
- public NamingEnumeration search( Name base, Map env, ExprNode filter, SearchControls searchCtls )
+ public NamingEnumeration search( LdapDN base, Map env, ExprNode filter, SearchControls searchCtls )
throws NamingException
{
Entry next = getNextEntry();
@@ -1268,7 +1268,7 @@
}
- public Attributes lookup( Name name ) throws NamingException
+ public Attributes lookup( LdapDN name ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
@@ -1289,7 +1289,7 @@
}
- public Attributes lookup( Name dn, String[] attrIds ) throws NamingException
+ public Attributes lookup( LdapDN dn, String[] attrIds ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
@@ -1310,7 +1310,7 @@
}
- public boolean hasEntry( Name name ) throws NamingException
+ public boolean hasEntry( LdapDN name ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
@@ -1331,7 +1331,7 @@
}
- public boolean isSuffix( Name name ) throws NamingException
+ public boolean isSuffix( LdapDN name ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
@@ -1352,7 +1352,7 @@
}
- public void modifyRn( Name name, String newRn, boolean deleteOldRn ) throws NamingException
+ public void modifyRn( LdapDN name, String newRn, boolean deleteOldRn ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
@@ -1372,7 +1372,7 @@
}
- public void move( Name oriChildName, Name newParentName ) throws NamingException
+ public void move( LdapDN oriChildName, LdapDN newParentName ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
@@ -1392,7 +1392,7 @@
}
- public void move( Name oriChildName, Name newParentName, String newRn, boolean deleteOldRn )
+ public void move( LdapDN oriChildName, LdapDN newParentName, String newRn, boolean deleteOldRn )
throws NamingException
{
Entry next = getNextEntry();
@@ -1413,7 +1413,7 @@
}
- public void bind( Name bindDn, byte[] credentials, List mechanisms, String saslAuthId )
+ public void bind( LdapDN bindDn, byte[] credentials, List mechanisms, String saslAuthId )
throws NamingException
{
Entry next = getNextEntry();
@@ -1434,7 +1434,7 @@
}
- public void unbind( Name bindDn ) throws NamingException
+ public void unbind( LdapDN bindDn ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
@@ -1475,7 +1475,7 @@
}
- public void removeContextPartition( Name suffix ) throws NamingException
+ public void removeContextPartition( LdapDN suffix ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();