directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1062306 [10/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/s...
Date Sun, 23 Jan 2011 01:17:26 GMT
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java Sun Jan 23 01:17:06 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.UserClass;
 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.subtree.SubtreeSpecification;
 
 
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
  */
 public class RelatedUserClassFilter implements ACITupleFilter
 {
-    private static final DN ROOTDSE_NAME = DN.EMPTY_DN;
+    private static final Dn ROOTDSE_NAME = Dn.EMPTY_DN;
 
     private final SubtreeEvaluator subtreeEvaluator;
 
@@ -95,8 +95,8 @@ public class RelatedUserClassFilter impl
     }
 
 
-    private boolean isRelated( Collection<DN> userGroupNames, DN userName, Entry userEntry, 
-        DN entryName, Collection<UserClass> userClasses ) throws LdapException
+    private boolean isRelated( Collection<Dn> userGroupNames, Dn userName, Entry userEntry,
+        Dn entryName, Collection<UserClass> userClasses ) throws LdapException
     {
         for ( UserClass userClass : userClasses )
         {
@@ -130,13 +130,13 @@ public class RelatedUserClassFilter impl
             {
                 UserClass.UserGroup userGroupUserClass = ( UserClass.UserGroup ) userClass;
                 
-                for ( DN userGroupName : userGroupNames )
+                for ( Dn userGroupName : userGroupNames )
                 {
-                    Set<DN> dns = userGroupUserClass.getNames();
+                    Set<Dn> dns = userGroupUserClass.getNames();
                     
                     if ( userGroupName != null )
                     {
-                        for ( DN dn : dns )
+                        for ( Dn dn : dns )
                         {
                             if ( userGroupName.getNormName().equals( dn.getNormName() ) )
                             {
@@ -164,7 +164,7 @@ public class RelatedUserClassFilter impl
     }
 
 
-    private boolean matchUserClassSubtree( DN userName, Entry userEntry, UserClass.Subtree subtree )
+    private boolean matchUserClassSubtree( Dn userName, Entry userEntry, UserClass.Subtree subtree )
         throws LdapException
     {
         for ( SubtreeSpecification subtreeSpec : subtree.getSubtreeSpecifications() )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Sun Jan 23 01:17:06 2011
@@ -47,7 +47,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.ldif.ChangeType;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifRevertor;
-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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -192,7 +192,7 @@ public class ChangeLogInterceptor extend
      */
     private Entry getAttributes( OperationContext opContext ) throws LdapException
     {
-        DN dn = opContext.getDn();
+        Dn dn = opContext.getDn();
         Entry serverEntry;
 
         // @todo make sure we're not putting in operational attributes that cannot be user modified

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/package-info.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/package-info.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/package-info.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/package-info.java Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@
  * <p>
  * Use AdminModel to control what goes into the changelog ?  Or use admin model to identify 
  * scopes/concerns which are put into different channels in the changelog?  Cool idea perhaps,
- * perhaps not.  To some degree the DN does the scope thingy for us.  There really is no point
+ * perhaps not.  To some degree the Dn does the scope thingy for us.  There really is no point
  * to having an additional scope parameter.
  * </p><p>
  * Perhaps we can also inject a new revisions (multi-valued) operational attribute into 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Sun Jan 23 01:17:06 2011
@@ -50,7 +50,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-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.SchemaUtils;
 import org.slf4j.Logger;
@@ -182,7 +182,7 @@ public class CollectiveAttributeIntercep
      * <li>The entry is a collectiveAttributeSubentry
      * </ul>
      */
-    private void checkAdd( DN normName, Entry entry ) throws LdapException
+    private void checkAdd( Dn normName, Entry entry ) throws LdapException
     {
         if ( entry.hasObjectClass( SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRY_OC ) )
         {
@@ -392,7 +392,7 @@ public class CollectiveAttributeIntercep
         for ( Value<?> value : collectiveAttributeSubentries )
         {
             String subentryDnStr = value.getString();
-            DN subentryDn = opContext.getSession().getDirectoryService().getDNFactory().create( subentryDnStr );
+            Dn subentryDn = opContext.getSession().getDirectoryService().getDNFactory().create( subentryDnStr );
 
             /*
              * TODO - Instead of hitting disk here can't we leverage the 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Sun Jan 23 01:17:06 2011
@@ -44,7 +44,7 @@ import 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;
 import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.ConcreteNameComponentNormalizer;
 import org.slf4j.Logger;
@@ -281,7 +281,7 @@ public class EventInterceptor extends Ba
     }
 
 
-    List<RegistrationEntry> getSelectingRegistrations( DN name, Entry entry ) throws LdapException
+    List<RegistrationEntry> getSelectingRegistrations( Dn name, Entry entry ) throws LdapException
     {
         if ( registrations.isEmpty() )
         {
@@ -294,7 +294,7 @@ public class EventInterceptor extends Ba
         {
             NotificationCriteria criteria = registration.getCriteria();
 
-            DN base = criteria.getBase();
+            Dn base = criteria.getBase();
 
             if ( !criteria.getFilter().isSchemaAware() )
             {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java Sun Jan 23 01:17:06 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.NotNode;
 import org.apache.directory.shared.ldap.filter.OrNode;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 
 
@@ -91,7 +91,7 @@ public class ExpressionEvaluator impleme
     /**
      * {@inheritDoc}
      */
-    public boolean evaluate( ExprNode node, DN dn, Entry entry ) throws LdapException
+    public boolean evaluate( ExprNode node, Dn dn, Entry entry ) throws LdapException
     {
         if ( node.isLeaf() )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Sun Jan 23 01:17:06 2011
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.ScopeNode;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
-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.LdapComparator;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -107,7 +107,7 @@ public class LeafEvaluator implements Ev
     /**
      * {@inheritDoc}
      */
-    public boolean evaluate( ExprNode node, DN dn, Entry entry ) throws LdapException
+    public boolean evaluate( ExprNode node, Dn dn, Entry entry ) throws LdapException
     {
         if ( node instanceof ScopeNode )
         {
@@ -258,7 +258,7 @@ public class LeafEvaluator implements Ev
             return false;
         }
 
-        // check if AVA value exists in attribute
+        // check if Ava value exists in attribute
         AttributeType attributeType = node.getAttributeType();
         Value<?> value = null;
         
@@ -283,7 +283,7 @@ public class LeafEvaluator implements Ev
             return true;
         }
 
-        // get the normalized AVA filter value
+        // get the normalized Ava filter value
         Value<?> filterValue = normalizer.normalize( value );
 
         // check if the normalized value is present

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java Sun Jan 23 01:17:06 2011
@@ -26,7 +26,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapInvalidSearchFilterException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.ScopeNode;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -44,7 +44,7 @@ public class ScopeEvaluator implements E
     /**
      * {@inheritDoc}
      */
-    public boolean evaluate( ExprNode node, DN dn, Entry record ) throws LdapException
+    public boolean evaluate( ExprNode node, Dn dn, Entry record ) throws LdapException
     {
         ScopeNode snode = ( ScopeNode ) node;
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java Sun Jan 23 01:17:06 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapInvalidSearchFilterException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
-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.Normalizer;
@@ -55,7 +55,7 @@ public class SubstringEvaluator implemen
     /**
      * {@inheritDoc}
      */
-    public boolean evaluate( ExprNode node, DN dn, Entry entry ) throws LdapException
+    public boolean evaluate( ExprNode node, Dn dn, Entry entry ) throws LdapException
     {
         Pattern regex = null;
         SubstringNode snode = (SubstringNode)node;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Sun Jan 23 01:17:06 2011
@@ -52,21 +52,21 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
 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.Dn;
 
 
 /**
  * An {@link org.apache.directory.server.core.interceptor.Interceptor} that detects any operations that breaks integrity
  * of {@link Partition} and terminates the current invocation chain by
  * throwing a {@link Exception}. Those operations include when an entry
- * already exists at a DN and is added once again to the same DN.
+ * already exists at a Dn and is added once again to the same Dn.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 public class ExceptionInterceptor extends BaseInterceptor
 {
     private PartitionNexus nexus;
-    private DN subschemSubentryDn;
+    private Dn subschemSubentryDn;
 
     /**
      * A cache to store entries which are not aliases.
@@ -119,7 +119,7 @@ public class ExceptionInterceptor extend
      */
     public void add( NextInterceptor nextInterceptor, AddOperationContext addContext ) throws LdapException
     {
-        DN name = addContext.getDn();
+        Dn name = addContext.getDn();
 
         if ( subschemSubentryDn.getNormName().equals( name.getNormName() ) )
         {
@@ -134,7 +134,7 @@ public class ExceptionInterceptor extend
             throw ne;
         }
 
-        DN suffix = nexus.findSuffix( name );
+        Dn suffix = nexus.findSuffix( name );
 
         // we're adding the suffix entry so just ignore stuff to mess with the parent
         if ( suffix.equals( name ) )
@@ -143,7 +143,7 @@ public class ExceptionInterceptor extend
             return;
         }
 
-        DN parentDn = name;
+        Dn parentDn = name;
         parentDn = parentDn.remove( name.size() - 1 );
 
         // check if we're trying to add to a parent that is an alias
@@ -200,7 +200,7 @@ public class ExceptionInterceptor extend
      */
     public void delete( NextInterceptor nextInterceptor, DeleteOperationContext deleteContext ) throws LdapException
     {
-        DN dn = deleteContext.getDn();
+        Dn dn = deleteContext.getDn();
 
         if ( dn.equals( subschemSubentryDn ) )
         {
@@ -246,7 +246,7 @@ public class ExceptionInterceptor extend
      */
     public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext lookupContext ) throws LdapException
     {
-        DN dn = lookupContext.getDn();
+        Dn dn = lookupContext.getDn();
 
         if ( dn.equals( subschemSubentryDn ) )
         {
@@ -284,7 +284,7 @@ public class ExceptionInterceptor extend
 
         // Let's assume that the new modified entry may be an alias,
         // but we don't want to check that now...
-        // We will simply remove the DN from the NotAlias cache.
+        // We will simply remove the Dn from the NotAlias cache.
         // It would be smarter to check the modified attributes, but
         // it would also be more complex.
         synchronized ( notAliasCache )
@@ -304,7 +304,7 @@ public class ExceptionInterceptor extend
      */
     public void rename( NextInterceptor nextInterceptor, RenameOperationContext renameContext ) throws LdapException
     {
-        DN dn = renameContext.getDn();
+        Dn dn = renameContext.getDn();
 
         if ( dn.equals( subschemSubentryDn ) )
         {
@@ -313,7 +313,7 @@ public class ExceptionInterceptor extend
         }
 
         // check to see if target entry exists
-        DN newDn = renameContext.getNewDn();
+        Dn newDn = renameContext.getNewDn();
 
         if ( nextInterceptor.hasEntry( new EntryOperationContext( renameContext.getSession(), newDn ) ) )
         {
@@ -341,7 +341,7 @@ public class ExceptionInterceptor extend
      */
     public void move( NextInterceptor nextInterceptor, MoveOperationContext moveContext ) throws LdapException
     {
-        DN oriChildName = moveContext.getDn();
+        Dn oriChildName = moveContext.getDn();
 
         if ( oriChildName.equals( subschemSubentryDn ) )
         {
@@ -369,7 +369,7 @@ public class ExceptionInterceptor extend
     public void moveAndRename( NextInterceptor nextInterceptor, MoveAndRenameOperationContext moveAndRenameContext )
         throws LdapException
     {
-        DN oldDn = moveAndRenameContext.getDn();
+        Dn oldDn = moveAndRenameContext.getDn();
 
         // Don't allow M&R in the SSSE
         if ( oldDn.equals( subschemSubentryDn ) )
@@ -401,7 +401,7 @@ public class ExceptionInterceptor extend
      */
     private void assertHasEntry( OperationContext opContext, String msg ) throws LdapException
     {
-        DN dn = opContext.getDn();
+        Dn dn = opContext.getDn();
 
         if ( subschemSubentryDn.equals( dn ) )
         {
@@ -435,7 +435,7 @@ public class ExceptionInterceptor extend
      * @throws Exception if the entry does not exist
      * @param nextInterceptor the next interceptor in the chain
      */
-    private void assertHasEntry( OperationContext opContext, String msg, DN dn ) throws LdapException
+    private void assertHasEntry( OperationContext opContext, String msg, Dn dn ) throws LdapException
     {
         if ( subschemSubentryDn.equals( dn ) )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Sun Jan 23 01:17:06 2011
@@ -48,10 +48,10 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.name.AVA;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Ava;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.normalizers.ConcreteNameComponentNormalizer;
 import org.slf4j.Logger;
@@ -65,7 +65,7 @@ import org.slf4j.LoggerFactory;
  *
  * The Filters are also normalized.
  *
- * If the RDN AttributeTypes are not present in the entry for an Add request,
+ * If the Rdn AttributeTypes are not present in the entry for an Add request,
  * they will be added.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -120,7 +120,7 @@ public class NormalizationInterceptor ex
      */
     public void delete( NextInterceptor nextInterceptor, DeleteOperationContext deleteContext ) throws LdapException
     {
-        DN dn = deleteContext.getDn();
+        Dn dn = deleteContext.getDn();
 
         if ( !dn.isNormalized() )
         {
@@ -150,7 +150,7 @@ public class NormalizationInterceptor ex
      */
     public void rename( NextInterceptor nextInterceptor, RenameOperationContext renameContext ) throws LdapException
     {
-        // Normalize the new RDN and the DN if needed
+        // Normalize the new Rdn and the Dn if needed
 
         if ( !renameContext.getDn().isNormalized() )
         {
@@ -240,7 +240,7 @@ public class NormalizationInterceptor ex
     public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext searchContext )
         throws LdapException
     {
-        DN dn = searchContext.getDn();
+        Dn dn = searchContext.getDn();
 
         if ( !dn.isNormalized() )
         {
@@ -383,31 +383,31 @@ public class NormalizationInterceptor ex
 
 
     /**
-     * Adds missing RDN's attributes and values to the entry.
+     * Adds missing Rdn's attributes and values to the entry.
      *
-     * @param dn the DN
+     * @param dn the Dn
      * @param entry the entry
      */
-    private void addRdnAttributesToEntry( DN dn, Entry entry ) throws LdapException
+    private void addRdnAttributesToEntry( Dn dn, Entry entry ) throws LdapException
     {
         if ( dn == null || entry == null )
         {
             return;
         }
 
-        RDN rdn = dn.getRdn();
+        Rdn rdn = dn.getRdn();
 
         // Loop on all the AVAs
-        for ( AVA ava : rdn )
+        for ( Ava ava : rdn )
         {
             Value<?> value = ava.getNormValue();
             Value<?> upValue = ava.getUpValue();
             String upId = ava.getUpType();
 
-            // Check that the entry contains this AVA
+            // Check that the entry contains this Ava
             if ( !entry.contains( upId, value ) )
             {
-                String message = "The RDN '" + upId + "=" + upValue + "' is not present in the entry";
+                String message = "The Rdn '" + upId + "=" + upValue + "' is not present in the entry";
                 LOG.warn( message );
 
                 // We don't have this attribute : add it.

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Sun Jan 23 01:17:06 2011
@@ -57,9 +57,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.AVA;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Ava;
+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.UsageEnum;
 import org.apache.directory.shared.util.DateUtils;
@@ -105,11 +105,11 @@ public class OperationalAttributeInterce
         }
     };
 
-    /** The subschemasubentry DN */
-    private DN subschemaSubentryDn;
+    /** The subschemasubentry Dn */
+    private Dn subschemaSubentryDn;
 
-    /** The admin DN */
-    private DN adminDn;
+    /** The admin Dn */
+    private Dn adminDn;
 
     /**
      * Creates the operational attribute management service interceptor.
@@ -128,7 +128,7 @@ public class OperationalAttributeInterce
             SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get();
         subschemaSubentryDn = directoryService.getDNFactory().create( subschemaSubentry.getString() );
 
-        // Create the Admin DN 
+        // Create the Admin Dn
         adminDn = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN );
     }
 
@@ -457,7 +457,7 @@ public class OperationalAttributeInterce
 
     private void filter( LookupOperationContext lookupContext, Entry entry ) throws LdapException
     {
-        DN dn = lookupContext.getDn();
+        Dn dn = lookupContext.getDn();
         List<String> ids = lookupContext.getAttrsId();
 
         // still need to protect against returning op attrs when ids is null
@@ -496,7 +496,7 @@ public class OperationalAttributeInterce
 
             if ( attr != null )
             {
-                DN creatorsName = directoryService.getDNFactory().create( attr.getString() );
+                Dn creatorsName = directoryService.getDNFactory().create( attr.getString() );
 
                 attr.clear();
                 attr.add( denormalizeTypes( creatorsName ).getName() );
@@ -506,7 +506,7 @@ public class OperationalAttributeInterce
 
             if ( attr != null )
             {
-                DN modifiersName = directoryService.getDNFactory().create( attr.getString() );
+                Dn modifiersName = directoryService.getDNFactory().create( attr.getString() );
 
                 attr.clear();
                 attr.add( denormalizeTypes( modifiersName ).getName() );
@@ -516,7 +516,7 @@ public class OperationalAttributeInterce
 
             if ( attr != null )
             {
-                DN modifiersName = directoryService.getDNFactory().create( attr.getString() );
+                Dn modifiersName = directoryService.getDNFactory().create( attr.getString() );
 
                 attr.clear();
                 attr.add( denormalizeTypes( modifiersName ).getName() );
@@ -526,39 +526,39 @@ public class OperationalAttributeInterce
 
 
     /**
-     * Does not create a new DN but alters existing DN by using the first
+     * Does not create a new Dn but alters existing Dn by using the first
      * short name for an attributeType definition.
      * 
      * @param dn the normalized distinguished name
      * @return the distinuished name denormalized
      * @throws Exception if there are problems denormalizing
      */
-    public DN denormalizeTypes( DN dn ) throws LdapException
+    public Dn denormalizeTypes( Dn dn ) throws LdapException
     {
-        DN newDn = new DN();
+        Dn newDn = new Dn();
 
         for ( int ii = 0; ii < dn.size(); ii++ )
         {
-            RDN rdn = dn.getRdn( ii );
+            Rdn rdn = dn.getRdn( ii );
             if ( rdn.size() == 0 )
             {
-                newDn = newDn.add( new RDN() );
+                newDn = newDn.add( new Rdn() );
                 continue;
             }
             else if ( rdn.size() == 1 )
             {
                 String name = schemaManager.lookupAttributeTypeRegistry( rdn.getNormType() ).getName();
                 String value = rdn.getAVA().getNormValue().getString();
-                newDn = newDn.add( new RDN( name, name, value, value ) );
+                newDn = newDn.add( new Rdn( name, name, value, value ) );
                 continue;
             }
 
             // below we only process multi-valued rdns
             StringBuffer buf = new StringBuffer();
 
-            for ( Iterator<AVA> atavs = rdn.iterator(); atavs.hasNext(); /**/)
+            for ( Iterator<Ava> atavs = rdn.iterator(); atavs.hasNext(); /**/)
             {
-                AVA atav = atavs.next();
+                Ava atav = atavs.next();
                 String type = schemaManager.lookupAttributeTypeRegistry( rdn.getNormType() ).getName();
                 buf.append( type ).append( '=' ).append( atav.getNormValue() );
 
@@ -568,7 +568,7 @@ public class OperationalAttributeInterce
                 }
             }
 
-            newDn = newDn.add( new RDN( buf.toString() ) );
+            newDn = newDn.add( new Rdn( buf.toString() ) );
         }
 
         return newDn;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Sun Jan 23 01:17:06 2011
@@ -57,6 +57,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
 import org.apache.directory.server.i18n.I18n;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.name.DnUtils;
 import org.apache.directory.shared.util.exception.MultiException;
 import org.apache.directory.shared.util.exception.NotImplementedException;
@@ -90,7 +91,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
-import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.Normalizer;
 import org.apache.directory.shared.ldap.schema.UsageEnum;
@@ -147,8 +147,8 @@ public class DefaultPartitionNexus exten
 
     private String lastSyncedCtxCsn = null;
     
-    /** The cn=schema DN */
-    private DN subschemSubentryDn;
+    /** The cn=schema Dn */
+    private Dn subschemSubentryDn;
 
 
 
@@ -222,7 +222,7 @@ public class DefaultPartitionNexus exten
         OBJECT_CLASS_AT = schemaManager.getAttributeType( SchemaConstants.OBJECT_CLASS_AT );
 
         // Initialize and normalize the localy used DNs
-        DN adminDn = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN );
+        Dn adminDn = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN );
         adminDn.normalize( schemaManager );
 
         Value<?> attr = rootDSE.get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get();
@@ -301,7 +301,7 @@ public class DefaultPartitionNexus exten
         system.initialize();
 
         // Add root context entry for system partition
-        DN systemSuffixDn = directoryService.getDNFactory().create( ServerDNConstants.SYSTEM_DN );
+        Dn systemSuffixDn = directoryService.getDNFactory().create( ServerDNConstants.SYSTEM_DN );
         CoreSession adminSession = directoryService.getAdminSession();
 
         if ( !system.hasEntry( new EntryOperationContext( adminSession, systemSuffixDn ) ) )
@@ -402,7 +402,7 @@ public class DefaultPartitionNexus exten
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.PartitionNexus#setSuffix(java.lang.String)
      */
-    public void setSuffix( DN suffix )
+    public void setSuffix( Dn suffix )
     {
         throw new UnsupportedOperationException();
     }
@@ -568,11 +568,11 @@ public class DefaultPartitionNexus exten
      */
     public boolean hasEntry( EntryOperationContext hasEntryContext ) throws LdapException
     {
-        DN dn = hasEntryContext.getDn();
+        Dn dn = hasEntryContext.getDn();
 
         if ( IS_DEBUG )
         {
-            LOG.debug( "Check if DN '" + dn + "' exists." );
+            LOG.debug( "Check if Dn '" + dn + "' exists." );
         }
 
         if ( dn.isRootDSE() )
@@ -600,7 +600,7 @@ public class DefaultPartitionNexus exten
      */
     public ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
-        DN dn = lookupContext.getDn();
+        Dn dn = lookupContext.getDn();
 
         if ( dn.equals( subschemSubentryDn ) )
         {
@@ -760,7 +760,7 @@ public class DefaultPartitionNexus exten
         // return nothing
         if ( noAttribute )
         {
-            Entry serverEntry = new DefaultEntry( schemaManager, DN.EMPTY_DN );
+            Entry serverEntry = new DefaultEntry( schemaManager, Dn.EMPTY_DN );
             return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( serverEntry ), searchContext );
         }
 
@@ -771,7 +771,7 @@ public class DefaultPartitionNexus exten
             return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( rootDSE ), searchContext );
         }
 
-        Entry serverEntry = new DefaultEntry( schemaManager, DN.EMPTY_DN );
+        Entry serverEntry = new DefaultEntry( schemaManager, Dn.EMPTY_DN );
 
         Entry rootDSE = getRootDSE( new GetRootDSEOperationContext( searchContext.getSession() ) );
 
@@ -802,7 +802,7 @@ public class DefaultPartitionNexus exten
      */
     public EntryFilteringCursor search( SearchOperationContext searchContext ) throws LdapException
     {
-        DN base = searchContext.getDn();
+        Dn base = searchContext.getDn();
         SearchControls searchCtls = searchContext.getSearchControls();
         ExprNode filter = searchContext.getFilter();
 
@@ -847,7 +847,7 @@ public class DefaultPartitionNexus exten
 
                 for ( Partition partition : partitions.values() )
                 {
-                    DN contextDn = partition.getSuffix();
+                    Dn contextDn = partition.getSuffix();
                     EntryOperationContext hasEntryContext = new EntryOperationContext( null, contextDn );
                     // search only if the context entry exists
                     if( partition.hasEntry( hasEntryContext ) )
@@ -935,7 +935,7 @@ public class DefaultPartitionNexus exten
 
         synchronized ( partitionLookupTree )
         {
-            DN partitionSuffix = partition.getSuffix();
+            Dn partitionSuffix = partition.getSuffix();
 
             if ( partitionSuffix == null )
             {
@@ -962,12 +962,12 @@ public class DefaultPartitionNexus exten
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.server.core.partition.PartitionNexus#removeContextPartition(DN partitionDN)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#removeContextPartition(Dn partitionDN)
      */
-    public synchronized void removeContextPartition( DN partitionDn )
+    public synchronized void removeContextPartition( Dn partitionDn )
         throws LdapException
     {
-        // Get the Partition name. It's a DN.
+        // Get the Partition name. It's a Dn.
         String key = partitionDn.getNormName();
 
         // Retrieve this partition from the aprtition's table
@@ -1025,9 +1025,9 @@ public class DefaultPartitionNexus exten
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.server.core.partition.PartitionNexus#getPartition(org.apache.directory.shared.ldap.name.DN)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#getPartition(org.apache.directory.shared.ldap.name.Dn)
      */
-    public Partition getPartition( DN dn ) throws LdapException
+    public Partition getPartition( Dn dn ) throws LdapException
     {
         Partition parent = partitionLookupTree.getElement( dn );
 
@@ -1045,7 +1045,7 @@ public class DefaultPartitionNexus exten
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.PartitionNexus#getSuffix(org.apache.directory.server.core.interceptor.context.GetSuffixOperationContext)
      */
-    public DN findSuffix( DN dn ) throws LdapException
+    public Dn findSuffix( Dn dn ) throws LdapException
     {
         Partition backend = getPartition( dn );
 
@@ -1053,7 +1053,7 @@ public class DefaultPartitionNexus exten
     }
 
 
-    public DN getSuffix()
+    public Dn getSuffix()
     {
         return null;
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/PreferencesUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/PreferencesUtils.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/PreferencesUtils.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/PreferencesUtils.java Sun Jan 23 01:17:06 2011
@@ -22,7 +22,7 @@ package org.apache.directory.server.core
  
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -40,9 +40,9 @@ class PreferencesUtils
      * @return the distinguished name of the entry representing the system preferences node
      * @throws LdapInvalidDnException if there are namespace problems while translating the path
      */
-    public static DN toSysDn( String absPrefPath ) throws LdapInvalidDnException
+    public static Dn toSysDn( String absPrefPath ) throws LdapInvalidDnException
     {
-        DN dn = new DN( ServerDNConstants.SYSPREFROOT_SYSTEM_DN );
+        Dn dn = new Dn( ServerDNConstants.SYSPREFROOT_SYSTEM_DN );
 
         String[] comps = absPrefPath.split( "/" );
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java Sun Jan 23 01:17:06 2011
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 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.util.PreferencesDictionary;
 
@@ -66,7 +66,7 @@ public class ServerSystemPreferences ext
     /** maps changes based on key: key->list of mods (on same key) */
     private HashMap<String, List<Modification>> keyToChange = new HashMap<String, List<Modification>>( 3 );
     
-    private DN dn;
+    private Dn dn;
     
     private DirectoryService directoryService;
     
@@ -112,7 +112,7 @@ public class ServerSystemPreferences ext
         super( parent, name );
 
         this.directoryService = parent.directoryService;
-        DN parentDn = ( ( ServerSystemPreferences ) parent() ).dn;
+        Dn parentDn = ( ( ServerSystemPreferences ) parent() ).dn;
         try
         {
             dn = directoryService.getDNFactory().create( "prefNodeName=" + name + "," + parentDn.getName() );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Sun Jan 23 01:17:06 2011
@@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.LdapURL;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -67,8 +67,8 @@ public class ReferralInterceptor extends
     /** The referralManager */
     private ReferralManager referralManager;
 
-    /** A normalized form for the SubschemaSubentry DN */
-    private DN subschemaSubentryDn;
+    /** A normalized form for the SubschemaSubentry Dn */
+    private Dn subschemaSubentryDn;
 
     static private void checkRefAttributeValue( Value<?> value ) throws LdapException, LdapURLEncodingException
     {
@@ -83,7 +83,7 @@ public class ReferralInterceptor extends
         // - we don't have filters
         // - we don't have attribute description list
         // - we don't have extensions
-        // - the DN is not empty
+        // - the Dn is not empty
 
         if ( ldapUrl.getScope() != SearchScope.OBJECT )
         {
@@ -123,7 +123,7 @@ public class ReferralInterceptor extends
             throw new LdapException( message );
         }
 
-        DN dn = ldapUrl.getDn();
+        Dn dn = ldapUrl.getDn();
 
         if ( ( dn == null ) || dn.isEmpty() )
         {
@@ -286,7 +286,7 @@ public class ReferralInterceptor extends
      **/
     public void move( NextInterceptor next, MoveOperationContext moveContext ) throws LdapException
     {
-        DN newDn = moveContext.getNewDn();
+        Dn newDn = moveContext.getNewDn();
 
         // Check if the entry is a referral itself
         boolean isReferral = isReferral( moveContext.getOriginalEntry() );
@@ -364,7 +364,7 @@ public class ReferralInterceptor extends
      */
     public void modify( NextInterceptor next, ModifyOperationContext modifyContext ) throws LdapException
     {
-        DN dn = modifyContext.getDn();
+        Dn dn = modifyContext.getDn();
 
         // handle a normal modify without following referrals
         next.modify( modifyContext );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/replication/SimpleReplicaConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/replication/SimpleReplicaConnection.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/replication/SimpleReplicaConnection.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/replication/SimpleReplicaConnection.java Sun Jan 23 01:17:06 2011
@@ -19,7 +19,7 @@
  */
 package org.apache.directory.server.core.replication;
 
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -31,8 +31,8 @@ import org.apache.directory.shared.ldap.
  */
 public abstract class SimpleReplicaConnection extends ReplicaConnection
 {
-    /** The DN to use to bind to the remote server */
-    private DN principal;
+    /** The Dn to use to bind to the remote server */
+    private Dn principal;
 
     /** The password */
     private String credentials;
@@ -40,7 +40,7 @@ public abstract class SimpleReplicaConne
     /**
      * @return the principal
      */
-    public DN getPrincipal()
+    public Dn getPrincipal()
     {
         return principal;
     }
@@ -48,7 +48,7 @@ public abstract class SimpleReplicaConne
     /**
      * @param principal the principal to set
      */
-    public void setPrincipal( DN principal )
+    public void setPrincipal( Dn principal )
     {
         this.principal = principal;
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.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.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 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.DITContentRule;
 import org.apache.directory.shared.ldap.schema.DITStructureRule;
@@ -65,7 +65,7 @@ public class DefaultSchemaService implem
     private SchemaPartition schemaPartition;
 
     /** the normalized name for the schema modification attributes */
-    private DN schemaModificationAttributesDN;
+    private Dn schemaModificationAttributesDn;
     
     /** A lock to avid concurrent generation of the SubschemaSubentry */
     private Object schemaSubentrLock = new Object();
@@ -81,7 +81,7 @@ public class DefaultSchemaService implem
     /**
      * {@inheritDoc}
      */
-    public boolean isSchemaSubentry( DN dn ) throws LdapException
+    public boolean isSchemaSubentry( Dn dn ) throws LdapException
     {
         return dn.getNormName().equals( ServerDNConstants.CN_SCHEMA_DN_NORMALIZED );
     }
@@ -276,7 +276,7 @@ public class DefaultSchemaService implem
             ApacheSchemaConstants.APACHE_SUBSCHEMA_OC
             );
 
-        // add the cn attribute as required for the RDN
+        // add the cn attribute as required for the Rdn
         attrs.put( SchemaConstants.CN_AT, "schema" );
 
         // generate all the other operational attributes
@@ -342,7 +342,7 @@ public class DefaultSchemaService implem
             if ( schemaSubentry == null )
             {
                 generateSchemaSubentry( schemaPartition.lookup(
-                        new LookupOperationContext( null, schemaModificationAttributesDN ) ) );
+                        new LookupOperationContext( null, schemaModificationAttributesDn) ) );
             }
     
             return ( Entry ) schemaSubentry.clone();
@@ -359,7 +359,7 @@ public class DefaultSchemaService implem
     {
         try
         {
-            schemaModificationAttributesDN = new DN( ServerDNConstants.SCHEMA_MODIFICATIONS_DN, getSchemaManager() );
+            schemaModificationAttributesDn = new Dn( ServerDNConstants.SCHEMA_MODIFICATIONS_DN, getSchemaManager() );
         }
         catch ( LdapException e )
         {
@@ -376,7 +376,7 @@ public class DefaultSchemaService implem
         if ( schemaSubentry == null )
         {
             generateSchemaSubentry( schemaPartition.lookup(
-                    new LookupOperationContext( null, schemaModificationAttributesDN ) ) );
+                    new LookupOperationContext( null, schemaModificationAttributesDn) ) );
         }
 
         return ( Entry ) schemaSubentry.clone();
@@ -394,7 +394,7 @@ public class DefaultSchemaService implem
         }
 
         Set<String> setOids = new HashSet<String>();
-        Entry attrs = new DefaultEntry( getSchemaManager(), DN.EMPTY_DN );
+        Entry attrs = new DefaultEntry( getSchemaManager(), Dn.EMPTY_DN );
         boolean returnAllOperationalAttributes = false;
 
         synchronized( lock )
@@ -405,7 +405,7 @@ public class DefaultSchemaService implem
 
             Entry mods = 
                 schemaPartition.lookup( 
-                    new LookupOperationContext( null, schemaModificationAttributesDN ) );
+                    new LookupOperationContext( null, schemaModificationAttributesDn) );
             
 // @todo enable this optimization at some point but for now it
 // is causing some problems so I will just turn it off
@@ -546,7 +546,7 @@ public class DefaultSchemaService implem
                 addAttribute( attrs, SchemaConstants.OBJECT_CLASS_AT );
             }
 
-            // add the cn attribute as required for the RDN
+            // add the cn attribute as required for the Rdn
             if ( setOids.contains( SchemaConstants.ALL_USER_ATTRIBUTES ) ||
                  setOids.contains( SchemaConstants.CN_AT_OID ) ||
                  setOids.size() == minSetSize )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Sun Jan 23 01:17:06 2011
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -88,7 +88,7 @@ public class PartitionSchemaLoader exten
 
     private void initializeSchemas() throws Exception
     {
-        DN dn = new DN( SchemaConstants.OU_SCHEMA, schemaManager );
+        Dn dn = new Dn( SchemaConstants.OU_SCHEMA, schemaManager );
 
         // Check that the ou=schema entry exists
         if ( !partition.hasEntry( new EntryOperationContext( null, dn ) ) )
@@ -120,11 +120,11 @@ public class PartitionSchemaLoader exten
 
 
     /**
-     * Gets the base DN for an Schema Object
+     * Gets the base Dn for an Schema Object
      */
-    private DN getBaseDN( String path, Schema schema ) throws LdapInvalidDnException
+    private Dn getBaseDN( String path, Schema schema ) throws LdapInvalidDnException
     {
-        DN dn = new DN( schemaManager, path, "cn=" + schema.getSchemaName(), SchemaConstants.OU_SCHEMA );
+        Dn dn = new Dn( schemaManager, path, "cn=" + schema.getSchemaName(), SchemaConstants.OU_SCHEMA );
 
         return dn;
     }
@@ -259,7 +259,7 @@ public class PartitionSchemaLoader exten
 
         for ( Schema schema : schemas )
         {
-            DN dn = getBaseDN( SchemaConstants.ATTRIBUTES_TYPE_PATH, schema );
+            Dn dn = getBaseDN( SchemaConstants.ATTRIBUTES_TYPE_PATH, schema );
 
             // Check that we don't have an entry in the Dit for this schema
             if ( !partition.hasEntry( new EntryOperationContext( null, dn ) ) )
@@ -306,7 +306,7 @@ public class PartitionSchemaLoader exten
 
         for ( Schema schema : schemas )
         {
-            DN dn = getBaseDN( SchemaConstants.COMPARATORS_PATH, schema );
+            Dn dn = getBaseDN( SchemaConstants.COMPARATORS_PATH, schema );
 
             if ( !partition.hasEntry( new EntryOperationContext( null, dn ) ) )
             {
@@ -374,7 +374,7 @@ public class PartitionSchemaLoader exten
 
         for ( Schema schema : schemas )
         {
-            DN dn = getBaseDN( SchemaConstants.MATCHING_RULES_PATH, schema );
+            Dn dn = getBaseDN( SchemaConstants.MATCHING_RULES_PATH, schema );
 
             if ( !partition.hasEntry( new EntryOperationContext( null, dn ) ) )
             {
@@ -442,7 +442,7 @@ public class PartitionSchemaLoader exten
 
         for ( Schema schema : schemas )
         {
-            DN dn = getBaseDN( SchemaConstants.NORMALIZERS_PATH, schema );
+            Dn dn = getBaseDN( SchemaConstants.NORMALIZERS_PATH, schema );
 
             if ( !partition.hasEntry( new EntryOperationContext( null, dn ) ) )
             {
@@ -486,7 +486,7 @@ public class PartitionSchemaLoader exten
 
         for ( Schema schema : schemas )
         {
-            DN dn = getBaseDN( SchemaConstants.OBJECT_CLASSES_PATH, schema );
+            Dn dn = getBaseDN( SchemaConstants.OBJECT_CLASSES_PATH, schema );
 
             if ( !partition.hasEntry( new EntryOperationContext( null, dn ) ) )
             {
@@ -530,7 +530,7 @@ public class PartitionSchemaLoader exten
 
         for ( Schema schema : schemas )
         {
-            DN dn = getBaseDN( SchemaConstants.SYNTAXES_PATH, schema );
+            Dn dn = getBaseDN( SchemaConstants.SYNTAXES_PATH, schema );
 
             if ( !partition.hasEntry( new EntryOperationContext( null, dn ) ) )
             {
@@ -574,7 +574,7 @@ public class PartitionSchemaLoader exten
 
         for ( Schema schema : schemas )
         {
-            DN dn = getBaseDN( SchemaConstants.SYNTAX_CHECKERS_PATH, schema );
+            Dn dn = getBaseDN( SchemaConstants.SYNTAX_CHECKERS_PATH, schema );
 
             if ( !partition.hasEntry( new EntryOperationContext( null, dn ) ) )
             {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Sun Jan 23 01:17:06 2011
@@ -83,9 +83,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.SimpleNode;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.AVA;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Ava;
+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.ObjectClass;
@@ -128,24 +128,24 @@ public class SchemaInterceptor extends B
 
     private List<EntryFilter> filters = new ArrayList<EntryFilter>();
 
-    /** A normalized form for the SubschemaSubentry DN */
+    /** A normalized form for the SubschemaSubentry Dn */
     private String subschemaSubentryDnNorm;
 
-    /** The SubschemaSubentry DN */
-    private DN subschemaSubentryDn;
+    /** The SubschemaSubentry Dn */
+    private Dn subschemaSubentryDn;
 
     /**
      * the normalized name for the schema modification attributes
      */
-    private DN schemaModificationAttributesDN;
+    private Dn schemaModificationAttributesDn;
 
     /** The schema manager */
     private SchemaSubentryManager schemaSubEntryManager;
 
     private SchemaService schemaService;
 
-    /** the base DN (normalized) of the schema partition */
-    private DN schemaBaseDN;
+    /** the base Dn (normalized) of the schema partition */
+    private Dn schemaBaseDn;
 
     /** A map used to store all the objectClasses superiors */
     private Map<String, List<ObjectClass>> superiors;
@@ -181,7 +181,7 @@ public class SchemaInterceptor extends B
         filters.add( binaryAttributeFilter );
         filters.add( topFilter );
 
-        schemaBaseDN = directoryService.getDNFactory().create( SchemaConstants.OU_SCHEMA );
+        schemaBaseDn = directoryService.getDNFactory().create( SchemaConstants.OU_SCHEMA );
         schemaService = directoryService.getSchemaService();
 
         // stuff for dealing with subentries (garbage for now)
@@ -190,8 +190,8 @@ public class SchemaInterceptor extends B
         subschemaSubentryDn.normalize( schemaManager );
         subschemaSubentryDnNorm = subschemaSubentryDn.getNormName();
 
-        schemaModificationAttributesDN = directoryService.getDNFactory().create( ServerDNConstants.SCHEMA_MODIFICATIONS_DN );
-        schemaModificationAttributesDN.normalize( schemaManager );
+        schemaModificationAttributesDn = directoryService.getDNFactory().create( ServerDNConstants.SCHEMA_MODIFICATIONS_DN );
+        schemaModificationAttributesDn.normalize( schemaManager );
 
         computeSuperiors();
 
@@ -636,7 +636,7 @@ public class SchemaInterceptor extends B
     public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext searchContext )
         throws LdapException
     {
-        DN base = searchContext.getDn();
+        Dn base = searchContext.getDn();
         SearchControls searchCtls = searchContext.getSearchControls();
         ExprNode filter = searchContext.getFilter();
 
@@ -738,7 +738,7 @@ public class SchemaInterceptor extends B
 
 
     /**
-     * Search for an entry, using its DN. Binary attributes and ObjectClass attribute are removed.
+     * Search for an entry, using its Dn. Binary attributes and ObjectClass attribute are removed.
      */
     public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext lookupContext ) throws LdapException
     {
@@ -931,32 +931,32 @@ public class SchemaInterceptor extends B
 
     public void rename( NextInterceptor next, RenameOperationContext renameContext ) throws LdapException
     {
-        DN oldDn = renameContext.getDn();
-        RDN newRdn = renameContext.getNewRdn();
+        Dn oldDn = renameContext.getDn();
+        Rdn newRdn = renameContext.getNewRdn();
         boolean deleteOldRn = renameContext.getDeleteOldRdn();
         Entry entry = renameContext.getEntry().getClonedEntry();
 
         /*
          *  Note: This is only a consistency checks, to the ensure that all
-         *  mandatory attributes are available after deleting the old RDN.
+         *  mandatory attributes are available after deleting the old Rdn.
          *  The real modification is done in the XdbmStore class.
          *  - TODO: this check is missing in the moveAndRename() method
          */
         if ( deleteOldRn )
         {
-            RDN oldRDN = oldDn.getRdn();
+            Rdn oldRdn = oldDn.getRdn();
 
-            // Delete the old RDN means we remove some attributes and values.
+            // Delete the old Rdn means we remove some attributes and values.
             // We must make sure that after this operation all must attributes
             // are still present in the entry.
-            for ( AVA atav : oldRDN )
+            for ( Ava atav : oldRdn)
             {
                 AttributeType type = schemaManager.lookupAttributeTypeRegistry( atav.getUpType() );
                 entry.remove( type, atav.getUpValue() );
             }
 
             // Check that no operational attributes are removed
-            for ( AVA atav : oldRDN )
+            for ( Ava atav : oldRdn)
             {
                 AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( atav.getUpType() );
 
@@ -967,7 +967,7 @@ public class SchemaInterceptor extends B
             }
         }
 
-        for ( AVA atav : newRdn )
+        for ( Ava atav : newRdn )
         {
             AttributeType type = schemaManager.lookupAttributeTypeRegistry( atav.getUpType() );
 
@@ -977,7 +977,7 @@ public class SchemaInterceptor extends B
             }
         }
 
-        // Substitute the RDN and check if the new entry is correct
+        // Substitute the Rdn and check if the new entry is correct
         entry.setDn( renameContext.getNewDn() );
 
         check( renameContext.getNewDn(), entry );
@@ -1008,7 +1008,7 @@ public class SchemaInterceptor extends B
     /**
      * Modify an entry, applying the given modifications, and check if it's OK
      */
-    private void checkModifyEntry( DN dn, Entry currentEntry, List<Modification> mods ) throws LdapException
+    private void checkModifyEntry( Dn dn, Entry currentEntry, List<Modification> mods ) throws LdapException
     {
         // The first step is to check that the modifications are valid :
         // - the ATs are present in the schema
@@ -1177,7 +1177,7 @@ public class SchemaInterceptor extends B
         // - all the MUST are present
         // - all the attribute are in MUST and MAY, except fo the extensibleObeject OC
         // is present
-        // - We haven't removed a part of the RDN
+        // - We haven't removed a part of the Rdn
         check( dn, tempEntry );
     }
 
@@ -1202,7 +1202,7 @@ public class SchemaInterceptor extends B
 
         // First, check that the entry is either a subschemaSubentry or a schema element.
         // This is the case if it's a child of cn=schema or ou=schema
-        DN dn = modifyContext.getDn();
+        Dn dn = modifyContext.getDn();
 
         // Gets the stored entry on which the modification must be applied
         if ( dn.equals( subschemaSubentryDn ) )
@@ -1349,7 +1349,7 @@ public class SchemaInterceptor extends B
      *
      * We also check the syntaxes
      */
-    private void check( DN dn, Entry entry ) throws LdapException
+    private void check( Dn dn, Entry entry ) throws LdapException
     {
         // ---------------------------------------------------------------
         // First, make sure all attributes are valid schema defined attributes
@@ -1480,13 +1480,13 @@ public class SchemaInterceptor extends B
      */
     public void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException
     {
-        DN name = addContext.getDn();
+        Dn name = addContext.getDn();
         Entry entry = addContext.getEntry();
 
         check( name, entry );
 
         // Special checks for the MetaSchema branch
-        if ( name.isChildOf( schemaBaseDN ) )
+        if ( name.isChildOf(schemaBaseDn) )
         {
             // get the schema name
             String schemaName = getSchemaName( name );
@@ -1538,14 +1538,14 @@ public class SchemaInterceptor extends B
     }
 
 
-    private String getSchemaName( DN dn ) throws LdapException
+    private String getSchemaName( Dn dn ) throws LdapException
     {
         if ( dn.size() < 2 )
         {
             throw new LdapException( I18n.err( I18n.ERR_276 ) );
         }
 
-        RDN rdn = dn.getRdn( 1 );
+        Rdn rdn = dn.getRdn( 1 );
         return rdn.getNormValue().getString();
     }
 
@@ -1557,7 +1557,7 @@ public class SchemaInterceptor extends B
      * @return true if the objectClass values require the attribute, false otherwise
      * @throws Exception if the attribute is not recognized
      */
-    private void assertAllAttributesAllowed( DN dn, Entry entry, Set<String> allowed ) throws LdapException
+    private void assertAllAttributesAllowed( Dn dn, Entry entry, Set<String> allowed ) throws LdapException
     {
         // Never check the attributes if the extensibleObject objectClass is
         // declared for this entry
@@ -1613,7 +1613,7 @@ public class SchemaInterceptor extends B
     /**
      * Checks to see the presence of all required attributes within an entry.
      */
-    private void assertRequiredAttributesPresent( DN dn, Entry entry, Set<String> must ) throws LdapException
+    private void assertRequiredAttributesPresent( Dn dn, Entry entry, Set<String> must ) throws LdapException
     {
         for ( EntryAttribute attribute : entry )
         {
@@ -1651,7 +1651,7 @@ public class SchemaInterceptor extends B
      * inheritance tree
      * - we must have at least one STRUCTURAL OC
      */
-    private void assertObjectClasses( DN dn, List<ObjectClass> ocs ) throws LdapException
+    private void assertObjectClasses( Dn dn, List<ObjectClass> ocs ) throws LdapException
     {
         Set<ObjectClass> structuralObjectClasses = new HashSet<ObjectClass>();
 
@@ -1762,9 +1762,9 @@ public class SchemaInterceptor extends B
     }
 
 
-    private void assertRdn( DN dn, Entry entry ) throws LdapException
+    private void assertRdn( Dn dn, Entry entry ) throws LdapException
     {
-        for ( AVA atav : dn.getRdn() )
+        for ( Ava atav : dn.getRdn() )
         {
             EntryAttribute attribute = entry.get( atav.getNormType() );
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaLdifToPartitionExtractor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaLdifToPartitionExtractor.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaLdifToPartitionExtractor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaLdifToPartitionExtractor.java Sun Jan 23 01:17:06 2011
@@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.ldif.LdapLdifException;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
@@ -94,7 +94,7 @@ public class SchemaLdifToPartitionExtrac
         this.schemaManager = schemaManager;
         this.partition = partition;
 
-        DN dn = new DN( SchemaConstants.OU_SCHEMA, schemaManager );
+        Dn dn = new Dn( SchemaConstants.OU_SCHEMA, schemaManager );
         EntryOperationContext hasEntryContext = new EntryOperationContext( null, dn );
         if ( partition.hasEntry( hasEntryContext ) )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java Sun Jan 23 01:17:06 2011
@@ -37,7 +37,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.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.AttributeType;
 import org.apache.directory.shared.ldap.schema.DITContentRule;
 import org.apache.directory.shared.ldap.schema.DITStructureRule;
@@ -81,7 +81,7 @@ public class SchemaSubentryModifier
     /** The server schemaManager */
     private SchemaManager schemaManager;
 
-    /** The DN factory */
+    /** The Dn factory */
     private DNFactory dnFactory;
 
 
@@ -90,7 +90,7 @@ public class SchemaSubentryModifier
      * Creates a new instance of SchemaSubentryModifier.
      *
      * @param schemaManager The server schemaManager
-     * @param dnFactory The DN factory
+     * @param dnFactory The Dn factory
      */
     public SchemaSubentryModifier( SchemaManager schemaManager, DNFactory dnFactory )
     {
@@ -99,7 +99,7 @@ public class SchemaSubentryModifier
     }
     
     
-    private DN getDn( SchemaObject obj ) throws LdapInvalidDnException
+    private Dn getDn( SchemaObject obj ) throws LdapInvalidDnException
     {
         StringBuffer buf = new StringBuffer();
         buf.append( "m-oid=" ).append( obj.getOid() ).append( ",ou=" );
@@ -145,7 +145,7 @@ public class SchemaSubentryModifier
     public void add( OperationContext opContext, LdapComparatorDescription comparatorDescription ) throws LdapException
     {
         String schemaName = getSchema( comparatorDescription );   
-        DN dn = dnFactory.create( 
+        Dn dn = dnFactory.create(
             "m-oid=" + comparatorDescription.getOid(),
             SchemaConstants.COMPARATORS_PATH,
             "cn=" + schemaName,
@@ -160,7 +160,7 @@ public class SchemaSubentryModifier
     public void add( OperationContext opContext, NormalizerDescription normalizerDescription ) throws LdapException
     {
         String schemaName = getSchema( normalizerDescription );
-        DN dn = dnFactory.create( 
+        Dn dn = dnFactory.create(
             "m-oid=" + normalizerDescription.getOid(),
             SchemaConstants.NORMALIZERS_PATH , 
             "cn=" + schemaName,
@@ -175,7 +175,7 @@ public class SchemaSubentryModifier
     public void add( OperationContext opContext, SyntaxCheckerDescription syntaxCheckerDescription ) throws LdapException
     {
         String schemaName = getSchema( syntaxCheckerDescription );
-        DN dn = dnFactory.create( 
+        Dn dn = dnFactory.create(
             "m-oid=" + syntaxCheckerDescription.getOid(),
             SchemaConstants.SYNTAX_CHECKERS_PATH,
             "cn=" + schemaName, 
@@ -189,7 +189,7 @@ public class SchemaSubentryModifier
     public void addSchemaObject( OperationContext opContext, SchemaObject obj ) throws LdapException
     {
         Schema schema = schemaManager.getLoadedSchema( obj.getSchemaName() );
-        DN dn = getDn( obj );
+        Dn dn = getDn( obj );
         Entry entry = factory.getAttributes( obj, schema, schemaManager );
         entry.setDn( dn );
 
@@ -199,7 +199,7 @@ public class SchemaSubentryModifier
 
     public void deleteSchemaObject( OperationContext opContext, SchemaObject obj ) throws LdapException
     {
-        DN dn = getDn( obj );
+        Dn dn = getDn( obj );
         opContext.delete( dn, BYPASS );
     }
 
@@ -207,7 +207,7 @@ public class SchemaSubentryModifier
     public void delete( OperationContext opContext, NormalizerDescription normalizerDescription ) throws LdapException
     {
         String schemaName = getSchema( normalizerDescription );
-        DN dn = dnFactory.create( 
+        Dn dn = dnFactory.create(
             "m-oid=" + normalizerDescription.getOid(),
             SchemaConstants.NORMALIZERS_PATH,
             "cn=" + schemaName, 
@@ -220,7 +220,7 @@ public class SchemaSubentryModifier
     public void delete( OperationContext opContext, SyntaxCheckerDescription syntaxCheckerDescription ) throws LdapException
     {
         String schemaName = getSchema( syntaxCheckerDescription );
-        DN dn = dnFactory.create( 
+        Dn dn = dnFactory.create(
             "m-oid=" + syntaxCheckerDescription.getOid(), 
             SchemaConstants.SYNTAX_CHECKERS_PATH,
             "cn=" + schemaName,
@@ -232,7 +232,7 @@ public class SchemaSubentryModifier
     public void delete( OperationContext opContext, LdapComparatorDescription comparatorDescription ) throws LdapException
     {
         String schemaName = getSchema( comparatorDescription );
-        DN dn = dnFactory.create( 
+        Dn dn = dnFactory.create(
             "m-oid=" + comparatorDescription.getOid(),
             SchemaConstants.COMPARATORS_PATH,
             "cn=" + schemaName,
@@ -242,7 +242,7 @@ public class SchemaSubentryModifier
     }
 
 
-    private Entry getEntry( DN dn, LdapComparatorDescription comparatorDescription )
+    private Entry getEntry( Dn dn, LdapComparatorDescription comparatorDescription )
     {
         Entry entry = new DefaultEntry( schemaManager, dn );
         
@@ -269,7 +269,7 @@ public class SchemaSubentryModifier
     }
 
 
-    private Entry getEntry( DN dn, NormalizerDescription normalizerDescription )
+    private Entry getEntry( Dn dn, NormalizerDescription normalizerDescription )
     {
         Entry entry = new DefaultEntry( schemaManager, dn );
 
@@ -307,7 +307,7 @@ public class SchemaSubentryModifier
     }
     
     
-    private Entry getEntry( DN dn, SyntaxCheckerDescription syntaxCheckerDescription )
+    private Entry getEntry( Dn dn, SyntaxCheckerDescription syntaxCheckerDescription )
     {
         Entry entry = new DefaultEntry( schemaManager, dn );
         

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java Sun Jan 23 01:17:06 2011
@@ -44,7 +44,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.util.SingletonEnumeration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -78,7 +78,7 @@ public class CoreKeyStoreSpi extends Key
 
     private Entry getTlsEntry() throws Exception
     {
-        DN adminDn = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN );
+        Dn adminDn = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN );
         LdapPrincipal principal = new LdapPrincipal( adminDn, AuthenticationLevel.SIMPLE );
         CoreSession session = directoryService.getSession( principal );
         return session.lookup( adminDn );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java Sun Jan 23 01:17:06 2011
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
  * A class loader that loads classes from an LDAP DIT.
  * 
  * <p>
- * This loader looks for an configuration entry whose DN is
+ * This loader looks for an configuration entry whose Dn is
  * determined by defaultSearchContextsConfig variable. If there is such
  * an entry it gets the search contexts from the entry and searches the 
  * class to be loaded in those contexts.
@@ -63,7 +63,7 @@ public class LdapClassLoader extends Cla
     private static final Logger LOG = LoggerFactory.getLogger( LdapClassLoader.class );
     public static final String DEFAULT_SEARCH_CONTEXTS_CONFIG = "cn=classLoaderDefaultSearchContext,ou=configuration,ou=system";
     
-    private DN defaultSearchDn;
+    private Dn defaultSearchDn;
     private DirectoryService directoryService;
 
     /** A storage for the ObjectClass attributeType */
@@ -80,7 +80,7 @@ public class LdapClassLoader extends Cla
     }
 
     
-    private byte[] findClassInDIT( List<DN> searchContexts, String name ) throws ClassNotFoundException
+    private byte[] findClassInDIT( List<Dn> searchContexts, String name ) throws ClassNotFoundException
     {
         // Set up the search filter
         BranchNode filter = new AndNode( );
@@ -91,7 +91,7 @@ public class LdapClassLoader extends Cla
         
         try
         {
-            for ( DN base : searchContexts )
+            for ( Dn base : searchContexts )
             {
                 EntryFilteringCursor cursor = null;
                 try
@@ -157,12 +157,12 @@ public class LdapClassLoader extends Cla
             
             if ( configEntry != null )
             {
-                List<DN> searchContexts = new ArrayList<DN>();
+                List<Dn> searchContexts = new ArrayList<Dn>();
                 EntryAttribute attr = configEntry.get( "classLoaderDefaultSearchContext" );
                 
                 for ( Value<?> val : attr )
                 {
-                    DN dn = directoryService.getDNFactory().create( val.getString() );
+                    Dn dn = directoryService.getDNFactory().create( val.getString() );
                     searchContexts.add( dn );
                 }
                 
@@ -180,13 +180,13 @@ public class LdapClassLoader extends Cla
             
             if ( classBytes == null )
             {
-                List<DN> namingContexts = new ArrayList<DN>();
+                List<Dn> namingContexts = new ArrayList<Dn>();
                 
                 Set<String> suffixes = directoryService.getPartitionNexus().listSuffixes();
 
                 for ( String suffix:suffixes )
                 {
-                    DN dn = directoryService.getDNFactory().create( suffix );
+                    Dn dn = directoryService.getDNFactory().create( suffix );
                     namingContexts.add( dn );
                 }
                 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java Sun Jan 23 01:17:06 2011
@@ -38,7 +38,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.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;
 
@@ -89,7 +89,7 @@ public class StoredProcExecutionManager
         AttributeType storeProcUnitNamAT = session.getDirectoryService()
             .getSchemaManager().lookupAttributeTypeRegistry( "storedProcUnitName" );
         ExprNode filter = new EqualityNode<String>( storeProcUnitNamAT, new StringValue( storeProcUnitNamAT, spUnitName ) );
-        DN dn = session.getDirectoryService().getDNFactory().create( storedProcContainer );
+        Dn dn = session.getDirectoryService().getDNFactory().create( storedProcContainer );
         EntryFilteringCursor results = session.search( dn, SearchScope.SUBTREE, filter, 
             AliasDerefMode.DEREF_ALWAYS, EMPTY_ATTRIBS );
         if ( results.first() )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java Sun Jan 23 01:17:06 2011
@@ -106,7 +106,7 @@ public class RefinementLeafEvaluator
             throw new IllegalArgumentException( I18n.err( I18n.ERR_304 ) );
         }
 
-        // check if AVA value exists in attribute
+        // check if Ava value exists in attribute
         // If the filter value for the objectClass is an OID we need to resolve a name
         String value = node.getValue().getString();
 



Mime
View raw message