Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 52969 invoked from network); 23 Jan 2011 01:18:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Jan 2011 01:18:06 -0000 Received: (qmail 13368 invoked by uid 500); 23 Jan 2011 01:18:06 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 13242 invoked by uid 500); 23 Jan 2011 01:18:05 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 13232 invoked by uid 99); 23 Jan 2011 01:18:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Jan 2011 01:18:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Jan 2011 01:18:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 11AAD2388A74; Sun, 23 Jan 2011 01:17:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1062306 [3/32] - in /directory: apacheds-manuals/trunk/src/advanced-user-guide/ apacheds-manuals/trunk/src/basic-user-guide/ apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/trunk/core-api/sr... Date: Sun, 23 Jan 2011 01:17:26 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110123011742.11AAD2388A74@eris.apache.org> Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java Sun Jan 23 01:17:06 2011 @@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.AttributeType; @@ -325,7 +325,7 @@ public class ClonedServerEntry implement } - public DN getDn() + public Dn getDn() { return clonedEntry.getDn(); } @@ -397,7 +397,7 @@ public class ClonedServerEntry implement } - public void setDn( DN dn ) + public void setDn( Dn dn ) { clonedEntry.setDn( dn ); } @@ -411,7 +411,7 @@ public class ClonedServerEntry implement public Entry toClientEntry() throws LdapException { - // Copy the DN + // Copy the Dn Entry clientEntry = new DefaultEntry( clonedEntry.getDn() ); // Convert each attribute Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryFactory.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryFactory.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryFactory.java Sun Jan 23 01:17:06 2011 @@ -22,7 +22,7 @@ package org.apache.directory.server.core import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; /** @@ -43,5 +43,5 @@ public interface ServerEntryFactory * Creates a new ServerEntry which has not yet been added to the * directory. */ - Entry newEntry( DN dn ) throws LdapException; + Entry newEntry( Dn dn ) throws LdapException; } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java Sun Jan 23 01:17:06 2011 @@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.SchemaUtils; @@ -61,7 +61,7 @@ import org.apache.directory.shared.util. public class ServerEntryUtils { /** - * Convert a ServerAttribute into a BasicAttribute. The DN is lost + * Convert a ServerAttribute into a BasicAttribute. The Dn is lost * during this conversion, as the Attributes object does not store * this element. * @@ -83,7 +83,7 @@ public class ServerEntryUtils /** - * Convert a ServerEntry into a BasicAttributes. The DN is lost + * Convert a ServerEntry into a BasicAttributes. The Dn is lost * during this conversion, as the Attributes object does not store * this element. * @@ -197,12 +197,12 @@ public class ServerEntryUtils * * @param attributes the BasicAttributes or AttributesImpl instance to convert * @param registries The registries, needed ro build a ServerEntry - * @param dn The DN which is needed by the ServerEntry + * @param dn The Dn which is needed by the ServerEntry * @return An instance of a ServerEntry object * * @throws LdapInvalidAttributeTypeException If we get an invalid attribute */ - public static Entry toServerEntry( Attributes attributes, DN dn, SchemaManager schemaManager ) + public static Entry toServerEntry( Attributes attributes, Dn dn, SchemaManager schemaManager ) throws LdapInvalidAttributeTypeException { if ( attributes instanceof BasicAttributes ) Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java Sun Jan 23 01:17:06 2011 @@ -22,10 +22,10 @@ package org.apache.directory.server.core import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; /** - * Creates a wrapper around a SearchResult object so that we can use the DN + * Creates a wrapper around a SearchResult object so that we can use the Dn * instead of parser it over and over * * @author Apache Directory Project @@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap. public class ServerSearchResult { /** Distinguished name for this result */ - private DN dn; + private Dn dn; /** The associated entry */ private Entry serverEntry; @@ -53,7 +53,7 @@ public class ServerSearchResult * @param serverEntry The associated entry * @param isRelative Tells if the name is relative to the target context */ - public ServerSearchResult( DN dn, Entry serverEntry, boolean isRelative ) + public ServerSearchResult( Dn dn, Entry serverEntry, boolean isRelative ) { this.dn = dn; this.serverEntry = serverEntry; @@ -69,7 +69,7 @@ public class ServerSearchResult * @param dn Distinguished name for this result * @param serverEntry The associated entry */ - public ServerSearchResult( DN dn, Entry serverEntry ) + public ServerSearchResult( Dn dn, Entry serverEntry ) { this.dn = dn; this.serverEntry = serverEntry; @@ -78,9 +78,9 @@ public class ServerSearchResult /** - * @return The result DN + * @return The result Dn */ - public DN getDn() + public Dn getDn() { return dn; } @@ -130,7 +130,7 @@ public class ServerSearchResult */ public String toString() { - String name = (dn == null ? "null" : ( dn == DN.EMPTY_DN ? "\"\"" : dn.getName() ) ); + String name = (dn == null ? "null" : ( dn == Dn.EMPTY_DN ? "\"\"" : dn.getName() ) ); return "ServerSearchResult : " + name + "\n" + serverEntry; } } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/Evaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/Evaluator.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/Evaluator.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/Evaluator.java Sun Jan 23 01:17:06 2011 @@ -23,7 +23,7 @@ package org.apache.directory.server.core import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.filter.ExprNode; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; /** @@ -44,5 +44,5 @@ public interface Evaluator * @return true if the filter selects the candidate false otherwise * @throws LdapException if there is a database fault during evaluation */ - boolean evaluate( ExprNode refinement, DN dn, Entry entry ) throws LdapException; + boolean evaluate( ExprNode refinement, Dn dn, Entry entry ) throws LdapException; } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java Sun Jan 23 01:17:06 2011 @@ -27,7 +27,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.filter.SearchScope; import org.apache.directory.shared.ldap.message.AliasDerefMode; import org.apache.directory.shared.ldap.message.SearchRequest; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; /** @@ -40,12 +40,12 @@ public class NotificationCriteria { public static final SearchScope DEFAULT_SCOPE = SearchScope.ONELEVEL; public static final AliasDerefMode DEFAULT_ALIAS_DEREF_MODE = AliasDerefMode.DEREF_ALWAYS; - public static final DN DEFAULT_BASE = new DN(); + public static final Dn DEFAULT_BASE = new Dn(); public static final ExprNode DEFAULT_FILTER = new PresenceNode( SchemaConstants.OBJECT_CLASS_AT ); private SearchScope scope = DEFAULT_SCOPE; private AliasDerefMode aliasDerefMode = DEFAULT_ALIAS_DEREF_MODE; - private DN base = DEFAULT_BASE; + private Dn base = DEFAULT_BASE; private ExprNode filter = DEFAULT_FILTER; private int eventMask = EventType.ALL_EVENT_TYPES_MASK; @@ -103,7 +103,7 @@ public class NotificationCriteria /** * @param base the base to set */ - public void setBase( DN base ) + public void setBase( Dn base ) { this.base = base; } @@ -114,14 +114,14 @@ public class NotificationCriteria */ public void setBase( String base ) throws Exception { - this.base = new DN( base ); + this.base = new Dn( base ); } /** * @return the base */ - public DN getBase() + public Dn getBase() { return base; } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java Sun Jan 23 01:17:06 2011 @@ -24,7 +24,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.changelog.ChangeLogEvent; import org.apache.directory.server.core.changelog.LogChange; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; /** @@ -62,7 +62,7 @@ public abstract class AbstractChangeOper * * @param session */ - public AbstractChangeOperationContext( CoreSession session, DN dn ) + public AbstractChangeOperationContext( CoreSession session, Dn dn ) { super( session, dn ); } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java Sun Jan 23 01:17:06 2011 @@ -34,11 +34,11 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; /** - * This abstract class stores common context elements, like the DN, which is used + * This abstract class stores common context elements, like the Dn, which is used * in all the contexts. * * @author Apache Directory Project @@ -47,8 +47,8 @@ public abstract class AbstractOperationC { protected static final Control[] EMPTY_CONTROLS = new Control[0]; - /** The DN associated with the context */ - protected DN dn; + /** The Dn associated with the context */ + protected Dn dn; /** The entry associated with the target entry of this OperationContext */ protected ClonedServerEntry entry; @@ -90,9 +90,9 @@ public abstract class AbstractOperationC /** * Creates a new instance of AbstractOperationContext. * - * @param dn The associated DN + * @param dn The associated Dn */ - public AbstractOperationContext( CoreSession session, DN dn ) + public AbstractOperationContext( CoreSession session, Dn dn ) { this.dn = dn; this.session = session; @@ -122,20 +122,20 @@ public abstract class AbstractOperationC /** - * @return The associated DN + * @return The associated Dn */ - public DN getDn() + public Dn getDn() { return dn; } /** - * Set the context DN + * Set the context Dn * - * @param dn The DN to set + * @param dn The Dn to set */ - public void setDn( DN dn ) + public void setDn( Dn dn ) { this.dn = dn; } @@ -304,7 +304,7 @@ public abstract class AbstractOperationC } - public boolean hasEntry( DN dn, Collection byPassed ) throws LdapException + public boolean hasEntry( Dn dn, Collection byPassed ) throws LdapException { EntryOperationContext hasEntryContext = new EntryOperationContext( session, dn ); setup( hasEntryContext ); @@ -322,7 +322,7 @@ public abstract class AbstractOperationC } - public void delete( DN dn, Collection byPassed ) throws LdapException + public void delete( Dn dn, Collection byPassed ) throws LdapException { DeleteOperationContext deleteContext = new DeleteOperationContext( session, dn ); setup( deleteContext ); @@ -331,7 +331,7 @@ public abstract class AbstractOperationC } - public void modify( DN dn, List mods, Collection byPassed ) throws LdapException + public void modify( Dn dn, List mods, Collection byPassed ) throws LdapException { ModifyOperationContext modifyContext = new ModifyOperationContext( session, dn, mods ); setup( modifyContext ); @@ -341,7 +341,7 @@ public abstract class AbstractOperationC // TODO - need synchronization here and where we update links - public LookupOperationContext newLookupContext( DN dn ) + public LookupOperationContext newLookupContext( Dn dn ) { LookupOperationContext lookupContext = new LookupOperationContext( session, dn ); setup( lookupContext ); @@ -360,7 +360,7 @@ public abstract class AbstractOperationC } - public Entry lookup( DN dn, Collection byPassed ) throws LdapException + public Entry lookup( Dn dn, Collection byPassed ) throws LdapException { LookupOperationContext lookupContext = newLookupContext( dn ); lookupContext.setByPassed( byPassed ); Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java Sun Jan 23 01:17:06 2011 @@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.message.AddRequest; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; /** @@ -56,7 +56,7 @@ public class AddOperationContext extends * @param session the current Session * @param dn the name of the entry being added */ - public AddOperationContext( CoreSession session, DN dn ) + public AddOperationContext( CoreSession session, Dn dn ) { super( session, dn ); } @@ -82,7 +82,7 @@ public class AddOperationContext extends * @param dn the name of the entry being added * @param entry the entry being added */ - public AddOperationContext( CoreSession session, DN dn, Entry entry ) + public AddOperationContext( CoreSession session, Dn dn, Entry entry ) { super( session, dn ); this.entry = new ClonedServerEntry( entry ); @@ -122,6 +122,6 @@ public class AddOperationContext extends */ public String toString() { - return "AddContext for DN '" + getDn().getName() + "'" + ", added entry: " + entry; + return "AddContext for Dn '" + getDn().getName() + "'" + ", added entry: " + entry; } } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java Sun Jan 23 01:17:06 2011 @@ -91,7 +91,7 @@ public class BindOperationContext extend } else { - // If we have a password but no DN, this is invalid + // If we have a password but no Dn, this is invalid LOG.info( "Bad authentication for {}", dn ); throw new LdapAuthenticationException( "Invalid authentication" ); } @@ -177,7 +177,7 @@ public class BindOperationContext extend */ public String toString() { - return "BindContext for DN '" + getDn().getName() + "', credentials <" + + return "BindContext for Dn '" + getDn().getName() + "', credentials <" + ( credentials != null ? Strings.dumpBytes(credentials) : "" ) + ">" + ( saslMechanism != null ? ", saslMechanism : <" + saslMechanism + ">" : "" ) + ( saslAuthId != null ? ", saslAuthId <" + saslAuthId + ">" : "" ); Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java Sun Jan 23 01:17:06 2011 @@ -26,7 +26,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.BinaryValue; import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.message.CompareRequest; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.util.Strings; @@ -65,7 +65,7 @@ public class CompareOperationContext ext * Creates a new instance of CompareOperationContext. * */ - public CompareOperationContext( CoreSession session, DN dn ) + public CompareOperationContext( CoreSession session, Dn dn ) { super( session, dn ); } @@ -88,7 +88,7 @@ public class CompareOperationContext ext * Creates a new instance of LookupOperationContext. * */ - public CompareOperationContext( CoreSession session, DN dn, String oid ) + public CompareOperationContext( CoreSession session, Dn dn, String oid ) { super( session, dn ); this.oid = oid; @@ -100,7 +100,7 @@ public class CompareOperationContext ext * Creates a new instance of LookupOperationContext. * */ - public CompareOperationContext( CoreSession session, DN dn, String oid, Value value ) + public CompareOperationContext( CoreSession session, Dn dn, String oid, Value value ) { super( session, dn ); this.oid = oid; @@ -198,7 +198,7 @@ public class CompareOperationContext ext */ public String toString() { - return "CompareContext for DN '" + getDn().getName() + "'" + + return "CompareContext for Dn '" + getDn().getName() + "'" + ( ( oid != null ) ? ", oid : <" + oid + ">" : "" ) + ( ( value != null ) ? ", value :'" + ( ( !value.isBinary() ) ? Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java Sun Jan 23 01:17:06 2011 @@ -25,7 +25,7 @@ import org.apache.directory.server.core. import org.apache.directory.shared.ldap.codec.MessageTypeEnum; import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl; import org.apache.directory.shared.ldap.message.DeleteRequest; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; /** @@ -55,9 +55,9 @@ public class DeleteOperationContext exte /** * Creates a new instance of DeleteOperationContext. * - * @param deleteDn The entry DN to delete + * @param deleteDn The entry Dn to delete */ - public DeleteOperationContext( CoreSession session, DN deleteDn ) + public DeleteOperationContext( CoreSession session, Dn deleteDn ) { super( session, deleteDn ); } @@ -93,7 +93,7 @@ public class DeleteOperationContext exte */ public String toString() { - return "DeleteContext for DN '" + getDn().getName() + "'"; + return "DeleteContext for Dn '" + getDn().getName() + "'"; } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EmptyOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EmptyOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EmptyOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EmptyOperationContext.java Sun Jan 23 01:17:06 2011 @@ -22,12 +22,12 @@ package org.apache.directory.server.core import org.apache.directory.server.core.CoreSession; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; /** * An EmptySuffix context used for Interceptors. It contains no data, and mask - * the DN in AbstractOperationContext + * the Dn in AbstractOperationContext * * @author Apache Directory Project */ @@ -38,18 +38,18 @@ public abstract class EmptyOperationCont */ public EmptyOperationContext( CoreSession session ) { - super( session, DN.EMPTY_DN ); + super( session, Dn.EMPTY_DN ); } /** - * Set the context DN + * Set the context Dn * - * @param dn The DN to set + * @param dn The Dn to set */ - public void setDn( DN dn ) + public void setDn( Dn dn ) { - if ( dn.equals( DN.EMPTY_DN ) ) + if ( dn.equals( Dn.EMPTY_DN ) ) { return; } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java Sun Jan 23 01:17:06 2011 @@ -22,7 +22,7 @@ package org.apache.directory.server.core import org.apache.directory.server.core.CoreSession; import org.apache.directory.shared.ldap.codec.MessageTypeEnum; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; /** @@ -44,9 +44,9 @@ public class EntryOperationContext exten /** * Creates a new instance of EntryOperationContext. * - * @param entryDn The Entry DN to unbind + * @param entryDn The Entry Dn to unbind */ - public EntryOperationContext( CoreSession session, DN entryDn ) + public EntryOperationContext( CoreSession session, Dn entryDn ) { super( session, entryDn ); } @@ -66,6 +66,6 @@ public class EntryOperationContext exten */ public String toString() { - return "EntryContext for DN '" + getDn().getName() + "'"; + return "EntryContext for Dn '" + getDn().getName() + "'"; } } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetRootDSEOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetRootDSEOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetRootDSEOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetRootDSEOperationContext.java Sun Jan 23 01:17:06 2011 @@ -21,7 +21,7 @@ package org.apache.directory.server.core import org.apache.directory.server.core.CoreSession; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; /** @@ -43,9 +43,9 @@ public class GetRootDSEOperationContext /** * Creates a new instance of GetRootDSEOperationContext. * - * @param dn The entry DN used to get the rootDSE + * @param dn The entry Dn used to get the rootDSE */ - public GetRootDSEOperationContext( CoreSession session, DN dn ) + public GetRootDSEOperationContext( CoreSession session, Dn dn ) { super( session, dn ); } @@ -64,6 +64,6 @@ public class GetRootDSEOperationContext */ public String toString() { - return "GetRootDSEContext with DN '" + getDn().getName() + "'"; + return "GetRootDSEContext with Dn '" + getDn().getName() + "'"; } } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java Sun Jan 23 01:17:06 2011 @@ -23,7 +23,7 @@ package org.apache.directory.server.core import java.util.Set; import org.apache.directory.server.core.CoreSession; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.AttributeTypeOptions; @@ -47,9 +47,9 @@ public class ListOperationContext extend /** * Creates a new instance of ListOperationContext. * - * @param dn The DN to get the suffix from + * @param dn The Dn to get the suffix from */ - public ListOperationContext( CoreSession session, DN dn ) + public ListOperationContext( CoreSession session, Dn dn ) { super( session, dn ); } @@ -59,11 +59,11 @@ public class ListOperationContext extend * Creates a new instance of ListOperationContext with attributes to return. * * @param session the session associated with this {@link OperationContext} - * @param dn the base DN + * @param dn the base Dn * @param aliasDerefMode the alias dereferencing mode to use * @param returningAttributes the attributes to return */ - public ListOperationContext( CoreSession session, DN dn, Set returningAttributes ) + public ListOperationContext( CoreSession session, Dn dn, Set returningAttributes ) { super( session, dn, returningAttributes ); } @@ -83,6 +83,6 @@ public class ListOperationContext extend */ public String toString() { - return "List with DN '" + getDn().getName() + "'"; + return "List with Dn '" + getDn().getName() + "'"; } } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/LookupOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/LookupOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/LookupOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/LookupOperationContext.java Sun Jan 23 01:17:06 2011 @@ -26,7 +26,7 @@ import java.util.List; import org.apache.directory.server.core.CoreSession; import org.apache.directory.shared.ldap.constants.SchemaConstants; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.util.Strings; @@ -70,7 +70,7 @@ public class LookupOperationContext exte * Creates a new instance of LookupOperationContext. * */ - public LookupOperationContext( CoreSession session, DN dn ) + public LookupOperationContext( CoreSession session, Dn dn ) { super( session, dn ); } @@ -93,7 +93,7 @@ public class LookupOperationContext exte * Creates a new instance of LookupOperationContext. * */ - public LookupOperationContext( CoreSession session, DN dn, String attrsId[] ) + public LookupOperationContext( CoreSession session, Dn dn, String attrsId[] ) { super( session, dn ); setAttrsId( attrsId ); @@ -263,7 +263,7 @@ public class LookupOperationContext exte */ public String toString() { - return "LookupContext for DN '" + getDn().getName() + "'" + return "LookupContext for Dn '" + getDn().getName() + "'" + ( ( attrsId != null ) ? ", attributes : <" + Strings.listToString(attrsId) + ">" : "" ); } } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java Sun Jan 23 01:17:06 2011 @@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.ModificationOperation; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.message.ModifyRequest; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; /** @@ -69,7 +69,7 @@ public class ModifyOperationContext exte * @param dn the dn of the entry to be modified * @param modItems the modifications to be performed on the entry */ - public ModifyOperationContext( CoreSession session, DN dn, List modItems ) + public ModifyOperationContext( CoreSession session, Dn dn, List modItems ) { super( session, dn ); @@ -170,7 +170,7 @@ public class ModifyOperationContext exte { StringBuilder sb = new StringBuilder(); - sb.append( "ModifyContext for DN '" ).append( getDn().getName() ).append( "', modifications :\n" ); + sb.append( "ModifyContext for Dn '" ).append( getDn().getName() ).append( "', modifications :\n" ); if ( modItems != null ) { Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java Sun Jan 23 01:17:06 2011 @@ -25,20 +25,20 @@ import org.apache.directory.server.i18n. import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl; import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.message.ModifyDnRequest; -import org.apache.directory.shared.ldap.name.DN; -import org.apache.directory.shared.ldap.name.RDN; +import org.apache.directory.shared.ldap.name.Dn; +import org.apache.directory.shared.ldap.name.Rdn; /** * A Move And Rename context used for Interceptors. It contains all the informations - * needed for the modify DN operation, and used by all the interceptors + * needed for the modify Dn operation, and used by all the interceptors * * @author Apache Directory Project */ public class MoveAndRenameOperationContext extends RenameOperationContext { - /** The new superior DN */ - private DN newSuperiorDn; + /** The new superior Dn */ + private Dn newSuperiorDn; /** * Creates a new instance of MoveAndRenameOperationContext. @@ -52,12 +52,12 @@ public class MoveAndRenameOperationConte /** * Creates a new instance of MoveAndRenameOperationContext. * - * @param oldDn the original source entry DN to be moved and renamed + * @param oldDn the original source entry Dn to be moved and renamed * @param parent the new entry superior of the target after the move * @param newRdn the new rdn to use for the target once renamed * @param delOldRdn true if the old rdn value is deleted, false otherwise */ - public MoveAndRenameOperationContext( CoreSession session, DN oldDn, DN newSuperiorDn, RDN newRdn, boolean delOldRdn ) + public MoveAndRenameOperationContext( CoreSession session, Dn oldDn, Dn newSuperiorDn, Rdn newRdn, boolean delOldRdn ) { super( session, oldDn, newRdn, delOldRdn ); this.newSuperiorDn = newSuperiorDn; @@ -100,20 +100,20 @@ public class MoveAndRenameOperationConte /** - * @return The new superior DN + * @return The new superior Dn */ - public DN getNewSuperiorDn() + public Dn getNewSuperiorDn() { return newSuperiorDn; } /** - * Set the new Superior DN + * Set the new Superior Dn * - * @param newSuperiorDn The new Superior DN + * @param newSuperiorDn The new Superior Dn */ - public void setNewSuperiorDn( DN newSuperiorDn ) + public void setNewSuperiorDn( Dn newSuperiorDn ) { this.newSuperiorDn = newSuperiorDn; } @@ -124,6 +124,6 @@ public class MoveAndRenameOperationConte */ public String toString() { - return "ReplaceContext for old DN '" + getDn().getName() + "' : " + newDn; + return "ReplaceContext for old Dn '" + getDn().getName() + "' : " + newDn; } } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java Sun Jan 23 01:17:06 2011 @@ -25,29 +25,29 @@ import org.apache.directory.server.i18n. import org.apache.directory.shared.ldap.codec.MessageTypeEnum; import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl; import org.apache.directory.shared.ldap.message.ModifyDnRequest; -import org.apache.directory.shared.ldap.name.DN; -import org.apache.directory.shared.ldap.name.RDN; +import org.apache.directory.shared.ldap.name.Dn; +import org.apache.directory.shared.ldap.name.Rdn; /** * A Move context used for Interceptors. It contains all the informations - * needed for the modify DN operation, and used by all the interceptors + * needed for the modify Dn operation, and used by all the interceptors * * @author Apache Directory Project */ public class MoveOperationContext extends AbstractChangeOperationContext { /** The old superior */ - private DN oldSuperior; + private Dn oldSuperior; - /** The entry RDN */ - private RDN rdn; + /** The entry Rdn */ + private Rdn rdn; - /** The newSuperior DN */ - private DN newSuperior; + /** The newSuperior Dn */ + private Dn newSuperior; - /** The New target DN */ - private DN newDn; + /** The New target Dn */ + private Dn newDn; /** @@ -62,12 +62,12 @@ public class MoveOperationContext extend /** * Creates a new instance of MoveOperationContext. */ - public MoveOperationContext( CoreSession session, DN oldDn, DN newSuperior ) + public MoveOperationContext( CoreSession session, Dn oldDn, Dn newSuperior ) { super( session, oldDn ); this.newSuperior = newSuperior; oldSuperior = oldDn.getParent(); - rdn = ( RDN )(oldDn.getRdn().clone()); + rdn = (Rdn)(oldDn.getRdn().clone()); newDn = newSuperior.add( rdn ); } @@ -99,42 +99,42 @@ public class MoveOperationContext extend } oldSuperior = modifyDnRequest.getName().getParent(); - rdn = ( RDN )(modifyDnRequest.getName().getRdn().clone()); + rdn = (Rdn)(modifyDnRequest.getName().getRdn().clone()); newDn = newSuperior.add( rdn ); } /** - * @return The oldSuperior DN + * @return The oldSuperior Dn */ - public DN getOldSuperior() + public Dn getOldSuperior() { return oldSuperior; } /** - * @return The newSuperior DN + * @return The newSuperior Dn */ - public DN getNewSuperior() + public Dn getNewSuperior() { return newSuperior; } /** - * @return The RDN + * @return The Rdn */ - public RDN getRdn() + public Rdn getRdn() { return rdn; } /** - * @return The new DN + * @return The new Dn */ - public DN getNewDn() + public Dn getNewDn() { return newDn; } @@ -154,7 +154,7 @@ public class MoveOperationContext extend */ public String toString() { - return "ReplaceContext for old DN '" + getDn().getName() + "'" + + return "ReplaceContext for old Dn '" + getDn().getName() + "'" + ", newSuperior '" + newSuperior + "'"; } } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java Sun Jan 23 01:17:06 2011 @@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; /** @@ -101,22 +101,22 @@ public interface OperationContext /** - * @return The associated DN + * @return The associated Dn */ - DN getDn(); + Dn getDn(); /** - * Set the context DN + * Set the context Dn * - * @param dn The DN to set + * @param dn The Dn to set */ - void setDn( DN dn ); + void setDn( Dn dn ); /** - * Gets the server entry associated with the target DN of this - * OperationContext. The entry associated with the DN may be altered + * Gets the server entry associated with the target Dn of this + * OperationContext. The entry associated with the Dn may be altered * during the course of processing an LDAP operation through the * InterceptorChain. This place holder is put here to prevent the need * for repetitive lookups of the target entry. Furthermore the returned @@ -129,23 +129,23 @@ public interface OperationContext * prevent the need for subsequent lookups. * * Also note that during the course of handling some operations such as - * those that rename, move or rename and move the entry, may alter the DN - * of this entry. Interceptor implementors should not presume the DN or + * those that rename, move or rename and move the entry, may alter the Dn + * of this entry. Interceptor implementors should not presume the Dn or * the values contained in this entry are currently what is present in the * DIT. The original entry contained in the ClonedServerEntry shoudl be * used as the definitive source of information about the state of the * entry in the DIT before returning from the Partition subsystem. * - * @return target entry associated with the DN of this OperationContext + * @return target entry associated with the Dn of this OperationContext */ ClonedServerEntry getEntry(); /** - * Sets the server entry associated with the target DN of this + * Sets the server entry associated with the target Dn of this * OperationContext. * - * @param entry the entry whose DN is associated with this OperationContext. + * @param entry the entry whose Dn is associated with this OperationContext. */ void setEntry( ClonedServerEntry entry ); @@ -294,22 +294,22 @@ public interface OperationContext // ----------------------------------------------------------------------- - LookupOperationContext newLookupContext( DN dn ); + LookupOperationContext newLookupContext( Dn dn ); - Entry lookup( DN dn, Collection byPass ) throws LdapException; + Entry lookup( Dn dn, Collection byPass ) throws LdapException; Entry lookup( LookupOperationContext lookupContext ) throws LdapException; - void modify( DN dn, List mods, Collection byPass ) throws LdapException; + void modify( Dn dn, List mods, Collection byPass ) throws LdapException; void add( Entry entry, Collection byPass ) throws LdapException; - void delete( DN dn, Collection byPass ) throws LdapException; + void delete( Dn dn, Collection byPass ) throws LdapException; /** @@ -320,7 +320,7 @@ public interface OperationContext * @return true if the entry exists, false if it does not * @throws Exception on failure to perform this operation */ - boolean hasEntry( DN dn, Collection byPass ) throws LdapException; + boolean hasEntry( Dn dn, Collection byPass ) throws LdapException; /** Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java Sun Jan 23 01:17:06 2011 @@ -25,27 +25,27 @@ import org.apache.directory.server.i18n. import org.apache.directory.shared.ldap.codec.MessageTypeEnum; import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl; import org.apache.directory.shared.ldap.message.ModifyDnRequest; -import org.apache.directory.shared.ldap.name.DN; -import org.apache.directory.shared.ldap.name.RDN; +import org.apache.directory.shared.ldap.name.Dn; +import org.apache.directory.shared.ldap.name.Rdn; /** * A RenameService context used for Interceptors. It contains all the informations - * needed for the modify DN operation, and used by all the interceptors + * needed for the modify Dn operation, and used by all the interceptors * - * This is used when the modifyDN is about changing the RDN, not the base DN. + * This is used when the modifyDN is about changing the Rdn, not the base Dn. * * @author Apache Directory Project */ public class RenameOperationContext extends AbstractChangeOperationContext { - /** The new RDN */ - protected RDN newRdn; + /** The new Rdn */ + protected Rdn newRdn; - /** Cached copy of the new DN */ - protected DN newDn; + /** Cached copy of the new Dn */ + protected Dn newDn; - /** The flag to remove the old RDN Attribute */ + /** The flag to remove the old Rdn Attribute */ private boolean deleteOldRdn; /** @@ -61,10 +61,10 @@ public class RenameOperationContext exte * Creates a new instance of RenameOperationContext. * * @param oldDn the dn of the entry before the rename - * @param newRdn the new RDN to use for the target - * @param delOldDn true if we delete the old RDN value + * @param newRdn the new Rdn to use for the target + * @param delOldDn true if we delete the old Rdn value */ - public RenameOperationContext( CoreSession session, DN oldDn, RDN newRdn, boolean deleteOldRdn ) + public RenameOperationContext( CoreSession session, Dn oldDn, Rdn newRdn, boolean deleteOldRdn ) { super( session, oldDn ); this.newRdn = newRdn; @@ -97,7 +97,7 @@ public class RenameOperationContext exte /** - * @return The delete old RDN flag + * @return The delete old Rdn flag */ public boolean getDeleteOldRdn() { @@ -106,7 +106,7 @@ public class RenameOperationContext exte /** - * Set the flag to delete the old RDN + * Set the flag to delete the old Rdn * @param deleteOldRdn the flag to set */ public void setDelOldDn( boolean deleteOldRdn ) @@ -116,38 +116,38 @@ public class RenameOperationContext exte /** - * @return The new DN either computed if null or already computed + * @return The new Dn either computed if null or already computed */ - public DN getNewDn() + public Dn getNewDn() { return newDn; } /** - * @return The new RDN + * @return The new Rdn */ - public RDN getNewRdn() + public Rdn getNewRdn() { return newRdn; } /** - * Set the new RDN - * @param newRdn The new RDN + * Set the new Rdn + * @param newRdn The new Rdn */ - public void setNewRdn( RDN newRdn ) + public void setNewRdn( Rdn newRdn ) { this.newRdn = newRdn; } /** - * Set the new DN - * @param newDn The new DN + * Set the new Dn + * @param newDn The new Dn */ - public void setNewDn( DN newDn ) + public void setNewDn( Dn newDn ) { this.newDn = newDn; } @@ -167,8 +167,8 @@ public class RenameOperationContext exte */ public String toString() { - return "RenameContext for old DN '" + getDn().getName() + "'" + - ", new RDN '" + newRdn + "'" + + return "RenameContext for old Dn '" + getDn().getName() + "'" + + ", new Rdn '" + newRdn + "'" + ( deleteOldRdn ? ", delete old Rdn" : "" ) ; } } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java Sun Jan 23 01:17:06 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.SearchScope; import org.apache.directory.shared.ldap.message.SearchRequest; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.AttributeTypeOptions; @@ -110,7 +110,7 @@ public class SearchOperationContext exte * @param filter the filter AST to use for the search * @param searchControls the search controls */ - public SearchOperationContext( CoreSession session, DN dn, ExprNode filter, SearchControls searchControls ) throws LdapException + public SearchOperationContext( CoreSession session, Dn dn, ExprNode filter, SearchControls searchControls ) throws LdapException { super( session, dn ); this.filter = filter; @@ -140,7 +140,7 @@ public class SearchOperationContext exte * @param aliasDerefMode the alias dereferencing mode * @param returningAttributes the attributes to return */ - public SearchOperationContext( CoreSession session, DN dn, SearchScope scope, + public SearchOperationContext( CoreSession session, Dn dn, SearchScope scope, ExprNode filter, Set returningAttributes ) { super( session, dn, returningAttributes ); @@ -186,7 +186,7 @@ public class SearchOperationContext exte */ public String toString() { - return "SearchContext for DN '" + getDn().getName() + "', filter :'" + return "SearchContext for Dn '" + getDn().getName() + "', filter :'" + filter + "'"; } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java Sun Jan 23 01:17:06 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException; import org.apache.directory.shared.ldap.filter.SearchScope; import org.apache.directory.shared.ldap.message.AliasDerefMode; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.AttributeTypeOptions; import org.apache.directory.shared.ldap.schema.SchemaUtils; @@ -97,9 +97,9 @@ public abstract class SearchingOperation /** * Creates a new instance of SearchingOperationContext. * - * @param dn The DN to get the suffix from + * @param dn The Dn to get the suffix from */ - public SearchingOperationContext( CoreSession session, DN dn ) + public SearchingOperationContext( CoreSession session, Dn dn ) { super( session, dn ); } @@ -109,11 +109,11 @@ public abstract class SearchingOperation * Creates a new instance of a SearchingOperationContext using one level * scope, with attributes to return. * - * @param dn The DN to get the suffix from + * @param dn The Dn to get the suffix from * @param aliasDerefMode the alias dereferencing mode to use * @throws LdapException */ - public SearchingOperationContext( CoreSession session, DN dn, Set returningAttributes ) + public SearchingOperationContext( CoreSession session, Dn dn, Set returningAttributes ) { super( session, dn ); this.returningAttributes = returningAttributes; @@ -185,7 +185,7 @@ public abstract class SearchingOperation */ public String toString() { - return "ListOperationContext with DN '" + getDn().getName() + "'"; + return "ListOperationContext with Dn '" + getDn().getName() + "'"; } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java Sun Jan 23 01:17:06 2011 @@ -63,6 +63,6 @@ public class UnbindOperationContext exte */ public String toString() { - return "UnbindContext for DN '" + getDn().getName() + "'"; + return "UnbindContext for Dn '" + getDn().getName() + "'"; } } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java Sun Jan 23 01:17:06 2011 @@ -46,7 +46,7 @@ import org.apache.directory.shared.i18n. import org.apache.directory.shared.ldap.cursor.ClosureMonitor; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.SchemaManager; @@ -58,7 +58,7 @@ import org.apache.directory.shared.ldap. public class NullPartition extends AbstractPartition { private String id; - private DN suffix; + private Dn suffix; /** @@ -339,7 +339,7 @@ public class NullPartition extends Abstr /** * {@inheritDoc} */ - public void setSuffix( DN suffix ) throws LdapInvalidDnException + public void setSuffix( Dn suffix ) throws LdapInvalidDnException { this.suffix = suffix; } @@ -353,7 +353,7 @@ public class NullPartition extends Abstr } - public DN getSuffix() + public Dn getSuffix() { return suffix; } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java Sun Jan 23 01:17:06 2011 @@ -37,14 +37,14 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.interceptor.context.UnbindOperationContext; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.SchemaManager; /** * Interface for entry stores containing a part of the DIB (Directory * Information Base). Partitions are associated with a specific suffix, and - * all entries contained in the them have the same DN suffix in common. + * all entries contained in the them have the same Dn suffix in common. * * @author Apache Directory Project */ @@ -74,9 +74,9 @@ public interface Partition * Sets the user provided suffix for this Partition as a String. * * @param suffix the suffix String for this Partition. - * @throws LdapInvalidDnException if the suffix does not conform to LDAP DN syntax + * @throws LdapInvalidDnException if the suffix does not conform to LDAP Dn syntax */ - void setSuffix( DN suffix ) throws LdapInvalidDnException; + void setSuffix( Dn suffix ) throws LdapInvalidDnException; /** @@ -108,14 +108,14 @@ public interface Partition /** - * Gets the normalized suffix as an DN for this Partition after it has - * been initialized. Attempts to get this DN before initialization + * Gets the normalized suffix as an Dn for this Partition after it has + * been initialized. Attempts to get this Dn before initialization * throw an IllegalStateException. * * @return the suffix for this Partition. * @throws IllegalStateException if the Partition has not been initialized */ - DN getSuffix(); + Dn getSuffix(); /** @@ -235,7 +235,7 @@ public interface Partition * This makes sense only in certain namespaces like LDAP and will be ignored * if it is irrelevant. * - * @param renameContext the modify DN context + * @param renameContext the modify Dn context * @throws Exception if there are any problems */ void rename( RenameOperationContext renameContext ) throws LdapException; Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java Sun Jan 23 01:17:06 2011 @@ -26,7 +26,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.util.Strings; @@ -70,10 +70,10 @@ public interface PartitionNexus extends /** * Remove a partition from the server. * - * @param partitionDn the partition DN + * @param partitionDn the partition Dn * @throws Exception If the removal can't be done */ - public void removeContextPartition( DN partitionDn ) + public void removeContextPartition( Dn partitionDn ) throws LdapException; @@ -87,25 +87,25 @@ public interface PartitionNexus extends * Get's the partition corresponding to a distinguished name. This * name need not be the name of the partition suffix. When used in * conjunction with get suffix this can properly find the partition - * associated with the DN. Make sure to use the normalized DN. + * associated with the Dn. Make sure to use the normalized Dn. * * @param dn the normalized distinguished name to get a partition for * @return the partition containing the entry represented by the dn * @throws Exception if there is no partition for the dn */ - public Partition getPartition( DN dn ) throws LdapException; + public Partition getPartition( Dn dn ) throws LdapException; /** * Finds the distinguished name of the suffix that would hold an entry with - * the supplied distinguished name parameter. If the DN argument does not + * the supplied distinguished name parameter. If the Dn argument does not * fall under a partition suffix then the empty string Dn is returned. * - * @param The DN we want to find the suffix from + * @param The Dn we want to find the suffix from * @return the suffix portion of dn, or the valid empty string Dn if no * naming context was found for dn. */ - public DN findSuffix( DN dn ) throws LdapException; + public Dn findSuffix( Dn dn ) throws LdapException; /** Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java Sun Jan 23 01:17:06 2011 @@ -54,7 +54,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.SchemaUtils; import org.apache.directory.shared.util.DateUtils; import org.slf4j.Logger; @@ -115,11 +115,11 @@ public final class SchemaPartition exten /** registry synchronizer adaptor */ private RegistrySynchronizerAdaptor synchronizer; - /** A static DN for the ou=schemaModifications entry */ - private static DN schemaModificationDN; + /** A static Dn for the ou=schemaModifications entry */ + private static Dn schemaModificationDn; - /** A static DN for the ou=schema partition */ - private static DN schemaDN; + /** A static Dn for the ou=schema partition */ + private static Dn schemaDn; /** @@ -172,7 +172,7 @@ public final class SchemaPartition exten /** * Always returns {@link ServerDNConstants#OU_SCHEMA_DN_NORMALIZED}: '2.5.4.11=schema'. */ - public DN getSuffix() + public Dn getSuffix() { return wrapped.getSuffix(); } @@ -181,7 +181,7 @@ public final class SchemaPartition exten /** * Has no affect: just logs a warning. */ - public void setSuffix( DN suffix ) + public void setSuffix( Dn suffix ) { LOG.warn( "This partition's suffix is fixed: {}", SchemaConstants.OU_SCHEMA ); } @@ -211,10 +211,10 @@ public final class SchemaPartition exten // Load apachemeta schema from within the ldap-schema Jar with all the // schema it depends on. This is a minimal mandatory set of schemas. // ----------------------------------------------------------------------- - schemaDN = new DN( SchemaConstants.OU_SCHEMA, schemaManager ); + schemaDn = new Dn( SchemaConstants.OU_SCHEMA, schemaManager ); wrapped.setId( ID ); - wrapped.setSuffix( schemaDN ); + wrapped.setSuffix(schemaDn); wrapped.setSchemaManager( schemaManager ); try @@ -236,7 +236,7 @@ public final class SchemaPartition exten throw new RuntimeException( e ); } - schemaModificationDN = new DN( ServerDNConstants.SCHEMA_MODIFICATIONS_DN, schemaManager ); + schemaModificationDn = new Dn( ServerDNConstants.SCHEMA_MODIFICATIONS_DN, schemaManager ); } @@ -364,7 +364,7 @@ public final class SchemaPartition exten wrapped.modify( modifyContext ); } - if ( !modifyContext.getDn().equals( schemaModificationDN ) ) + if ( !modifyContext.getDn().equals(schemaModificationDn) ) { updateSchemaModificationAttributes( modifyContext ); } @@ -448,7 +448,7 @@ public final class SchemaPartition exten * ou=schema,cn=schemaModifications. This entry is hardcoded at that * position for now. * - * The current time is used to set the timestamp and the DN of current user + * The current time is used to set the timestamp and the Dn of current user * is set for the modifiersName. * * @throws LdapException if the update fails @@ -468,7 +468,7 @@ public final class SchemaPartition exten ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT, schemaManager .lookupAttributeTypeRegistry( ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT ), modifiersName ) ) ); - opContext.modify( schemaModificationDN, mods, ByPassConstants.SCHEMA_MODIFICATION_ATTRIBUTES_UPDATE_BYPASS ); + opContext.modify(schemaModificationDn, mods, ByPassConstants.SCHEMA_MODIFICATION_ATTRIBUTES_UPDATE_BYPASS ); } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java Sun Jan 23 01:17:06 2011 @@ -7,7 +7,7 @@ import java.util.Set; import org.apache.directory.server.core.filtering.EntryFilteringCursor; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.MatchingRule; import org.apache.directory.shared.ldap.schema.ObjectClass; @@ -58,7 +58,7 @@ public interface SchemaPartitionDao String findSchema( String entityName ) throws Exception; - DN findDn( String entityName ) throws Exception; + Dn findDn( String entityName ) throws Exception; /** Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java Sun Jan 23 01:17:06 2011 @@ -55,8 +55,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.filter.SearchScope; import org.apache.directory.shared.ldap.filter.SimpleNode; import org.apache.directory.shared.ldap.message.AliasDerefMode; -import org.apache.directory.shared.ldap.name.DN; -import org.apache.directory.shared.ldap.name.RDN; +import org.apache.directory.shared.ldap.name.Dn; +import org.apache.directory.shared.ldap.name.Rdn; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.AttributeTypeOptions; import org.apache.directory.shared.ldap.schema.MatchingRule; @@ -195,7 +195,7 @@ public class SchemaPartitionDaoImpl impl private EntryFilteringCursor listSchemas() throws Exception { - DN base = new DN( SchemaConstants.OU_SCHEMA, schemaManager ); + Dn base = new Dn( SchemaConstants.OU_SCHEMA, schemaManager ); ExprNode filter = new EqualityNode( OBJECT_CLASS_AT, new StringValue( MetaSchemaConstants.META_SCHEMA_OC ) ); @@ -213,7 +213,7 @@ public class SchemaPartitionDaoImpl impl */ public Schema getSchema( String schemaName ) throws Exception { - DN dn = new DN( "cn=" + schemaName + ",ou=schema", schemaManager ); + Dn dn = new Dn( "cn=" + schemaName + ",ou=schema", schemaManager ); return factory.getSchema( partition.lookup( new LookupOperationContext( null, dn ) ) ); } @@ -483,13 +483,13 @@ public class SchemaPartitionDaoImpl impl */ public String findSchema( String entityName ) throws Exception { - DN dn = findDn( entityName ); + Dn dn = findDn( entityName ); if ( dn == null ) { return null; } - RDN rdn = dn.getRdn( 1 ); + Rdn rdn = dn.getRdn( 1 ); if ( !rdn.getNormType().equalsIgnoreCase( SchemaConstants.CN_AT_OID ) ) { @@ -503,10 +503,10 @@ public class SchemaPartitionDaoImpl impl /* (non-Javadoc) * @see org.apache.directory.server.core.schema.SchemaPartitionDao#findDn(java.lang.String) */ - public DN findDn( String entityName ) throws Exception + public Dn findDn( String entityName ) throws Exception { Entry sr = find( entityName ); - DN dn = sr.getDn(); + Dn dn = sr.getDn(); dn.normalize( schemaManager ); return dn; } @@ -565,7 +565,7 @@ public class SchemaPartitionDaoImpl impl */ public void enableSchema( String schemaName ) throws Exception { - DN dn = new DN( "cn=" + schemaName + ",ou=schema", schemaManager ); + Dn dn = new Dn( "cn=" + schemaName + ",ou=schema", schemaManager ); Entry entry = partition.lookup( new LookupOperationContext( null, dn ) ); EntryAttribute disabledAttr = entry.get( disabledAttributeType ); List mods = new ArrayList( 3 ); Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Sun Jan 23 01:17:06 2011 @@ -3,7 +3,7 @@ package org.apache.directory.server.core import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.SchemaManager; @@ -11,13 +11,13 @@ public interface SchemaService { /** - * Tells if the given DN is the schemaSubentry DN + * Tells if the given Dn is the schemaSubentry Dn * - * @param dn The DN we want to check - * @return true if the given DN is the Schema subentry DN - * @throws LdapException If the given DN is not valid + * @param dn The Dn we want to check + * @return true if the given Dn is the Schema subentry Dn + * @throws LdapException If the given Dn is not valid */ - boolean isSchemaSubentry( DN dn ) throws LdapException; + boolean isSchemaSubentry( Dn dn ) throws LdapException; /** Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java Sun Jan 23 01:17:06 2011 @@ -39,8 +39,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException; import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException; import org.apache.directory.shared.ldap.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.name.DN; -import org.apache.directory.shared.ldap.name.RDN; +import org.apache.directory.shared.ldap.name.Dn; +import org.apache.directory.shared.ldap.name.Rdn; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.SchemaObject; @@ -99,13 +99,13 @@ public abstract class AbstractRegistrySy /** - * Tells if the schema the DN references is loaded or not + * Tells if the schema the Dn references is loaded or not * - * @param dn The SchemaObject's DN + * @param dn The SchemaObject's Dn * @return true if the schema is loaded - * @throws Exception If The DN is not a SchemaObject DN + * @throws Exception If The Dn is not a SchemaObject Dn */ - protected boolean isSchemaLoaded( DN dn ) throws Exception + protected boolean isSchemaLoaded( Dn dn ) throws Exception { return schemaManager.isSchemaLoaded( getSchemaName( dn ) ); } @@ -138,25 +138,25 @@ public abstract class AbstractRegistrySy /** - * Exctract the schema name from the DN. It is supposed to be the - * second RDN in the dn : + * Exctract the schema name from the Dn. It is supposed to be the + * second Rdn in the dn : * 
      * ou=schema, cn=MySchema, ...
      *
* Here, the schemaName is MySchema * - * @param dn The DN we want to get the schema name from + * @param dn The Dn we want to get the schema name from * @return The schema name * @throws NamingException If we got an error */ - protected String getSchemaName( DN dn ) throws LdapException + protected String getSchemaName( Dn dn ) throws LdapException { if ( dn.size() < 2 ) { throw new LdapInvalidDnException( I18n.err( I18n.ERR_276 ) ); } - RDN rdn = dn.getRdn( 1 ); + Rdn rdn = dn.getRdn( 1 ); return rdn.getNormValue().getString(); } @@ -193,16 +193,16 @@ public abstract class AbstractRegistrySy /** - * Checks that the parent DN is a valid DN + * Checks that the parent Dn is a valid Dn */ - protected void checkParent( DN newParent, SchemaManager schemaManager, String objectType ) throws LdapException + protected void checkParent( Dn newParent, SchemaManager schemaManager, String objectType ) throws LdapException { if ( newParent.size() != 3 ) { throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION, I18n.err( I18n.ERR_337 ) ); } - RDN rdn = newParent.getRdn(); + Rdn rdn = newParent.getRdn(); if ( ! schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() ).equals( SchemaConstants.OU_AT_OID ) ) { @@ -327,7 +327,7 @@ public abstract class AbstractRegistrySy for ( Entry result : results ) { - DN dn = result.getDn(); + Dn dn = result.getDn(); dn.normalize( schemaManager ); oids.add( dn.getRdn().getNormValue().getString() ); } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java Sun Jan 23 01:17:06 2011 @@ -28,8 +28,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException; import org.apache.directory.shared.ldap.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.name.DN; -import org.apache.directory.shared.ldap.name.RDN; +import org.apache.directory.shared.ldap.name.Dn; +import org.apache.directory.shared.ldap.name.Rdn; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.registries.Schema; @@ -67,11 +67,11 @@ public class AttributeTypeSynchronizer e */ public void add( Entry entry ) throws LdapException { - DN dn = entry.getDn(); - DN parentDn = dn; + Dn dn = entry.getDn(); + Dn parentDn = dn; parentDn = parentDn.remove( parentDn.size() - 1 ); - // The parent DN must be ou=attributetypes,cn=,ou=schema + // The parent Dn must be ou=attributetypes,cn=,ou=schema checkParent( parentDn, schemaManager, SchemaConstants.ATTRIBUTE_TYPE ); // The new schemaObject's OID must not already exist @@ -115,7 +115,7 @@ public class AttributeTypeSynchronizer e public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry, boolean cascade ) throws LdapException { - DN name = modifyContext.getDn(); + Dn name = modifyContext.getDn(); Entry entry = modifyContext.getEntry(); String schemaName = getSchemaName( name ); String oid = getOid( entry ); @@ -143,11 +143,11 @@ public class AttributeTypeSynchronizer e */ public void delete( Entry entry, boolean cascade ) throws LdapException { - DN dn = entry.getDn(); - DN parentDn = dn; + Dn dn = entry.getDn(); + Dn parentDn = dn; parentDn = parentDn.remove( parentDn.size() - 1 ); - // The parent DN must be ou=attributetypes,cn=,ou=schema + // The parent Dn must be ou=attributetypes,cn=,ou=schema checkParent( parentDn, schemaManager, SchemaConstants.ATTRIBUTE_TYPE ); // Get the SchemaName @@ -193,7 +193,7 @@ public class AttributeTypeSynchronizer e /** * {@inheritDoc} */ - public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException + public void rename( Entry entry, Rdn newRdn, boolean cascade ) throws LdapException { String schemaName = getSchemaName( entry.getDn() ); AttributeType oldAt = factory @@ -205,8 +205,8 @@ public class AttributeTypeSynchronizer e checkOidIsUnique( newOid ); targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid ); - // Inject the new DN - DN newDn = new DN( targetEntry.getDn() ); + // Inject the new Dn + Dn newDn = new Dn( targetEntry.getDn() ); newDn = newDn.remove( newDn.size() - 1 ); newDn = newDn.add( newRdn ); targetEntry.setDn( newDn ); @@ -235,7 +235,7 @@ public class AttributeTypeSynchronizer e } - public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn, + public void moveAndRename( Dn oriChildName, Dn newParentName, Rdn newRn, boolean deleteOldRn, Entry entry, boolean cascade ) throws LdapException { checkParent( newParentName, schemaManager, SchemaConstants.ATTRIBUTE_TYPE ); @@ -287,7 +287,7 @@ public class AttributeTypeSynchronizer e } - public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws LdapException + public void move( Dn oriChildName, Dn newParentName, Entry entry, boolean cascade ) throws LdapException { checkParent( newParentName, schemaManager, SchemaConstants.ATTRIBUTE_TYPE ); String oldSchemaName = getSchemaName( oriChildName );