directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1062306 [18/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/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Sun Jan 23 01:17:06 2011
@@ -124,8 +124,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.extended.nod.ModifyDnNoDResponse;
 import org.apache.directory.shared.ldap.message.extended.nod.ModifyNoDResponse;
 import org.apache.directory.shared.ldap.message.extended.nod.SearchNoDResponse;
-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.ObjectClass;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -937,7 +937,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public BindResponse bind( DN name, String credentials ) throws LdapException, IOException
+    public BindResponse bind( Dn name, String credentials ) throws LdapException, IOException
     {
         LOG.debug( "Bind request : {}", name );
 
@@ -951,7 +951,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public BindFuture bindAsync( DN name, String credentials ) throws LdapException, IOException
+    public BindFuture bindAsync( Dn name, String credentials ) throws LdapException, IOException
     {
         LOG.debug( "Bind request : {}", name );
 
@@ -1047,7 +1047,7 @@ public class LdapNetworkConnection exten
     /**
      * Create a Simple BindRequest ready to be sent.
      */
-    private BindRequest createBindRequest( DN name, byte[] credentials ) throws LdapException
+    private BindRequest createBindRequest( Dn name, byte[] credentials ) throws LdapException
     {
         return createBindRequest( name, credentials, null, ( Control[] ) null );
     }
@@ -1062,7 +1062,7 @@ public class LdapNetworkConnection exten
         // Set the name
         try
         {
-            DN dn = new DN( name );
+            Dn dn = new Dn( name );
 
             return createBindRequest( dn, credentials, saslMechanism, controls );
         }
@@ -1081,7 +1081,7 @@ public class LdapNetworkConnection exten
     /**
      * Create a complete BindRequest ready to be sent.
      */
-    private BindRequest createBindRequest( DN name, byte[] credentials, String saslMechanism, Control... controls )
+    private BindRequest createBindRequest( Dn name, byte[] credentials, String saslMechanism, Control... controls )
         throws LdapException
     {
         // Set the new messageId
@@ -1161,7 +1161,7 @@ public class LdapNetworkConnection exten
     /**
      * Bind using CRAM-MD5 SASL mechanism.
      *
-     * @param name the DN of the user
+     * @param name the Dn of the user
      * @param credentials password of the user
      * @param authzId the authorization ID (can be null)
      * @return response of the bind operation
@@ -1179,7 +1179,7 @@ public class LdapNetworkConnection exten
     /**
      * Bind using CRAM-MD5 SASL mechanism.
      *
-     * @param name the DN of the user
+     * @param name the Dn of the user
      * @param credentials password of the user
      * @param authzId the authorization ID (can be null)
      * @param ctrls controls to be sent with the bind request
@@ -1211,7 +1211,7 @@ public class LdapNetworkConnection exten
     /**
      * Bind using CRAM-MD5 SASL mechanism.
      *
-     * @param name the DN of the user
+     * @param name the Dn of the user
      * @param credentials password of the user
      * @param authzId the authorization ID (can be null)
      * @return response of the bind operation
@@ -1229,7 +1229,7 @@ public class LdapNetworkConnection exten
     /**
      * Bind using DIGEST-MD5 SASL mechanism.
      *
-     * @param name the DN of the user
+     * @param name the Dn of the user
      * @param credentials password of the user
      * @param authzId the authorization ID (can be null)
      * @param realmName the SASL realm name to be used
@@ -1247,7 +1247,7 @@ public class LdapNetworkConnection exten
     /**
      * Bind using DIGEST-MD5 SASL mechanism.
      *
-     * @param name the DN of the user
+     * @param name the Dn of the user
      * @param credentials password of the user
      * @param authzId the authorization ID (can be null)
      * @param realmName the SASL realm name to be used
@@ -1281,7 +1281,7 @@ public class LdapNetworkConnection exten
     /**
      * Bind using DIGEST-MD5 SASL mechanism.
      *
-     * @param name the DN of the user
+     * @param name the Dn of the user
      * @param credentials password of the user
      * @param authzId the authorization ID (can be null)
      * @param realmName the SASL realm name to be used
@@ -1300,7 +1300,7 @@ public class LdapNetworkConnection exten
     /**
      * Bind to the LDAP server using GSSAPI SASL mechanism.
      *
-     * @param name the DN of the user entry
+     * @param name the Dn of the user entry
      * @param credentials the credentials of the user
      * @param realmName name of the kerberos realm in which the given user entry is present
      * @param kdcHost the host name of the KDC server
@@ -1322,7 +1322,7 @@ public class LdapNetworkConnection exten
     /**
      * Bind to the LDAP server using GSSAPI SASL mechanism.
      *
-     * @param name the DN of the user entry
+     * @param name the Dn of the user entry
      * @param credentials the credentials of the user
      * @param realmName name of the kerberos realm in which the given user entry is present
      * @param kdcHost the host name of the KDC server
@@ -1377,13 +1377,13 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public SearchCursor search( DN baseDn, String filter, SearchScope scope, String... attributes )
+    public SearchCursor search( Dn baseDn, String filter, SearchScope scope, String... attributes )
         throws LdapException
     {
         if ( baseDn == null )
         {
             LOG.debug( "received a null dn for a search" );
-            throw new IllegalArgumentException( "The base DN cannot be null" );
+            throw new IllegalArgumentException( "The base Dn cannot be null" );
         }
 
         // Create a new SearchRequest object
@@ -1406,14 +1406,14 @@ public class LdapNetworkConnection exten
     public SearchCursor search( String baseDn, String filter, SearchScope scope, String... attributes )
         throws LdapException
     {
-        return search( new DN( baseDn ), filter, scope, attributes );
+        return search( new Dn( baseDn ), filter, scope, attributes );
     }
 
 
     /**
      * {@inheritDoc}
      */
-    public SearchFuture searchAsync( DN baseDn, String filter, SearchScope scope, String... attributes )
+    public SearchFuture searchAsync( Dn baseDn, String filter, SearchScope scope, String... attributes )
         throws LdapException
     {
         // Create a new SearchRequest object
@@ -1436,7 +1436,7 @@ public class LdapNetworkConnection exten
     public SearchFuture searchAsync( String baseDn, String filter, SearchScope scope, String... attributes )
         throws LdapException
     {
-        return searchAsync( new DN( baseDn ), filter, scope, attributes );
+        return searchAsync( new Dn( baseDn ), filter, scope, attributes );
     }
 
 
@@ -1995,12 +1995,12 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public ModifyResponse modify( DN dn, Modification... modifications ) throws LdapException
+    public ModifyResponse modify( Dn dn, Modification... modifications ) throws LdapException
     {
         if ( dn == null )
         {
             LOG.debug( "received a null dn for modification" );
-            throw new IllegalArgumentException( "The DN to be modified cannot be null" );
+            throw new IllegalArgumentException( "The Dn to be modified cannot be null" );
         }
 
         if ( ( modifications == null ) || ( modifications.length == 0 ) )
@@ -2027,7 +2027,7 @@ public class LdapNetworkConnection exten
      */
     public ModifyResponse modify( String dn, Modification... modifications ) throws LdapException
     {
-        return modify( new DN( dn ), modifications );
+        return modify( new Dn( dn ), modifications );
     }
 
 
@@ -2157,7 +2157,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public ModifyDnResponse rename( DN entryDn, RDN newRdn ) throws LdapException
+    public ModifyDnResponse rename( Dn entryDn, Rdn newRdn ) throws LdapException
     {
         return rename( entryDn, newRdn, true );
     }
@@ -2170,21 +2170,21 @@ public class LdapNetworkConnection exten
     {
         if ( entryDn == null )
         {
-            String msg = "Cannot process a rename of a null DN";
+            String msg = "Cannot process a rename of a null Dn";
             LOG.debug( msg );
             throw new IllegalArgumentException( msg );
         }
 
         if ( newRdn == null )
         {
-            String msg = "Cannot process a rename with a null RDN";
+            String msg = "Cannot process a rename with a null Rdn";
             LOG.debug( msg );
             throw new IllegalArgumentException( msg );
         }
 
         try
         {
-            return rename( new DN( entryDn ), new RDN( newRdn ), deleteOldRdn );
+            return rename( new Dn( entryDn ), new Rdn( newRdn ), deleteOldRdn );
         }
         catch ( LdapInvalidDnException e )
         {
@@ -2197,18 +2197,18 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public ModifyDnResponse rename( DN entryDn, RDN newRdn, boolean deleteOldRdn ) throws LdapException
+    public ModifyDnResponse rename( Dn entryDn, Rdn newRdn, boolean deleteOldRdn ) throws LdapException
     {
         if ( entryDn == null )
         {
-            String msg = "Cannot process a rename of a null DN";
+            String msg = "Cannot process a rename of a null Dn";
             LOG.debug( msg );
             throw new IllegalArgumentException( msg );
         }
 
         if ( newRdn == null )
         {
-            String msg = "Cannot process a rename with a null RDN";
+            String msg = "Cannot process a rename with a null Rdn";
             LOG.debug( msg );
             throw new IllegalArgumentException( msg );
         }
@@ -2229,21 +2229,21 @@ public class LdapNetworkConnection exten
     {
         if ( entryDn == null )
         {
-            String msg = "Cannot process a move of a null DN";
+            String msg = "Cannot process a move of a null Dn";
             LOG.debug( msg );
             throw new IllegalArgumentException( msg );
         }
 
         if ( newSuperiorDn == null )
         {
-            String msg = "Cannot process a move to a null DN";
+            String msg = "Cannot process a move to a null Dn";
             LOG.debug( msg );
             throw new IllegalArgumentException( msg );
         }
 
         try
         {
-            return move( new DN( entryDn ), new DN( newSuperiorDn ) );
+            return move( new Dn( entryDn ), new Dn( newSuperiorDn ) );
         }
         catch ( LdapInvalidDnException e )
         {
@@ -2256,18 +2256,18 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public ModifyDnResponse move( DN entryDn, DN newSuperiorDn ) throws LdapException
+    public ModifyDnResponse move( Dn entryDn, Dn newSuperiorDn ) throws LdapException
     {
         if ( entryDn == null )
         {
-            String msg = "Cannot process a move of a null DN";
+            String msg = "Cannot process a move of a null Dn";
             LOG.debug( msg );
             throw new IllegalArgumentException( msg );
         }
 
         if ( newSuperiorDn == null )
         {
-            String msg = "Cannot process a move to a null DN";
+            String msg = "Cannot process a move to a null Dn";
             LOG.debug( msg );
             throw new IllegalArgumentException( msg );
         }
@@ -2286,7 +2286,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public ModifyDnResponse moveAndRename( DN entryDn, DN newDn ) throws LdapException
+    public ModifyDnResponse moveAndRename( Dn entryDn, Dn newDn ) throws LdapException
     {
         return moveAndRename( entryDn, newDn, true );
     }
@@ -2297,19 +2297,19 @@ public class LdapNetworkConnection exten
      */
     public ModifyDnResponse moveAndRename( String entryDn, String newDn ) throws LdapException
     {
-        return moveAndRename( new DN( entryDn ), new DN( newDn ), true );
+        return moveAndRename( new Dn( entryDn ), new Dn( newDn ), true );
     }
 
 
     /**
      * {@inheritDoc}
      */
-    public ModifyDnResponse moveAndRename( DN entryDn, DN newDn, boolean deleteOldRdn ) throws LdapException
+    public ModifyDnResponse moveAndRename( Dn entryDn, Dn newDn, boolean deleteOldRdn ) throws LdapException
     {
         // Check the parameters first
         if ( entryDn == null )
         {
-            throw new IllegalArgumentException( "The entry DN must not be null" );
+            throw new IllegalArgumentException( "The entry Dn must not be null" );
         }
 
         if ( entryDn.isRootDSE() )
@@ -2319,7 +2319,7 @@ public class LdapNetworkConnection exten
 
         if ( newDn == null )
         {
-            throw new IllegalArgumentException( "The new DN must not be null" );
+            throw new IllegalArgumentException( "The new Dn must not be null" );
         }
 
         if ( newDn.isRootDSE() )
@@ -2343,7 +2343,7 @@ public class LdapNetworkConnection exten
      */
     public ModifyDnResponse moveAndRename( String entryDn, String newDn, boolean deleteOldRdn ) throws LdapException
     {
-        return moveAndRename( new DN( entryDn ), new DN( newDn ), true );
+        return moveAndRename( new Dn( entryDn ), new Dn( newDn ), true );
     }
 
 
@@ -2460,14 +2460,14 @@ public class LdapNetworkConnection exten
      */
     public DeleteResponse delete( String dn ) throws LdapException
     {
-        return delete( new DN( dn ) );
+        return delete( new Dn( dn ) );
     }
 
 
     /**
      * {@inheritDoc}
      */
-    public DeleteResponse delete( DN dn ) throws LdapException
+    public DeleteResponse delete( Dn dn ) throws LdapException
     {
         DeleteRequest deleteRequest = new DeleteRequestImpl();
         deleteRequest.setName( dn );
@@ -2477,13 +2477,13 @@ public class LdapNetworkConnection exten
 
 
     /**
-     * deletes the entry with the given DN, and all its children
+     * deletes the entry with the given Dn, and all its children
      *
-     * @param dn the target entry's DN
+     * @param dn the target entry's Dn
      * @return operation's response
-     * @throws LdapException If the DN is not valid or if the deletion failed
+     * @throws LdapException If the Dn is not valid or if the deletion failed
      */
-    public DeleteResponse deleteTree( DN dn ) throws LdapException
+    public DeleteResponse deleteTree( Dn dn ) throws LdapException
     {
         String treeDeleteOid = "1.2.840.113556.1.4.805";
 
@@ -2505,18 +2505,18 @@ public class LdapNetworkConnection exten
 
 
     /**
-     * deletes the entry with the given DN, and all its children
+     * deletes the entry with the given Dn, and all its children
      *
-     * @param dn the target entry's DN as a String
+     * @param dn the target entry's Dn as a String
      * @return operation's response
-     * @throws LdapException If the DN is not valid or if the deletion failed
+     * @throws LdapException If the Dn is not valid or if the deletion failed
      */
     public DeleteResponse deleteTree( String dn ) throws LdapException
     {
         try
         {
             String treeDeleteOid = "1.2.840.113556.1.4.805";
-            DN newDn = new DN( dn );
+            Dn newDn = new Dn( dn );
 
             if ( isControlSupported( treeDeleteOid ) )
             {
@@ -2655,7 +2655,7 @@ public class LdapNetworkConnection exten
      */
     public CompareResponse compare( String dn, String attributeName, String value ) throws LdapException
     {
-        return compare( new DN( dn ), attributeName, value );
+        return compare( new Dn( dn ), attributeName, value );
     }
 
 
@@ -2664,7 +2664,7 @@ public class LdapNetworkConnection exten
      */
     public CompareResponse compare( String dn, String attributeName, byte[] value ) throws LdapException
     {
-        return compare( new DN( dn ), attributeName, value );
+        return compare( new Dn( dn ), attributeName, value );
     }
 
 
@@ -2673,14 +2673,14 @@ public class LdapNetworkConnection exten
      */
     public CompareResponse compare( String dn, String attributeName, Value<?> value ) throws LdapException
     {
-        return compare( new DN( dn ), attributeName, value );
+        return compare( new Dn( dn ), attributeName, value );
     }
 
 
     /**
      * {@inheritDoc}
      */
-    public CompareResponse compare( DN dn, String attributeName, String value ) throws LdapException
+    public CompareResponse compare( Dn dn, String attributeName, String value ) throws LdapException
     {
         CompareRequest compareRequest = new CompareRequestImpl();
         compareRequest.setName( dn );
@@ -2694,7 +2694,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public CompareResponse compare( DN dn, String attributeName, byte[] value ) throws LdapException
+    public CompareResponse compare( Dn dn, String attributeName, byte[] value ) throws LdapException
     {
         CompareRequest compareRequest = new CompareRequestImpl();
         compareRequest.setName( dn );
@@ -2708,7 +2708,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public CompareResponse compare( DN dn, String attributeName, Value<?> value ) throws LdapException
+    public CompareResponse compare( Dn dn, String attributeName, Value<?> value ) throws LdapException
     {
         CompareRequest compareRequest = new CompareRequestImpl();
         compareRequest.setName( dn );
@@ -2999,14 +2999,14 @@ public class LdapNetworkConnection exten
      */
     public boolean exists( String dn ) throws LdapException
     {
-        return exists( new DN( dn ) );
+        return exists( new Dn( dn ) );
     }
 
 
     /**
      * {@inheritDoc}
      */
-    public boolean exists( DN dn ) throws LdapException
+    public boolean exists( Dn dn ) throws LdapException
     {
         try
         {
@@ -3029,7 +3029,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public Entry lookup( DN dn ) throws LdapException
+    public Entry lookup( Dn dn ) throws LdapException
     {
         return lookup( dn, SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
     }
@@ -3047,7 +3047,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public Entry lookup( DN dn, String... attributes ) throws LdapException
+    public Entry lookup( Dn dn, String... attributes ) throws LdapException
     {
         return lookup( dn, null, attributes );
     }
@@ -3056,7 +3056,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public Entry lookup( DN dn, Control[] controls, String... attributes ) throws LdapException
+    public Entry lookup( Dn dn, Control[] controls, String... attributes ) throws LdapException
     {
         Entry entry = null;
 
@@ -3105,7 +3105,7 @@ public class LdapNetworkConnection exten
      */
     public Entry lookup( String dn, String... attributes ) throws LdapException
     {
-        return lookup( new DN( dn ), null, attributes );
+        return lookup( new Dn( dn ), null, attributes );
     }
 
 
@@ -3114,7 +3114,7 @@ public class LdapNetworkConnection exten
      */
     public Entry lookup( String dn, Control[] controls, String... attributes ) throws LdapException
     {
-        return lookup( new DN( dn ), controls, attributes );
+        return lookup( new Dn( dn ), controls, attributes );
     }
 
 

Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/NetworkSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/NetworkSchemaLoader.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/NetworkSchemaLoader.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/NetworkSchemaLoader.java Sun Jan 23 01:17:06 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.Response;
 import org.apache.directory.shared.ldap.message.SearchResultEntry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.registries.AbstractSchemaLoader;
 import org.apache.directory.shared.ldap.schema.registries.Schema;
 import org.slf4j.Logger;
@@ -48,7 +48,7 @@ public class NetworkSchemaLoader extends
     /** the connection to the ldap server */
     private LdapConnection connection;
 
-    /** the schema base DN */
+    /** the schema base Dn */
     private static final String SCHEMA_BASE = "ou=schema";
 
     /** the search filter */
@@ -91,9 +91,9 @@ public class NetworkSchemaLoader extends
 
 
     /**
-     * searches with ONE LEVEL scope under the given DN and retrieves all the schema objects
+     * searches with ONE LEVEL scope under the given Dn and retrieves all the schema objects
      * 
-     * @param baseDn the DN of the schema entry under which the schema objects are present
+     * @param baseDn the Dn of the schema entry under which the schema objects are present
      *               e.x ou=attributeTypes,cn=apache,ou=schema
      * @param filter optional search filter, if null the default fileter {@link #FILTER} is used
      * @return a list of entries of the schema objects 
@@ -112,7 +112,7 @@ public class NetworkSchemaLoader extends
                 filter = FILTER;
             }
 
-            Cursor<Response> cursor = connection.search( new DN( baseDn ), filter, SearchScope.ONELEVEL, "*", "+" );
+            Cursor<Response> cursor = connection.search( new Dn( baseDn ), filter, SearchScope.ONELEVEL, "*", "+" );
 
             while ( cursor.next() )
             {

Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyDnFuture.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyDnFuture.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyDnFuture.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyDnFuture.java Sun Jan 23 01:17:06 2011
@@ -52,7 +52,7 @@ public class ModifyDnFuture extends Resp
     /**
      * Get the ModifyDnResponse, blocking until one is received.
      * 
-     * @return the modify DN response
+     * @return the modify Dn response
      * @throws InterruptedException {@inheritDoc}
      * @throws ExecutionException {@inheritDoc}
      */
@@ -69,7 +69,7 @@ public class ModifyDnFuture extends Resp
      * 
      * @param timeout {@inheritDoc}
      * @param unit {@inheritDoc}
-     * @return the modify DN response
+     * @return the modify Dn response
      * @throws InterruptedException {@inheritDoc}
      * @throws ExecutionException {@inheritDoc}
      * @throws TimeoutException {@inheritDoc}

Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SingleLdifSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SingleLdifSchemaLoader.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SingleLdifSchemaLoader.java (original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SingleLdifSchemaLoader.java Sun Jan 23 01:17:06 2011
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
 public class SingleLdifSchemaLoader extends AbstractSchemaLoader
 {
     /** 
-     * Pattern for start of schema DN. 
+     * Pattern for start of schema Dn.
      * java.util.regex.Pattern is immutable so only one instance is needed for all uses.
      */
     private static final Pattern SCHEMA_START_PATTERN = Pattern
@@ -59,7 +59,7 @@ public class SingleLdifSchemaLoader exte
     /** The logger. */
     private static final Logger LOG = LoggerFactory.getLogger( SingleLdifSchemaLoader.class );
 
-    /** The schema object RDN attribute types. */
+    /** The schema object Rdn attribute types. */
     private String[] schemaObjectTypeRdns = new String[]
         { "attributetypes", "comparators", "ditContentRules", "ditStructureRules", "matchingRules", "matchingRuleUse",
             "nameForms", "normalizers", "objectClasses", "syntaxes", "syntaxCheckers" };

Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java (original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java Sun Jan 23 01:17:06 2011
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapProtocolErrorException;
 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;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.EntityFactory;
 import org.apache.directory.shared.ldap.schema.LdapComparator;
@@ -97,7 +97,7 @@ public class DefaultSchemaManager implem
     private static final Logger LOG = LoggerFactory.getLogger( DefaultSchemaManager.class );
 
     /** The NamingContext this SchemaManager is associated with */
-    private DN namingContext;
+    private Dn namingContext;
 
     /** The global registries for this namingContext */
     private volatile Registries registries;
@@ -112,7 +112,7 @@ public class DefaultSchemaManager implem
     private final EntityFactory factory;
 
     /** the normalized name for the schema modification attributes */
-    private DN schemaModificationAttributesDN;
+    private Dn schemaModificationAttributesDn;
 
     /** A Map containing all the schema being dependent from a schema */
     private Map<String, Set<String>> schemaDependences = new HashMap<String, Set<String>>();
@@ -135,7 +135,7 @@ public class DefaultSchemaManager implem
     public DefaultSchemaManager( SchemaLoader loader )
     {
         // Default to the the root (one schemaManager for all the entries
-        namingContext = DN.EMPTY_DN;
+        namingContext = Dn.EMPTY_DN;
         this.schemaLoader = loader;
         errors = new ArrayList<Throwable>();
         registries = new Registries( this );
@@ -151,7 +151,7 @@ public class DefaultSchemaManager implem
      * @param loader The schema loader to use
      * @param namingContext The associated NamingContext
      */
-    public DefaultSchemaManager( SchemaLoader loader, DN namingContext )
+    public DefaultSchemaManager( SchemaLoader loader, Dn namingContext )
     {
         this.namingContext = namingContext;
         this.schemaLoader = loader;
@@ -1358,7 +1358,7 @@ public class DefaultSchemaManager implem
     /**
      * @return the namingContext
      */
-    public DN getNamingContext()
+    public Dn getNamingContext()
     {
         return namingContext;
     }
@@ -1373,8 +1373,8 @@ public class DefaultSchemaManager implem
     {
         try
         {
-            schemaModificationAttributesDN = new DN( SchemaConstants.SCHEMA_MODIFICATIONS_DN );
-            schemaModificationAttributesDN
+            schemaModificationAttributesDn = new Dn( SchemaConstants.SCHEMA_MODIFICATIONS_DN );
+            schemaModificationAttributesDn
                 .normalize( getRegistries().getAttributeTypeRegistry().getNormalizerMapping() );
         }
         catch ( LdapInvalidDnException e )

Modified: directory/shared/trunk/ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/pom.xml?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/pom.xml (original)
+++ directory/shared/trunk/ldap/pom.xml Sun Jan 23 01:17:06 2011
@@ -139,7 +139,6 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap</Bundle-SymbolicName>
-            <Bundle-Name>${project.name}</Bundle-Name>
             <Export-Package>org.apache.directory.shared.*</Export-Package>
           </instructions>
         </configuration>

Modified: directory/shared/trunk/ldap/src/main/antlr/ACIItem.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/ACIItem.g?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/ACIItem.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/ACIItem.g Sun Jan 23 01:17:06 2011
@@ -48,8 +48,8 @@ import org.apache.directory.shared.util.
 import org.apache.directory.shared.ldap.name.DnUtils;
 import org.apache.directory.shared.util.NoDuplicateKeysMap;
 import org.apache.directory.shared.util.OptionalComponentsMonitor;
-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.constants.SchemaConstants;
@@ -140,8 +140,8 @@ tokens
     /** The SchemaManager */
     private SchemaManager schemaManager;
     
-    private Set<DN> chopBeforeExclusions;
-    private Set<DN> chopAfterExclusions;
+    private Set<Dn> chopBeforeExclusions;
+    private Set<Dn> chopAfterExclusions;
     private SubtreeSpecificationModifier ssModifier = null;
     
     private ComponentsMonitor mainACIItemComponentsMonitor;
@@ -495,14 +495,14 @@ attributeValue
     {
         // A Dn can be considered as a set of attributeTypeAndValues
         // So, parse the set as a Dn and extract each attributeTypeAndValue
-        DN attributeTypeAndValueSetAsDn = new DN( token.getText() );
+        Dn attributeTypeAndValueSetAsDn = new Dn( token.getText() );
         
         if ( schemaManager != null )
         {        
           attributeTypeAndValueSetAsDn.normalize( schemaManager );
         }
         
-        for ( RDN rdn : attributeTypeAndValueSetAsDn )
+        for ( Rdn rdn : attributeTypeAndValueSetAsDn )
         {
             attributeTypeAndValue = rdn.getNormName();
             attributeType = DnUtils.getRdnAttribute( attributeTypeAndValue );
@@ -938,8 +938,8 @@ parentOfEntry
 name
 {
     log.debug( "entered name()" );
-    Set<DN> names = new HashSet<DN>();
-    DN distinguishedName = null;
+    Set<Dn> names = new HashSet<Dn>();
+    Dn distinguishedName = null;
 }
     :
     ID_name ( SP )+ 
@@ -961,8 +961,8 @@ name
 userGroup
 {
     log.debug( "entered userGroup()" );
-    Set<DN> userGroup = new HashSet<DN>();
-    DN distinguishedName = null;
+    Set<Dn> userGroup = new HashSet<Dn>();
+    Dn distinguishedName = null;
 }
     :
     ID_userGroup ( SP )+ 
@@ -1078,8 +1078,8 @@ subtreeSpecification returns [SubtreeSpe
     // in case something is left from the last parse
     ss = null;
     ssModifier = new SubtreeSpecificationModifier();
-    chopBeforeExclusions = new HashSet<DN>();
-    chopAfterExclusions = new HashSet<DN>();
+    chopBeforeExclusions = new HashSet<Dn>();
+    chopAfterExclusions = new HashSet<Dn>();
     subtreeSpecificationComponentsMonitor = new OptionalComponentsMonitor( 
             new String [] { "base", "specificExclusions", "minimum", "maximum" } );
 }
@@ -1124,7 +1124,7 @@ subtreeSpecificationComponent
 ss_base
 {
     log.debug( "entered ss_base()" );
-    DN base = null;
+    Dn base = null;
 }
     :
     ID_base ( SP )+ base=distinguishedName
@@ -1168,7 +1168,7 @@ specificExclusion
 chopBefore
 {
     log.debug( "entered chopBefore()" );
-    DN chopBeforeExclusion = null;
+    Dn chopBeforeExclusion = null;
 }
     :
     ID_chopBefore ( SP )* COLON ( SP )* chopBeforeExclusion=distinguishedName
@@ -1180,7 +1180,7 @@ chopBefore
 chopAfter
 {
     log.debug( "entered chopAfter()" );
-    DN chopAfterExclusion = null;
+    Dn chopAfterExclusion = null;
 }
     :
     ID_chopAfter ( SP )* COLON ( SP )* chopAfterExclusion=distinguishedName
@@ -1213,7 +1213,7 @@ ss_maximum
     }
     ;
 
-distinguishedName returns [ DN name ] 
+distinguishedName returns [ Dn name ]
 {
     log.debug( "entered distinguishedName()" );
     name = null;
@@ -1221,7 +1221,7 @@ distinguishedName returns [ DN name ] 
     :
     token:SAFEUTF8STRING
     {
-        name = new DN( token.getText() );
+        name = new Dn( token.getText() );
         if ( schemaManager != null )
         {
             name.normalize( schemaManager );

Modified: directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g Sun Jan 23 01:17:06 2011
@@ -23,7 +23,7 @@ header
 
 package org.apache.directory.shared.ldap.subtree;
 
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.LeafNode;
 import org.apache.directory.shared.ldap.filter.BranchNode;
@@ -265,7 +265,7 @@ distinguishedName
     :
     token:SAFEUTF8STRING
     {
-        new DN( token.getText() );
+        new Dn( token.getText() );
         log.debug( "recognized a DistinguishedName: " + token.getText() );
     }
     ;

Modified: directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g Sun Jan 23 01:17:06 2011
@@ -26,7 +26,7 @@ package org.apache.directory.shared.ldap
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.NormalizerMappingResolver;
 import org.apache.directory.shared.ldap.trigger.StoredProcedureOption;
 import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter;
@@ -345,7 +345,7 @@ genericStoredProcedureParameter
 ldapContextStoredProcedureParameter
 {
     log.debug( "entered ldapContextStoredProcedureParameter()" );
-    DN ldapContext = null;
+    Dn ldapContext = null;
 }
     : ID_ldapContext ( SP )+ ldapContext=distinguishedName
     { triggerStoredProcedureParameters.add( StoredProcedureParameter.Generic_LDAP_CONTEXT.instance( ldapContext ) ); }
@@ -385,7 +385,7 @@ storedProcedureSearchContextOption retur
     log.debug( "entered storedProcedureSearchContextOption()" );
     spSearchContextOption = null;
     SearchScope searchScope = SearchScope.OBJECT; // default scope
-    DN spSearchContext = null;
+    Dn spSearchContext = null;
 }
     :
     ID_searchContext ( SP )+ // FIXME: SP should not be mandatory if an OPEN_CURLY follows
@@ -406,7 +406,7 @@ storedProcedureSearchScope returns [ Sea
     | ID_scope_subtree { scope = SearchScope.SUBTREE; }
     ;
 
-storedProcedureSearchContext returns [ DN spSearchContext ]
+storedProcedureSearchContext returns [ Dn spSearchContext ]
 {
     log.debug( "entered storedProcedureSearchContext()" );
     spSearchContext = null;
@@ -425,14 +425,14 @@ fullyQualifiedStoredProcedureName return
     { spName = spNameToken.getText(); }
     ;
 
-distinguishedName returns [ DN name ] 
+distinguishedName returns [ Dn name ]
 {
     log.debug( "entered distinguishedName()" );
     name = null;
 }
     : nameToken:UTF8String
     {
-        name = new DN( nameToken.getText() );
+        name = new Dn( nameToken.getText() );
     }
     ;
     exception
@@ -505,9 +505,9 @@ tokens
     ID_newrdn = "$newrdn";
     ID_deleteoldrdn = "$deleteoldrdn";
     ID_newSuperior = "$newSuperior";
-    ID_oldRDN = "$oldRDN";
-    ID_oldSuperiorDN = "$oldSuperiorDN";
-    ID_newDN = "$newDN";
+    ID_oldRDN = "$oldRdn";
+    ID_oldSuperiorDN = "$oldSuperiorDn";
+    ID_newDN = "$newDn";
     
     // generic parameters
     ID_ldapContext = "$ldapcontext";

Modified: directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g Sun Jan 23 01:17:06 2011
@@ -36,7 +36,7 @@ import org.apache.directory.shared.util.
 }
 
 /**
- * An antlr generated DN lexer.
+ * An antlr generated Dn lexer.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -120,7 +120,7 @@ LUTF1_REST : 
 
 
 /**
- * An antlr generated DN parser.
+ * An antlr generated Dn parser.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -152,7 +152,7 @@ options    {
 }
 
     /**
-     * Parses an DN string.
+     * Parses an Dn string.
      *
      * RFC 4514, Section 3
      * distinguishedName = [ relativeDistinguishedName
@@ -172,17 +172,17 @@ options    {
      * <optional-space> ::= ( <CR> ) *( " " )
      *
      */
-distinguishedName [DN dn]
+distinguishedName [Dn dn]
     {
         matchedProduction( "distinguishedName()" );
-        RDN rdn = null;
+        Rdn rdn = null;
     }
     :
     (
-        rdn = relativeDistinguishedName[new RDN()] { dn.add( rdn ); rdn=null; }
+        rdn = relativeDistinguishedName[new Rdn()] { dn.add( rdn ); rdn=null; }
         (
             ( COMMA | SEMI )
-            rdn = relativeDistinguishedName[new RDN()] { dn.add( rdn ); rdn=null; }
+            rdn = relativeDistinguishedName[new Rdn()] { dn.add( rdn ); rdn=null; }
         )*
         EOF
     )?
@@ -190,7 +190,7 @@ distinguishedName [DN dn]
 
 
     /**
-     * Parses an DN string.
+     * Parses an Dn string.
      *
      * RFC 4514, Section 3
      * distinguishedName = [ relativeDistinguishedName
@@ -210,24 +210,24 @@ distinguishedName [DN dn]
      * <optional-space> ::= ( <CR> ) *( " " )
      *
      */
-relativeDistinguishedNames [List<RDN> rdns]
+relativeDistinguishedNames [List<Rdn> rdns]
     {
         matchedProduction( "relativeDistinguishedNames()" );
-        RDN rdn = null;
+        Rdn rdn = null;
     }
     :
     (
-        rdn = relativeDistinguishedName[new RDN()] { rdns.add( rdn ); }
+        rdn = relativeDistinguishedName[new Rdn()] { rdns.add( rdn ); }
         (
             ( COMMA | SEMI )
-            rdn = relativeDistinguishedName[new RDN()] { rdns.add( rdn ); }
+            rdn = relativeDistinguishedName[new Rdn()] { rdns.add( rdn ); }
         )*
         EOF
     )?
     ;
 
     /**
-     * Parses an RDN string.
+     * Parses an Rdn string.
      *
      * RFC 4514, Section 3
      * relativeDistinguishedName = attributeTypeAndValue
@@ -242,7 +242,7 @@ relativeDistinguishedNames [List<RDN> rd
      *       <optional-space> <name-component>
      *
      */
-relativeDistinguishedName [RDN initialRdn] returns [RDN rdn]
+relativeDistinguishedName [Rdn initialRdn] returns [Rdn rdn]
     {
         matchedProduction( "relativeDistinguishedName()" );
         rdn = initialRdn;
@@ -278,7 +278,7 @@ relativeDistinguishedName [RDN initialRd
      * attributeTypeAndValue = attributeType "=" attributeValue
      *
      */
-attributeTypeAndValue [RDN rdn] returns [String upName = ""]
+attributeTypeAndValue [Rdn rdn] returns [String upName = ""]
     {
         matchedProduction( "attributeTypeAndValue()" );
         String type = null;
@@ -296,11 +296,11 @@ attributeTypeAndValue [RDN rdn] returns 
             try
             {
                 upName += value.rawValue;
-                AVA ava = null;
+                Ava ava = null;
             
                 if ( value.value instanceof String )
                 {
-                    ava = new AVA(
+                    ava = new Ava(
                         type,
                         type,
                         new StringValue( (String)value.value ), 
@@ -310,7 +310,7 @@ attributeTypeAndValue [RDN rdn] returns 
                 }
                 else
                 {
-                    ava = new AVA(
+                    ava = new Ava(
                         type,
                         type,
                         new BinaryValue( (byte[])value.value ), 

Modified: directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g Sun Jan 23 01:17:06 2011
@@ -29,7 +29,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.ArrayList;
 
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.LeafNode;
 import org.apache.directory.shared.ldap.filter.BranchNode;
@@ -89,8 +89,8 @@ options
     
     private NormalizerMappingResolver resolver;
     
-    private Set<DN> chopBeforeExclusions = null;
-    private Set<DN> chopAfterExclusions = null;
+    private Set<Dn> chopBeforeExclusions = null;
+    private Set<Dn> chopAfterExclusions = null;
 
     private SubtreeSpecificationModifier ssModifier = null;
     
@@ -173,8 +173,8 @@ subtreeSpecification returns [SubtreeSpe
     ssModifier = new SubtreeSpecificationModifier();
     subtreeSpecificationComponentsMonitor = new OptionalComponentsMonitor( 
             new String [] { "base", "specificExclusions", "minimum", "maximum", "specificationFilter" } );
-    chopBeforeExclusions = new HashSet<DN>();
-    chopAfterExclusions = new HashSet<DN>();
+    chopBeforeExclusions = new HashSet<Dn>();
+    chopAfterExclusions = new HashSet<Dn>();
     // always create a new filter parser in case we may have some statefulness problems with it
 }
     :
@@ -222,7 +222,7 @@ subtreeSpecificationComponent
 ss_base
 {
     log.debug( "entered ss_base()" );
-    DN base = null;
+    Dn base = null;
 }
     :
     ID_base ( SP )+ base=distinguishedName
@@ -266,7 +266,7 @@ specificExclusion
 chopBefore
 {
     log.debug( "entered chopBefore()" );
-    DN chopBeforeExclusion = null;
+    Dn chopBeforeExclusion = null;
 }
     :
     ID_chopBefore ( SP )* COLON ( SP )* chopBeforeExclusion=distinguishedName
@@ -278,7 +278,7 @@ chopBefore
 chopAfter
 {
     log.debug( "entered chopAfter()" );
-    DN chopAfterExclusion = null;
+    Dn chopAfterExclusion = null;
 }
     :
     ID_chopAfter ( SP )* COLON ( SP )* chopAfterExclusion=distinguishedName
@@ -341,7 +341,7 @@ filter returns [ ExprNode filterExpr = n
         throw new RecognitionException( "filterParser failed. " + e.getMessage() );
     }
     
-distinguishedName returns [ DN name ] 
+distinguishedName returns [ Dn name ]
 {
     log.debug( "entered distinguishedName()" );
     name = null;
@@ -349,7 +349,7 @@ distinguishedName returns [ DN name ] 
     :
     token:SAFEUTF8STRING
     {
-        name = new DN( token.getText() );
+        name = new Dn( token.getText() );
         name.normalize( schemaManager );
         
         log.debug( "recognized a DistinguishedName: " + token.getText() );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java Sun Jan 23 01:17:06 2011
@@ -25,8 +25,8 @@ 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.ldif.LdifUtils;
-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.UsageEnum;
 
 
@@ -393,20 +393,20 @@ public class AttributeTypeHolder extends
 
 
     /**
-     * Transform a schema name to a DN pointing to the correct position in the DIT
+     * Transform a schema name to a Dn pointing to the correct position in the DIT
      * 
      * @param schemaName The schema name
-     * @return the DN associated with this schema in the DIT
+     * @return the Dn associated with this schema in the DIT
      */
     public String dnToLdif( String schemaName ) throws LdapException
     {
         StringBuilder sb = new StringBuilder();
 
         String dn = "m-oid=" + oid + ", " + SchemaConstants.ATTRIBUTES_TYPE_PATH + ", cn="
-            + RDN.escapeValue( schemaName ) + ", ou=schema";
+            + Rdn.escapeValue(schemaName) + ", ou=schema";
 
-        // First dump the DN only
-        Entry entry = new DefaultEntry( new DN( dn ) );
+        // First dump the Dn only
+        Entry entry = new DefaultEntry( new Dn( dn ) );
         sb.append( LdifUtils.convertEntryToLdif( entry ) );
 
         return sb.toString();

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java Sun Jan 23 01:17:06 2011
@@ -28,8 +28,8 @@ 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.ldif.LdifUtils;
-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.ObjectClassTypeEnum;
 
 
@@ -208,20 +208,20 @@ public class ObjectClassHolder extends S
 
 
     /**
-     * Transform a schema name to a DN pointing to the correct position in the DIT
+     * Transform a schema name to a Dn pointing to the correct position in the DIT
      * 
      * @param schemaName The schema name
-     * @return the DN associated with this schema in the DIT
+     * @return the Dn associated with this schema in the DIT
      */
     public String dnToLdif( String schemaName ) throws LdapException
     {
         StringBuilder sb = new StringBuilder();
 
         String dn = "m-oid=" + oid + ", " + SchemaConstants.OBJECT_CLASSES_PATH + ", cn="
-            + RDN.escapeValue( schemaName ) + ", ou=schema";
+            + Rdn.escapeValue(schemaName) + ", ou=schema";
 
-        // First dump the DN only
-        Entry entry = new DefaultEntry( new DN( dn ) );
+        // First dump the Dn only
+        Entry entry = new DefaultEntry( new Dn( dn ) );
         sb.append( LdifUtils.convertEntryToLdif( entry ) );
 
         return sb.toString();

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java Sun Jan 23 01:17:06 2011
@@ -255,7 +255,7 @@ public abstract class SchemaElementImpl 
     {
         StringBuilder sb = new StringBuilder();
 
-        // The DN
+        // The Dn
         sb.append( dnToLdif( schemaName ) );
 
         // ObjectClasses

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java Sun Jan 23 01:17:06 2011
@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
 
 
@@ -150,7 +150,7 @@ public abstract class UserClass implemen
         private static final long serialVersionUID = 8571875984468893621L;
 
         /** The names. */
-        protected final Set<DN> names;
+        protected final Set<Dn> names;
 
 
         /**
@@ -158,15 +158,15 @@ public abstract class UserClass implemen
          * 
          * @param names a set of names
          */
-        protected NamedUserClass( Set<DN> names )
+        protected NamedUserClass( Set<Dn> names )
         {
             if ( names == null )
             {
-                this.names = Collections.unmodifiableSet( new HashSet<DN>() );
+                this.names = Collections.unmodifiableSet( new HashSet<Dn>() );
             }
             else
             {
-                this.names = Collections.unmodifiableSet( new HashSet<DN>( names ) );
+                this.names = Collections.unmodifiableSet( new HashSet<Dn>( names ) );
             }
         }
 
@@ -174,7 +174,7 @@ public abstract class UserClass implemen
         /**
          * Returns the set of all names.
          */
-        public Set<DN> getNames()
+        public Set<Dn> getNames()
         {
             return names;
         }
@@ -214,7 +214,7 @@ public abstract class UserClass implemen
         {
             int result = 37;
 
-            for ( DN dn : this.names )
+            for ( Dn dn : this.names )
             {
                 result = result * 17 + dn.hashCode();
             }
@@ -230,7 +230,7 @@ public abstract class UserClass implemen
             boolean isFirst = true;
             buffer.append( "{ " );
 
-            for ( DN name : names )
+            for ( Dn name : names )
             {
                 if ( isFirst )
                 {
@@ -267,7 +267,7 @@ public abstract class UserClass implemen
          * @param usernames
          *            the set of user DNs.
          */
-        public Name( Set<DN> usernames )
+        public Name( Set<Dn> usernames )
         {
             super( usernames );
         }
@@ -301,7 +301,7 @@ public abstract class UserClass implemen
          * @param groupNames
          *            the set of group DNs.
          */
-        public UserGroup( Set<DN> groupNames )
+        public UserGroup( Set<Dn> groupNames )
         {
             super( groupNames );
         }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java Sun Jan 23 01:17:06 2011
@@ -29,8 +29,8 @@ import org.apache.directory.shared.ldap.
  * The attribute value assertion corresponding to the current requestor. The
  * protected item selfValue applies only when the access controls are to be
  * applied with respect to a specific authenticated user. It can only apply
- * in the specific case where the attribute specified is of DN and the
- * attribute value within the specified attribute matches the DN of the
+ * in the specific case where the attribute specified is of Dn and the
+ * attribute value within the specified attribute matches the Dn of the
  * originator of the operation.
  */
 public class SelfValueItem extends AbstractAttributeTypeProtectedItem

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Sun Jan 23 01:17:06 2011
@@ -118,8 +118,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.UnbindRequest;
 import org.apache.directory.shared.ldap.message.UnbindRequestImpl;
 import org.apache.directory.shared.ldap.message.control.Control;
-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.util.StringConstants;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
@@ -331,7 +331,7 @@ public final class LdapMessageGrammar ex
         // LdapMessage ::= ... DelRequest ...
         // delRequest ::= [APPLICATION 10] LDAPDN
         //
-        // We store the DN to bve deleted into the DelRequest object
+        // We store the Dn to bve deleted into the DelRequest object
         super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.DEL_REQUEST_TAG] = new GrammarTransition(
             LdapStatesEnum.MESSAGE_ID_STATE, LdapStatesEnum.DEL_REQUEST_STATE, LdapConstants.DEL_REQUEST_TAG,
             new GrammarAction( "Init del Request" )
@@ -344,13 +344,13 @@ public final class LdapMessageGrammar ex
                     DeleteRequest delRequest = new DeleteRequestImpl( ldapMessageContainer.getMessageId() );
                     ldapMessageContainer.setMessage( delRequest );
 
-                    // And store the DN into it
+                    // And store the Dn into it
                     // Get the Value and store it in the DelRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // We have to handle the special case of a 0 length matched
-                    // DN
-                    DN entry = null;
+                    // Dn
+                    Dn entry = null;
 
                     if ( tlv.getLength() == 0 )
                     {
@@ -364,7 +364,7 @@ public final class LdapMessageGrammar ex
 
                         try
                         {
-                            entry = new DN( dnStr );
+                            entry = new Dn( dnStr );
                         }
                         catch ( LdapInvalidDnException ine )
                         {
@@ -374,7 +374,7 @@ public final class LdapMessageGrammar ex
 
                             DeleteResponseImpl response = new DeleteResponseImpl( delRequest.getMessageId() );
                             throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
-                                DN.EMPTY_DN, ine );
+                                Dn.EMPTY_DN, ine );
                         }
 
                         delRequest.setName( entry );
@@ -385,7 +385,7 @@ public final class LdapMessageGrammar ex
 
                     if ( IS_DEBUG )
                     {
-                        LOG.debug( "Deleting DN {}", entry );
+                        LOG.debug( "Deleting Dn {}", entry );
                     }
                 }
             } );
@@ -576,7 +576,7 @@ public final class LdapMessageGrammar ex
                     // We have to handle the special case of a 0 length name
                     if ( tlv.getLength() == 0 )
                     {
-                        bindRequestMessage.setName( DN.EMPTY_DN );
+                        bindRequestMessage.setName( Dn.EMPTY_DN );
                     }
                     else
                     {
@@ -585,19 +585,19 @@ public final class LdapMessageGrammar ex
 
                         try
                         {
-                            DN dn = new DN( dnStr );
+                            Dn dn = new Dn( dnStr );
                             bindRequestMessage.setName( dn );
                         }
                         catch ( LdapInvalidDnException ine )
                         {
-                            String msg = "Incorrect DN given : " + dnStr + " (" + Strings.dumpBytes(dnBytes)
+                            String msg = "Incorrect Dn given : " + dnStr + " (" + Strings.dumpBytes(dnBytes)
                                 + ") is invalid";
                             LOG.error( "{} : {}", msg, ine.getMessage() );
 
                             BindResponseImpl response = new BindResponseImpl( bindRequestMessage.getMessageId() );
 
                             throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
-                                DN.EMPTY_DN, ine );
+                                Dn.EMPTY_DN, ine );
                         }
                     }
 
@@ -851,20 +851,20 @@ public final class LdapMessageGrammar ex
             new ResultCodeAction() );
 
         // --------------------------------------------------------------------------------------------
-        // Transition from Result Code BR to Matched DN BR 
+        // Transition from Result Code BR to Matched Dn BR
         // --------------------------------------------------------------------------------------------
         // LDAPResult ::= SEQUENCE {
         //     ...
         //     matchedDN LDAPDN,
         //     ...
         //
-        // Stores the matched DN
+        // Stores the matched Dn
         super.transitions[LdapStatesEnum.RESULT_CODE_BR_STATE.ordinal()][UniversalTag.OCTET_STRING.getValue()] = new GrammarTransition(
             LdapStatesEnum.RESULT_CODE_BR_STATE, LdapStatesEnum.MATCHED_DN_BR_STATE, UniversalTag.OCTET_STRING.getValue(),
             new MatchedDNAction() );
 
         // --------------------------------------------------------------------------------------------
-        // Transition from Matched DN BR to Error Message BR 
+        // Transition from Matched Dn BR to Error Message BR
         // --------------------------------------------------------------------------------------------
         // LDAPResult ::= SEQUENCE {
         //     ...
@@ -969,20 +969,20 @@ public final class LdapMessageGrammar ex
             new ControlsInitAction() );
 
         // --------------------------------------------------------------------------------------------
-        // Transition from Result Code to Matched DN 
+        // Transition from Result Code to Matched Dn
         // --------------------------------------------------------------------------------------------
         // LDAPResult ::= SEQUENCE {
         //     ...
         //     matchedDN LDAPDN,
         //     ...
         //
-        // Stores the matched DN
+        // Stores the matched Dn
         super.transitions[LdapStatesEnum.RESULT_CODE_STATE.ordinal()][UniversalTag.OCTET_STRING.getValue()] = new GrammarTransition(
             LdapStatesEnum.RESULT_CODE_STATE, LdapStatesEnum.MATCHED_DN_STATE, UniversalTag.OCTET_STRING.getValue(),
             new MatchedDNAction() );
 
         // --------------------------------------------------------------------------------------------
-        // Transition from Matched DN to Error Message 
+        // Transition from Matched Dn to Error Message
         // --------------------------------------------------------------------------------------------
         // LDAPResult ::= SEQUENCE {
         //     ...
@@ -1120,7 +1120,7 @@ public final class LdapMessageGrammar ex
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
-                    DN objectName = DN.EMPTY_DN;
+                    Dn objectName = Dn.EMPTY_DN;
 
                     // Store the value.
                     if ( tlv.getLength() == 0 )
@@ -1134,12 +1134,12 @@ public final class LdapMessageGrammar ex
 
                         try
                         {
-                            objectName = new DN( dnStr );
+                            objectName = new Dn( dnStr );
                         }
                         catch ( LdapInvalidDnException ine )
                         {
                             // This is for the client side. We will never decode LdapResult on the server
-                            String msg = "The DN " + Strings.dumpBytes(dnBytes) + "is invalid : "
+                            String msg = "The Dn " + Strings.dumpBytes(dnBytes) + "is invalid : "
                                 + ine.getMessage();
                             LOG.error( "{} : {}", msg, ine.getMessage() );
                             throw new DecoderException( msg, ine );
@@ -1150,7 +1150,7 @@ public final class LdapMessageGrammar ex
 
                     if ( IS_DEBUG )
                     {
-                        LOG.debug( "Search Result Entry DN found : {}", searchResultEntry.getObjectName() );
+                        LOG.debug( "Search Result Entry Dn found : {}", searchResultEntry.getObjectName() );
                     }
                 }
             } );
@@ -1422,7 +1422,7 @@ public final class LdapMessageGrammar ex
         //     object    LDAPDN,
         //     ...
         //
-        // Stores the object DN
+        // Stores the object Dn
         super.transitions[LdapStatesEnum.MODIFY_REQUEST_STATE.ordinal()][UniversalTag.OCTET_STRING.getValue()] = new GrammarTransition(
             LdapStatesEnum.MODIFY_REQUEST_STATE, LdapStatesEnum.OBJECT_STATE, UniversalTag.OCTET_STRING.getValue(),
             new GrammarAction( "Store Modify request object Value" )
@@ -1435,7 +1435,7 @@ public final class LdapMessageGrammar ex
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
-                    DN object = DN.EMPTY_DN;
+                    Dn object = Dn.EMPTY_DN;
 
                     // Store the value.
                     if ( tlv.getLength() == 0 )
@@ -1449,17 +1449,17 @@ public final class LdapMessageGrammar ex
 
                         try
                         {
-                            object = new DN( dnStr );
+                            object = new Dn( dnStr );
                         }
                         catch ( LdapInvalidDnException ine )
                         {
-                            String msg = "Invalid DN given : " + dnStr + " (" + Strings.dumpBytes(dnBytes)
+                            String msg = "Invalid Dn given : " + dnStr + " (" + Strings.dumpBytes(dnBytes)
                                 + ") is invalid";
                             LOG.error( "{} : {}", msg, ine.getMessage() );
 
                             ModifyResponseImpl response = new ModifyResponseImpl( modifyRequest.getMessageId() );
                             throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
-                                DN.EMPTY_DN, ine );
+                                Dn.EMPTY_DN, ine );
                         }
 
                         modifyRequest.setName( object );
@@ -1467,7 +1467,7 @@ public final class LdapMessageGrammar ex
 
                     if ( IS_DEBUG )
                     {
-                        LOG.debug( "Modification of DN {}", modifyRequest.getName() );
+                        LOG.debug( "Modification of Dn {}", modifyRequest.getName() );
                     }
                 }
             } );
@@ -1845,7 +1845,7 @@ public final class LdapMessageGrammar ex
         //     entry           LDAPDN,
         //     ...
         //
-        // Stores the DN
+        // Stores the Dn
         super.transitions[LdapStatesEnum.ADD_REQUEST_STATE.ordinal()][UniversalTag.OCTET_STRING.getValue()] = new GrammarTransition(
             LdapStatesEnum.ADD_REQUEST_STATE, LdapStatesEnum.ENTRY_STATE, UniversalTag.OCTET_STRING.getValue(),
             new GrammarAction( "Store add request object Value" )
@@ -1866,36 +1866,36 @@ public final class LdapMessageGrammar ex
 
                         AddResponseImpl response = new AddResponseImpl( addRequest.getMessageId() );
 
-                        // I guess that trying to add an entry which DN is empty is a naming violation...
+                        // I guess that trying to add an entry which Dn is empty is a naming violation...
                         // Not 100% sure though ...
                         throw new ResponseCarryingException( msg, response, ResultCodeEnum.NAMING_VIOLATION,
-                            DN.EMPTY_DN, null );
+                            Dn.EMPTY_DN, null );
                     }
                     else
                     {
-                        DN entryDn = null;
+                        Dn entryDn = null;
                         byte[] dnBytes = tlv.getValue().getData();
                         String dnStr = Strings.utf8ToString(dnBytes);
 
                         try
                         {
-                            entryDn = new DN( dnStr );
+                            entryDn = new Dn( dnStr );
                         }
                         catch ( LdapInvalidDnException ine )
                         {
-                            String msg = "Invalid DN given : " + dnStr + " (" + Strings.dumpBytes(dnBytes)
+                            String msg = "Invalid Dn given : " + dnStr + " (" + Strings.dumpBytes(dnBytes)
                                 + ") is invalid";
                             LOG.error( "{} : {}", msg, ine.getMessage() );
 
                             AddResponseImpl response = new AddResponseImpl( addRequest.getMessageId() );
                             throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
-                                DN.EMPTY_DN, ine );
+                                Dn.EMPTY_DN, ine );
                         }
 
                         addRequest.setEntryDn( entryDn );
                     }
 
-                    LOG.debug( "Adding an entry with DN : {}", addRequest.getEntry() );
+                    LOG.debug( "Adding an entry with Dn : {}", addRequest.getEntry() );
                 }
             } );
 
@@ -2129,7 +2129,7 @@ public final class LdapMessageGrammar ex
         // Create the ModifyDNRequest Object
         super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.MODIFY_DN_REQUEST_TAG] = new GrammarTransition(
             LdapStatesEnum.MESSAGE_ID_STATE, LdapStatesEnum.MODIFY_DN_REQUEST_STATE,
-            LdapConstants.MODIFY_DN_REQUEST_TAG, new GrammarAction( "Init Modify DN Request" )
+            LdapConstants.MODIFY_DN_REQUEST_TAG, new GrammarAction( "Init Modify Dn Request" )
             {
                 public void action( Asn1Container container )
                 {
@@ -2151,7 +2151,7 @@ public final class LdapMessageGrammar ex
         //     entry LDAPDN,
         //     ...
         //
-        // Stores the entry DN
+        // Stores the entry Dn
         super.transitions[LdapStatesEnum.MODIFY_DN_REQUEST_STATE.ordinal()][UniversalTag.OCTET_STRING.getValue()] = new GrammarTransition(
             LdapStatesEnum.MODIFY_DN_REQUEST_STATE, LdapStatesEnum.ENTRY_MOD_DN_STATE, UniversalTag.OCTET_STRING.getValue(),
             new GrammarAction( "Store entry" )
@@ -2166,8 +2166,8 @@ public final class LdapMessageGrammar ex
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // We have to handle the special case of a 0 length matched
-                    // DN
-                    DN entry = null;
+                    // Dn
+                    Dn entry = null;
 
                     if ( tlv.getLength() == 0 )
                     {
@@ -2181,17 +2181,17 @@ public final class LdapMessageGrammar ex
 
                         try
                         {
-                            entry = new DN( dnStr );
+                            entry = new Dn( dnStr );
                         }
                         catch ( LdapInvalidDnException ine )
                         {
-                            String msg = "Invalid DN given : " + dnStr + " (" + Strings.dumpBytes(dnBytes)
+                            String msg = "Invalid Dn given : " + dnStr + " (" + Strings.dumpBytes(dnBytes)
                                 + ") is invalid";
                             LOG.error( "{} : {}", msg, ine.getMessage() );
 
                             ModifyDnResponseImpl response = new ModifyDnResponseImpl( modifyDNRequest.getMessageId() );
                             throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
-                                DN.EMPTY_DN, ine );
+                                Dn.EMPTY_DN, ine );
                         }
 
                         modifyDNRequest.setName( entry );
@@ -2199,7 +2199,7 @@ public final class LdapMessageGrammar ex
 
                     if ( IS_DEBUG )
                     {
-                        LOG.debug( "Modifying DN {}", entry );
+                        LOG.debug( "Modifying Dn {}", entry );
                     }
                 }
             } );
@@ -2214,10 +2214,10 @@ public final class LdapMessageGrammar ex
         //
         // RelativeRDN :: LDAPString
         //
-        // Stores the new RDN
+        // Stores the new Rdn
         super.transitions[LdapStatesEnum.ENTRY_MOD_DN_STATE.ordinal()][UniversalTag.OCTET_STRING.getValue()] = new GrammarTransition(
             LdapStatesEnum.ENTRY_MOD_DN_STATE, LdapStatesEnum.NEW_RDN_STATE, UniversalTag.OCTET_STRING.getValue(),
-            new GrammarAction( "Store new RDN" )
+            new GrammarAction( "Store new Rdn" )
             {
                 public void action( Asn1Container container ) throws DecoderException
                 {
@@ -2230,7 +2230,7 @@ public final class LdapMessageGrammar ex
 
                     // We have to handle the special case of a 0 length matched
                     // newDN
-                    RDN newRdn = null;
+                    Rdn newRdn = null;
 
                     if ( tlv.getLength() == 0 )
                     {
@@ -2248,12 +2248,12 @@ public final class LdapMessageGrammar ex
 
                         try
                         {
-                            DN dn = new DN( dnStr );
+                            Dn dn = new Dn( dnStr );
                             newRdn = dn.getRdn( 0 );
                         }
                         catch ( LdapInvalidDnException ine )
                         {
-                            String msg = "Invalid new RDN given : " + dnStr + " (" + Strings.dumpBytes(dnBytes)
+                            String msg = "Invalid new Rdn given : " + dnStr + " (" + Strings.dumpBytes(dnBytes)
                                 + ") is invalid";
                             LOG.error( "{} : {}", msg, ine.getMessage() );
 
@@ -2267,7 +2267,7 @@ public final class LdapMessageGrammar ex
 
                     if ( IS_DEBUG )
                     {
-                        LOG.debug( "Modifying with new RDN {}", newRdn );
+                        LOG.debug( "Modifying with new Rdn {}", newRdn );
                     }
                 }
             } );
@@ -2320,11 +2320,11 @@ public final class LdapMessageGrammar ex
                     {
                         if ( modifyDnRequest.getDeleteOldRdn() )
                         {
-                            LOG.debug( " Old RDN attributes will be deleted" );
+                            LOG.debug( " Old Rdn attributes will be deleted" );
                         }
                         else
                         {
-                            LOG.debug( " Old RDN attributes will be retained" );
+                            LOG.debug( " Old Rdn attributes will be retained" );
                         }
                     }
                 }
@@ -2351,8 +2351,8 @@ public final class LdapMessageGrammar ex
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // We have to handle the special case of a 0 length matched
-                    // DN
-                    DN newSuperior = DN.EMPTY_DN;
+                    // Dn
+                    Dn newSuperior = Dn.EMPTY_DN;
 
                     if ( tlv.getLength() == 0 )
                     {
@@ -2376,11 +2376,11 @@ public final class LdapMessageGrammar ex
 
                         try
                         {
-                            newSuperior = new DN( dnStr );
+                            newSuperior = new Dn( dnStr );
                         }
                         catch ( LdapInvalidDnException ine )
                         {
-                            String msg = "Invalid new superior DN given : " + dnStr + " ("
+                            String msg = "Invalid new superior Dn given : " + dnStr + " ("
                                 + Strings.dumpBytes(dnBytes) + ") is invalid";
                             LOG.error( "{} : {}", msg, ine.getMessage() );
 
@@ -2397,7 +2397,7 @@ public final class LdapMessageGrammar ex
 
                     if ( IS_DEBUG )
                     {
-                        LOG.debug( "New superior DN {}", newSuperior );
+                        LOG.debug( "New superior Dn {}", newSuperior );
                     }
                 }
             } );
@@ -2446,7 +2446,7 @@ public final class LdapMessageGrammar ex
                     ModifyDnResponse modifyDnResponse = new ModifyDnResponseImpl( ldapMessageContainer.getMessageId() );
                     ldapMessageContainer.setMessage( modifyDnResponse );
 
-                    LOG.debug( "Modify DN response " );
+                    LOG.debug( "Modify Dn response " );
                 }
             } );
 
@@ -2499,7 +2499,7 @@ public final class LdapMessageGrammar ex
         //     entry    LDAPDN,
         //     ...
         //
-        // Stores the compared DN
+        // Stores the compared Dn
         super.transitions[LdapStatesEnum.COMPARE_REQUEST_STATE.ordinal()][UniversalTag.OCTET_STRING.getValue()] = new GrammarTransition(
             LdapStatesEnum.COMPARE_REQUEST_STATE, LdapStatesEnum.ENTRY_COMP_STATE, UniversalTag.OCTET_STRING.getValue(),
             new GrammarAction( "Store entry" )
@@ -2512,10 +2512,10 @@ public final class LdapMessageGrammar ex
 
                     // Get the Value and store it in the CompareRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
-                    DN entry = null;
+                    Dn entry = null;
 
                     // We have to handle the special case of a 0 length matched
-                    // DN
+                    // Dn
                     if ( tlv.getLength() == 0 )
                     {
                         // This will generate a PROTOCOL_ERROR
@@ -2528,17 +2528,17 @@ public final class LdapMessageGrammar ex
 
                         try
                         {
-                            entry = new DN( dnStr );
+                            entry = new Dn( dnStr );
                         }
                         catch ( LdapInvalidDnException ine )
                         {
-                            String msg = "Invalid DN given : " + dnStr + " (" + Strings.dumpBytes(dnBytes)
+                            String msg = "Invalid Dn given : " + dnStr + " (" + Strings.dumpBytes(dnBytes)
                                 + ") is invalid";
                             LOG.error( "{} : {}", msg, ine.getMessage() );
 
                             CompareResponseImpl response = new CompareResponseImpl( compareRequest.getMessageId() );
                             throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
-                                DN.EMPTY_DN, ine );
+                                Dn.EMPTY_DN, ine );
                         }
 
                         compareRequest.setName( entry );
@@ -2546,7 +2546,7 @@ public final class LdapMessageGrammar ex
 
                     if ( IS_DEBUG )
                     {
-                        LOG.debug( "Comparing DN {}", entry );
+                        LOG.debug( "Comparing Dn {}", entry );
                     }
                 }
             } );
@@ -2590,7 +2590,7 @@ public final class LdapMessageGrammar ex
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // We have to handle the special case of a 0 length matched
-                    // DN
+                    // Dn
                     if ( tlv.getLength() == 0 )
                     {
                         String msg = I18n.err( I18n.ERR_04093 );
@@ -2992,7 +2992,7 @@ public final class LdapMessageGrammar ex
             new ResultCodeAction() );
 
         // --------------------------------------------------------------------------------------------
-        // Transition from Result Code ER to Matched DN ER
+        // Transition from Result Code ER to Matched Dn ER
         // --------------------------------------------------------------------------------------------
         // LdapMessage ::= ... ExtendedResponse ...
         // ExtendedResponse ::= [APPLICATION 24] SEQUENCE {
@@ -3005,7 +3005,7 @@ public final class LdapMessageGrammar ex
             new MatchedDNAction() );
 
         // --------------------------------------------------------------------------------------------
-        // Transition from Matched DN ER to Error Message ER 
+        // Transition from Matched Dn ER to Error Message ER
         // --------------------------------------------------------------------------------------------
         // LdapMessage ::= ... ExtendedResponse ...
         // ExtendedResponse ::= [APPLICATION 24] SEQUENCE {
@@ -3615,8 +3615,8 @@ public final class LdapMessageGrammar ex
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
-                    // We have to check that this is a correct DN
-                    DN baseObject = null;
+                    // We have to check that this is a correct Dn
+                    Dn baseObject = null;
 
                     // We have to handle the special case of a 0 length base
                     // object,
@@ -3629,27 +3629,27 @@ public final class LdapMessageGrammar ex
 
                         try
                         {
-                            baseObject = new DN( dnStr );
+                            baseObject = new Dn( dnStr );
                         }
                         catch ( LdapInvalidDnException ine )
                         {
-                            String msg = "Invalid root DN given : " + dnStr + " (" + Strings.dumpBytes(dnBytes)
+                            String msg = "Invalid root Dn given : " + dnStr + " (" + Strings.dumpBytes(dnBytes)
                                 + ") is invalid";
                             LOG.error( "{} : {}", msg, ine.getMessage() );
 
                             SearchResultDoneImpl response = new SearchResultDoneImpl( searchRequest.getMessageId() );
                             throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
-                                DN.EMPTY_DN, ine );
+                                Dn.EMPTY_DN, ine );
                         }
                     }
                     else
                     {
-                        baseObject = DN.EMPTY_DN;
+                        baseObject = Dn.EMPTY_DN;
                     }
 
                     searchRequest.setBase( baseObject );
 
-                    LOG.debug( "Searching with root DN : {}", baseObject );
+                    LOG.debug( "Searching with root Dn : {}", baseObject );
                 }
             } );
 
@@ -6187,7 +6187,7 @@ public final class LdapMessageGrammar ex
 
                     if ( IS_DEBUG )
                     {
-                        LOG.debug( "DN Attributes : {}", Boolean.valueOf( extensibleMatchFilter.isDnAttributes() ) );
+                        LOG.debug( "Dn Attributes : {}", Boolean.valueOf( extensibleMatchFilter.isDnAttributes() ) );
                     }
 
                     // unstack the filters if needed

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.ldap.message.Message;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.ResultResponse;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -64,7 +64,7 @@ public class ResponseCarryingException e
      * @param cause The Exception which caused the error
      */
     public ResponseCarryingException(String message, ResultResponse response, ResultCodeEnum code, 
-        DN matchedDn, Throwable cause)
+        Dn matchedDn, Throwable cause)
     {
         super( message, cause );
 



Mime
View raw message