directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r926019 - in /directory: apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ apacheds/trunk/core-integ/src/te...
Date Mon, 22 Mar 2010 10:14:56 GMT
Author: elecharny
Date: Mon Mar 22 10:14:55 2010
New Revision: 926019

URL: http://svn.apache.org/viewvc?rev=926019&view=rev
Log:
Renamed the RDN.getUpName to getName (will fix DIRSHARED-57)

Modified:
    directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
    directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java
    directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java
    directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestCodec.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DNTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/FastDnParserTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java

Modified: directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java (original)
+++ directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java Mon Mar 22 10:14:55 2010
@@ -1503,7 +1503,7 @@ public class AvlStore<E> implements Stor
 
         DN newUpdn = ( DN ) updn.clone(); // copy da old updn
         newUpdn.remove( newUpdn.size() - 1 ); // remove old upRdn
-        newUpdn.add( newRdn.getUpName() ); // add da new upRdn
+        newUpdn.add( newRdn.getName() ); // add da new upRdn
 
         // gotta normalize cuz this thang is cloned and not normalized by default
         newUpdn.normalize( schemaManager.getNormalizerMapping() );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java Mon Mar 22 10:14:55 2010
@@ -120,7 +120,7 @@ public class MoveAndRenameOperationConte
         if ( newDn == null )
         {
             newDn = new DN( getParent().getName() );
-            newDn.add( getNewRdn().getUpName() );
+            newDn.add( getNewRdn().getName() );
             newDn.normalize( session.getDirectoryService()
                 .getSchemaManager().getNormalizerMapping() );
         }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java Mon Mar 22 10:14:55 2010
@@ -61,7 +61,7 @@ public abstract class AbstractMetaSchema
         while ( rdns.hasMoreElements() )
         {
             sb.append( '/' );
-            sb.append( StringTools.toLowerCase( rdns.nextElement().getUpName() ) );
+            sb.append( StringTools.toLowerCase( rdns.nextElement().getName() ) );
         }
         
         sb.append( ".ldif" );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Mon Mar 22 10:14:55 2010
@@ -847,7 +847,7 @@ public class AciAuthorizationInterceptor
         LdapPrincipal principal = moveAndRenameContext.getSession().getEffectivePrincipal();
         DN principalDn = principal.getClonedName();
         DN newName = ( DN ) newParentName.clone();
-        newName.add( moveAndRenameContext.getNewRdn().getUpName() );
+        newName.add( moveAndRenameContext.getNewRdn().getName() );
 
         // bypass authz code if we are disabled
         if ( !moveAndRenameContext.getSession().getDirectoryService().isAccessControlEnabled() )

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=926019&r1=926018&r2=926019&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 Mon Mar 22 10:14:55 2010
@@ -319,7 +319,7 @@ public class ChangeLogInterceptor extend
         LdifEntry forward = new LdifEntry();
         forward.setChangeType( ChangeType.ModRdn );
         forward.setDn( renameContext.getDn() );
-        forward.setNewRdn( renameContext.getNewRdn().getUpName() );
+        forward.setNewRdn( renameContext.getNewRdn().getName() );
         forward.setDeleteOldRdn( renameContext.getDelOldDn() );
 
         List<LdifEntry> reverses = LdifRevertor.reverseRename( 
@@ -351,7 +351,7 @@ public class ChangeLogInterceptor extend
         forward.setChangeType( ChangeType.ModDn );
         forward.setDn( opCtx.getDn() );
         forward.setDeleteOldRdn( opCtx.getDelOldDn() );
-        forward.setNewRdn( opCtx.getNewRdn().getUpName() );
+        forward.setNewRdn( opCtx.getNewRdn().getName() );
         forward.setNewSuperior( opCtx.getParent().getName() );
 
         List<LdifEntry> reverses = LdifRevertor.reverseMoveAndRename(  

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java Mon Mar 22 10:14:55 2010
@@ -82,7 +82,7 @@ public class ModifyDNStoredProcedurePara
         public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapInvalidDnException
         {
             // Return a safe copy constructed with user provided name.
-            return new DN( newRDN.getUpName() );
+            return new DN( newRDN.getName() );
         }
     };
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java Mon Mar 22 10:14:55 2010
@@ -372,7 +372,7 @@ public class TriggerInterceptor extends 
         ServerEntry renamedEntry = (ServerEntry)renameContext.getEntry().getClonedEntry();
         
         // @TODO : To be completely reviewed !!!
-        DN oldRDN = new DN( name.getRdn().getUpName() );
+        DN oldRDN = new DN( name.getRdn().getName() );
         DN oldSuperiorDN = ( DN ) name.clone();
         oldSuperiorDN.remove( oldSuperiorDN.size() - 1 );
         DN newSuperiorDN = ( DN ) oldSuperiorDN.clone();
@@ -418,13 +418,13 @@ public class TriggerInterceptor extends 
         // Gather supplementary data.        
         ClonedServerEntry movedEntry = opContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
         
-        DN oldRDN = new DN( oriChildName.getRdn().getUpName() );
+        DN oldRDN = new DN( oriChildName.getRdn().getName() );
         DN oldSuperiorDN = ( DN ) oriChildName.clone();
         oldSuperiorDN.remove( oldSuperiorDN.size() - 1 );
         DN newSuperiorDN = ( DN ) parent.clone();
         DN oldDN = ( DN ) oriChildName.clone();
         DN newDN = ( DN ) parent.clone();
-        newDN.add( newRdn.getUpName() );
+        newDN.add( newRdn.getName() );
 
         StoredProcedureParameterInjector injector = new ModifyDNStoredProcedureParameterInjector(
             opContext, deleteOldRn, oldRDN, newRdn, oldSuperiorDN, newSuperiorDN, oldDN, newDN );
@@ -492,14 +492,14 @@ public class TriggerInterceptor extends 
         // Gather supplementary data.        
         ClonedServerEntry movedEntry = opContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
         
-        DN oldRDN = new DN( oriChildName.getRdn().getUpName() );
-        RDN newRDN = new RDN( oriChildName.getRdn().getUpName() );
+        DN oldRDN = new DN( oriChildName.getRdn().getName() );
+        RDN newRDN = new RDN( oriChildName.getRdn().getName() );
         DN oldSuperiorDN = ( DN ) oriChildName.clone();
         oldSuperiorDN.remove( oldSuperiorDN.size() - 1 );
         DN newSuperiorDN = ( DN ) newParentName.clone();
         DN oldDN = ( DN ) oriChildName.clone();
         DN newDN = ( DN ) newParentName.clone();
-        newDN.add( newRDN.getUpName() );
+        newDN.add( newRDN.getName() );
 
         StoredProcedureParameterInjector injector = new ModifyDNStoredProcedureParameterInjector(
             opContext, false, oldRDN, newRDN, oldSuperiorDN, newSuperiorDN, oldDN, newDN );

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Mon Mar 22 10:14:55 2010
@@ -1894,7 +1894,7 @@ public class JdbmStore<E> implements Sto
 
         DN newUpdn = ( DN ) updn.clone(); // copy da old updn
         newUpdn.remove( newUpdn.size() - 1 ); // remove old upRdn
-        newUpdn.add( newRdn.getUpName() ); // add da new upRdn
+        newUpdn.add( newRdn.getName() ); // add da new upRdn
 
         // gotta normalize cuz this thang is cloned and not normalized by default
         newUpdn.normalize( schemaManager.getNormalizerMapping() );

Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java Mon Mar 22 10:14:55 2010
@@ -175,13 +175,13 @@ public class LdifStore<E> implements Sto
 
         for ( int i = 0; i < size; i++ )
         {
-            filePath.append( entryDn.getRdn( i ).getUpName().toLowerCase() ).append( File.separator );
+            filePath.append( entryDn.getRdn( i ).getName().toLowerCase() ).append( File.separator );
         }
 
         File dir = new File( filePath.toString() );
         dir.mkdirs();
 
-        return new File( dir, entryDn.getRdn().getUpName().toLowerCase() + CONF_FILE_EXTN );
+        return new File( dir, entryDn.getRdn().getName().toLowerCase() + CONF_FILE_EXTN );
     }
 
 

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java Mon Mar 22 10:14:55 2010
@@ -74,11 +74,11 @@ public class ModifyDnHandler extends Lda
         
         try
         {
-            DN newRdn = new DN( req.getNewRdn().getUpName() );
+            DN newRdn = new DN( req.getNewRdn().getName() );
             newRdn.normalize( session.getCoreSession().getDirectoryService()
                 .getSchemaManager().getNormalizerMapping() );
             
-            DN oldRdn = new DN( req.getName().getRdn().getUpName() );
+            DN oldRdn = new DN( req.getName().getRdn().getName() );
             oldRdn.normalize( session.getCoreSession().getDirectoryService()
                 .getSchemaManager().getNormalizerMapping() );
             

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java Mon Mar 22 10:14:55 2010
@@ -83,7 +83,7 @@ public class ModifyDNRequestDsml extends
         // NewRDN
         if ( request.getNewRDN() != null )
         {
-            element.addAttribute( "newrdn", request.getNewRDN().getUpName() );
+            element.addAttribute( "newrdn", request.getNewRDN().getName() );
         }
 
         // DeleteOldRDN

Modified: directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java (original)
+++ directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java Mon Mar 22 10:14:55 2010
@@ -278,7 +278,7 @@ public class LdifRevertor
 
         entry.setChangeType( ChangeType.ModDn );
         entry.setDn( newDn );
-        entry.setNewRdn( currentRdn.getUpName() );
+        entry.setNewRdn( currentRdn.getName() );
         entry.setNewSuperior( currentParent.getName() );
         entry.setDeleteOldRdn( false );
         return entry;
@@ -307,7 +307,7 @@ public class LdifRevertor
             reverted.setDn( newDn );
         }
         
-        reverted.setNewRdn( oldRdn.getUpName() );
+        reverted.setNewRdn( oldRdn.getName() );
 
         // Is the newRdn's value present in the entry ?
         // ( case 3, 4 and 5)
@@ -380,7 +380,7 @@ public class LdifRevertor
             reverted.setDn( newDn );
         }
         
-        reverted.setNewRdn( oldRdn.getUpName() );
+        reverted.setNewRdn( oldRdn.getName() );
         
         if ( newSuperior != null )
         {

Modified: directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java (original)
+++ directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java Mon Mar 22 10:14:55 2010
@@ -664,7 +664,7 @@ public class LdifRevertorTest
         assertEquals( "cn=john doe,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModDn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
-        assertEquals( rdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( rdn.getName(), reversed.getNewRdn() );
         assertEquals( "dc=example, dc=com", StringTools.trim( reversed.getNewSuperior() ) );
         assertNull( reversed.getEntry() );
     }
@@ -708,7 +708,7 @@ public class LdifRevertorTest
         assertEquals( "cn=joe,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertTrue( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -752,7 +752,7 @@ public class LdifRevertorTest
         assertEquals( "cn=small,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -795,7 +795,7 @@ public class LdifRevertorTest
         assertEquals( "cn=joe,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertTrue( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -839,7 +839,7 @@ public class LdifRevertorTest
         assertEquals( "cn=small,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -884,7 +884,7 @@ public class LdifRevertorTest
         assertEquals( "cn=joe,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertTrue( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -930,7 +930,7 @@ public class LdifRevertorTest
         assertEquals( "cn=big,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -975,7 +975,7 @@ public class LdifRevertorTest
         assertEquals( "cn=joe,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertTrue( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -1021,7 +1021,7 @@ public class LdifRevertorTest
         assertEquals( "cn=big,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -1065,7 +1065,7 @@ public class LdifRevertorTest
         assertEquals( "cn=test,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -1109,7 +1109,7 @@ public class LdifRevertorTest
         assertEquals( "cn=test,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -1154,7 +1154,7 @@ public class LdifRevertorTest
         assertEquals( "cn=joe+cn=plumber,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertTrue( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -1199,7 +1199,7 @@ public class LdifRevertorTest
         assertEquals( "cn=joe+cn=small,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
 
         reversed = reverseds.get( 1 );
@@ -1257,7 +1257,7 @@ public class LdifRevertorTest
         assertEquals( "cn=joe+cn=plumber,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertTrue( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -1302,7 +1302,7 @@ public class LdifRevertorTest
         assertEquals( "cn=joe+cn=small,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
         
         reversed = reverseds.get( 1 );
@@ -1360,7 +1360,7 @@ public class LdifRevertorTest
         assertEquals( "cn=small+cn=test,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertTrue( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -1407,7 +1407,7 @@ public class LdifRevertorTest
         assertEquals( "cn=small+cn=test+cn=big,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
 
         reversed = reverseds.get( 1 );
@@ -1465,7 +1465,7 @@ public class LdifRevertorTest
         assertEquals( "cn=small+cn=test,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertTrue( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -1510,7 +1510,7 @@ public class LdifRevertorTest
         assertEquals( "cn=small+cn=test+cn=big,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
 
         reversed = reverseds.get( 1 );
@@ -1569,7 +1569,7 @@ public class LdifRevertorTest
         assertEquals( "cn=joe+cn=plumber,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertTrue( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -1615,7 +1615,7 @@ public class LdifRevertorTest
         assertEquals( "cn=joe+cn=big,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
 
         reversed = reverseds.get( 1 );
@@ -1674,7 +1674,7 @@ public class LdifRevertorTest
         assertEquals( "cn=joe+cn=plumber,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertTrue( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -1720,7 +1720,7 @@ public class LdifRevertorTest
         assertEquals( "cn=joe+cn=big,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
 
         reversed = reverseds.get( 1 );
@@ -1779,7 +1779,7 @@ public class LdifRevertorTest
         assertEquals( "cn=joe+cn=test,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertTrue( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -1825,7 +1825,7 @@ public class LdifRevertorTest
         assertEquals( "cn=big+cn=test,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -1871,7 +1871,7 @@ public class LdifRevertorTest
         assertEquals( "cn=joe+cn=test,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertTrue( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 
@@ -1917,7 +1917,7 @@ public class LdifRevertorTest
         assertEquals( "cn=big+cn=test,ou=system", reversed.getDn().getName() );
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
-        assertEquals( oldRdn.getUpName(), reversed.getNewRdn() );
+        assertEquals( oldRdn.getName(), reversed.getNewRdn() );
         assertNull( reversed.getNewSuperior() );
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestCodec.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestCodec.java Mon Mar 22 10:14:55 2010
@@ -214,7 +214,7 @@ public class ModifyDNRequestCodec extend
      */
     protected int computeLengthProtocolOp()
     {
-        int newRdnlength = StringTools.getBytesUtf8( newRDN.getUpName() ).length;
+        int newRdnlength = StringTools.getBytesUtf8( newRDN.getName() ).length;
         modifyDNRequestLength = 1 + TLV.getNbBytes( DN.getNbBytes( entry ) ) + DN.getNbBytes( entry ) + 1
             + TLV.getNbBytes( newRdnlength ) + newRdnlength + 1 + 1 + 1; // deleteOldRDN
 
@@ -255,7 +255,7 @@ public class ModifyDNRequestCodec extend
             Value.encode( buffer, DN.getBytes( entry ) );
 
             // The newRDN
-            Value.encode( buffer, newRDN.getUpName() );
+            Value.encode( buffer, newRDN.getName() );
 
             // The flag deleteOldRdn
             Value.encode( buffer, deleteOldRDN );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java Mon Mar 22 10:14:55 2010
@@ -281,7 +281,7 @@ public class DN implements Externalizabl
         while ( rdns.hasMoreElements() )
         {
             RDN rdn = rdns.nextElement();
-            String upName = rdn.getUpName();
+            String upName = rdn.getName();
             rdnOidToName( rdn, oidsMap );
             rdn.normalize();
             rdn.setUpName( upName );
@@ -386,7 +386,7 @@ public class DN implements Externalizabl
                     sb.append( ',' );
                 }
 
-                sb.append( rdn.getUpName() );
+                sb.append( rdn.getName() );
             }
 
             upName = sb.toString();
@@ -444,7 +444,7 @@ public class DN implements Externalizabl
                 sb.append( ',' );
             }
 
-            sb.append( rdns.get( i ).getUpName() );
+            sb.append( rdns.get( i ).getName() );
         }
 
         return sb.toString();
@@ -490,7 +490,7 @@ public class DN implements Externalizabl
                 sb.append( ',' );
             }
 
-            sb.append( rdns.get( i ).getUpName() );
+            sb.append( rdns.get( i ).getName() );
         }
 
         return sb.toString();
@@ -1179,12 +1179,12 @@ public class DN implements Externalizabl
         if (rdns.size() == 1 )
         {
             normName = newRdn.getNormName();
-            upName = newRdn.getUpName();
+            upName = newRdn.getName();
         }
         else
         {
             normName = newRdn + "," + normName;
-            upName = newRdn.getUpName() + "," + upName;
+            upName = newRdn.getName() + "," + upName;
         }
         
         bytes = StringTools.getBytesUtf8( normName );
@@ -1466,7 +1466,7 @@ public class DN implements Externalizabl
         while ( rdns.hasMoreElements() )
         {
             RDN rdn = rdns.nextElement();
-            String upName = rdn.getUpName();
+            String upName = rdn.getName();
             rdnOidToName( rdn, oidsMap );
             rdn.normalize();
             rdn.setUpName( upName );
@@ -1514,7 +1514,7 @@ public class DN implements Externalizabl
         while ( localRdns.hasMoreElements() )
         {
             RDN rdn = localRdns.nextElement();
-            String localUpName = rdn.getUpName();
+            String localUpName = rdn.getName();
             rdnOidToName( rdn, oidsMap );
             rdn.normalize();
             rdn.setUpName( localUpName );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java Mon Mar 22 10:14:55 2010
@@ -302,7 +302,7 @@ public class RDN implements Cloneable, C
     {
         nbAtavs = rdn.getNbAtavs();
         this.normName = rdn.normName;
-        this.upName = rdn.getUpName();
+        this.upName = rdn.getName();
         this.start = rdn.start;
         this.length = rdn.length;
 
@@ -399,7 +399,7 @@ public class RDN implements Cloneable, C
      */
     public RDN normalize( Map<String, OidNormalizer> oidsMap ) throws LdapInvalidDnException
     {
-        String upName = getUpName();
+        String upName = getName();
         DN.rdnOidToName( this, oidsMap );
         normalize();
         this.upName = upName;
@@ -813,7 +813,7 @@ public class RDN implements Cloneable, C
     /**
      * @return the user provided name
      */
-    public String getUpName()
+    public String getName()
     {
         return upName;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java Mon Mar 22 10:14:55 2010
@@ -63,7 +63,7 @@ public class RdnSerializer
     public static void serialize( RDN rdn, ObjectOutput out ) throws IOException
     {
         out.writeInt( rdn.getNbAtavs() );
-        out.writeUTF( rdn.getUpName() );
+        out.writeUTF( rdn.getName() );
         out.writeUTF( rdn.getNormName() );
         out.writeInt( rdn.getStart() );
         out.writeInt( rdn.getLength() );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DNTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DNTest.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DNTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DNTest.java Mon Mar 22 10:14:55 2010
@@ -370,7 +370,7 @@ public class DNTest
         assertEquals( "a = \\#123456", dn.getName() );
 
         RDN rdn = dn.getRdn();
-        assertEquals( "a = \\#123456", rdn.getUpName() );
+        assertEquals( "a = \\#123456", rdn.getName() );
 
         assertTrue( DN.isValid( "a = \\#00" ) );
         assertTrue( DN.isValid( "a = \\#11" ) );
@@ -397,7 +397,7 @@ public class DNTest
         assertEquals( "a = \\#this is a sharp", dn.getName() );
 
         RDN rdn = dn.getRdn();
-        assertEquals( "a = \\#this is a sharp", rdn.getUpName() );
+        assertEquals( "a = \\#this is a sharp", rdn.getName() );
     }
 
 
@@ -2019,10 +2019,10 @@ public class DNTest
     public void testGetRdn() throws Exception
     {
         DN name = new DN( "cn=HomeDir,cn=John,ou=Marketing,ou=East" );
-        assertEquals( "cn=HomeDir", name.getRdn( 3 ).getUpName() );
-        assertEquals( "cn=John", name.getRdn( 2 ).getUpName() );
-        assertEquals( "ou=Marketing", name.getRdn( 1 ).getUpName() );
-        assertEquals( "ou=East", name.getRdn( 0 ).getUpName() );
+        assertEquals( "cn=HomeDir", name.getRdn( 3 ).getName() );
+        assertEquals( "cn=John", name.getRdn( 2 ).getName() );
+        assertEquals( "ou=Marketing", name.getRdn( 1 ).getName() );
+        assertEquals( "ou=East", name.getRdn( 0 ).getName() );
     }
 
     /**
@@ -2473,7 +2473,7 @@ public class DNTest
 
         RDN rdn = name.getRdn();
 
-        assertEquals( "ou= Some   People   ", rdn.getUpName() );
+        assertEquals( "ou= Some   People   ", rdn.getName() );
         assertEquals( "ou", rdn.getNormType() );
         assertEquals( "ou", rdn.getUpType() );
 
@@ -2485,7 +2485,7 @@ public class DNTest
 
         RDN rdn2 = result.getRdn();
 
-        assertEquals( "ou= Some   People   ", rdn2.getUpName() );
+        assertEquals( "ou= Some   People   ", rdn2.getName() );
         assertEquals( "2.5.4.11", rdn2.getNormType() );
         assertEquals( "ou", rdn2.getUpType() );
     }
@@ -3336,14 +3336,14 @@ public class DNTest
     {
         // antlr parser: string value with trailing spaces
         DN dn1 = new DN( " cn = Amos\\,Tori , ou=system " );
-        assertEquals( " cn = Amos\\,Tori ", dn1.getRdn().getUpName() );
+        assertEquals( " cn = Amos\\,Tori ", dn1.getRdn().getName() );
         AVA atav1 = dn1.getRdn().getAtav();
         assertEquals( "cn", atav1.getUpType() );
         assertEquals( "Amos,Tori", atav1.getUpValue().getString() );
 
         // antlr parser: hexstring with trailing spaces
         DN dn3 = new DN( " cn = #414243 , ou=system " );
-        assertEquals( " cn = #414243 ", dn3.getRdn().getUpName() );
+        assertEquals( " cn = #414243 ", dn3.getRdn().getName() );
         AVA atav3 = dn3.getRdn().getAtav();
         assertEquals( "cn", atav3.getUpType() );
         assertEquals( "ABC", atav3.getUpValue().getString() );
@@ -3351,7 +3351,7 @@ public class DNTest
 
         // antlr parser: 
         DN dn4 = new DN( " cn = \\41\\42\\43 , ou=system " );
-        assertEquals( " cn = \\41\\42\\43 ", dn4.getRdn().getUpName() );
+        assertEquals( " cn = \\41\\42\\43 ", dn4.getRdn().getName() );
         AVA atav4 = dn4.getRdn().getAtav();
         assertEquals( "cn", atav4.getUpType() );
         assertEquals( "ABC", atav4.getUpValue().getString() );
@@ -3359,7 +3359,7 @@ public class DNTest
 
         // antlr parser: quotestring with trailing spaces
         DN dn5 = new DN( " cn = \"ABC\" , ou=system " );
-        assertEquals( " cn = \"ABC\" ", dn5.getRdn().getUpName() );
+        assertEquals( " cn = \"ABC\" ", dn5.getRdn().getName() );
         AVA atav5 = dn5.getRdn().getAtav();
         assertEquals( "cn", atav5.getUpType() );
         assertEquals( "ABC", atav5.getUpValue().getString() );
@@ -3367,7 +3367,7 @@ public class DNTest
 
         // fast parser: string value with trailing spaces 
         DN dn2 = new DN( " cn = Amos Tori , ou=system " );
-        assertEquals( " cn = Amos Tori ", dn2.getRdn().getUpName() );
+        assertEquals( " cn = Amos Tori ", dn2.getRdn().getName() );
         AVA atav2 = dn2.getRdn().getAtav();
         assertEquals( "cn", atav2.getUpType() );
         assertEquals( "Amos Tori", atav2.getUpValue().getString() );
@@ -3385,28 +3385,28 @@ public class DNTest
         dn1.normalize( oids );
         assertEquals( "ou=A\\ ,ou=system", dn1.getName() );
         assertEquals( "ou=a,ou=system", dn1.getNormName() );
-        assertEquals( "ou=A\\ ", dn1.getRdn().getUpName() );
+        assertEquals( "ou=A\\ ", dn1.getRdn().getName() );
         assertEquals( "ou=a", dn1.getRdn().getNormName() );
 
         DN dn2 = new DN( "ou=A\\20,ou=system" );
         dn2.normalize( oids );
         assertEquals( "ou=A\\20,ou=system", dn2.getName() );
         assertEquals( "ou=a,ou=system", dn2.getNormName() );
-        assertEquals( "ou=A\\20", dn2.getRdn().getUpName() );
+        assertEquals( "ou=A\\20", dn2.getRdn().getName() );
         assertEquals( "ou=a", dn2.getRdn().getNormName() );
         
         DN dn3 = new DN( "ou=\\ ,ou=system" );
         dn3.normalize( oids );
         assertEquals( "ou=\\ ,ou=system", dn3.getName() );
         assertEquals( "ou=,ou=system", dn3.getNormName() );
-        assertEquals( "ou=\\ ", dn3.getRdn().getUpName() );
+        assertEquals( "ou=\\ ", dn3.getRdn().getName() );
         assertEquals( "ou=", dn3.getRdn().getNormName() );
         
         DN dn4 = new DN( "ou=\\20,ou=system" );
         dn4.normalize( oids );
         assertEquals( "ou=\\20,ou=system", dn4.getName() );
         assertEquals( "ou=,ou=system", dn4.getNormName() );
-        assertEquals( "ou=\\20", dn4.getRdn().getUpName() );
+        assertEquals( "ou=\\20", dn4.getRdn().getName() );
         assertEquals( "ou=", dn4.getRdn().getNormName() );
     }
 
@@ -3422,7 +3422,7 @@ public class DNTest
         DN dn1 = new DN( "cn=loopback+ipHostNumber=127.0.0.1,ou=Hosts,dc=mygfs,dc=com" );
         assertEquals( "cn=loopback+ipHostNumber=127.0.0.1,ou=Hosts,dc=mygfs,dc=com", dn1.getName() );
         assertEquals( "cn=loopback+iphostnumber=127.0.0.1,ou=Hosts,dc=mygfs,dc=com", dn1.getNormName() );
-        assertEquals( "cn=loopback+ipHostNumber=127.0.0.1", dn1.getRdn().getUpName() );
+        assertEquals( "cn=loopback+ipHostNumber=127.0.0.1", dn1.getRdn().getName() );
         assertEquals( "cn=loopback+iphostnumber=127.0.0.1", dn1.getRdn().getNormName() );
         assertEquals( "127.0.0.1", dn1.getRdn().getAttributeTypeAndValue( "ipHostNumber" ).getUpValue().get() );
         
@@ -3430,21 +3430,21 @@ public class DNTest
         DN dn2 = new DN( "cn=loopback+ipHostNumber=X127.0.0.1,ou=Hosts,dc=mygfs,dc=com" );
         assertEquals( "cn=loopback+ipHostNumber=X127.0.0.1,ou=Hosts,dc=mygfs,dc=com", dn2.getName() );
         assertEquals( "cn=loopback+iphostnumber=X127.0.0.1,ou=Hosts,dc=mygfs,dc=com", dn2.getNormName() );
-        assertEquals( "cn=loopback+ipHostNumber=X127.0.0.1", dn2.getRdn().getUpName() );
+        assertEquals( "cn=loopback+ipHostNumber=X127.0.0.1", dn2.getRdn().getName() );
         assertEquals( "cn=loopback+iphostnumber=X127.0.0.1", dn2.getRdn().getNormName() );
 
         // numeric OID with prefix
         DN dn3 = new DN( "cn=loopback+ipHostNumber=127.0.0.1Y,ou=Hosts,dc=mygfs,dc=com" );
         assertEquals( "cn=loopback+ipHostNumber=127.0.0.1Y,ou=Hosts,dc=mygfs,dc=com", dn3.getName() );
         assertEquals( "cn=loopback+iphostnumber=127.0.0.1Y,ou=Hosts,dc=mygfs,dc=com", dn3.getNormName() );
-        assertEquals( "cn=loopback+ipHostNumber=127.0.0.1Y", dn3.getRdn().getUpName() );
+        assertEquals( "cn=loopback+ipHostNumber=127.0.0.1Y", dn3.getRdn().getName() );
         assertEquals( "cn=loopback+iphostnumber=127.0.0.1Y", dn3.getRdn().getNormName() );
 
         // numeric OID with special characters
         DN dn4 = new DN( "cn=loopback+ipHostNumber=\\#127.0.0.1 Z,ou=Hosts,dc=mygfs,dc=com" );
         assertEquals( "cn=loopback+ipHostNumber=\\#127.0.0.1 Z,ou=Hosts,dc=mygfs,dc=com", dn4.getName() );
         assertEquals( "cn=loopback+iphostnumber=\\#127.0.0.1 Z,ou=Hosts,dc=mygfs,dc=com", dn4.getNormName() );
-        assertEquals( "cn=loopback+ipHostNumber=\\#127.0.0.1 Z", dn4.getRdn().getUpName() );
+        assertEquals( "cn=loopback+ipHostNumber=\\#127.0.0.1 Z", dn4.getRdn().getName() );
         assertEquals( "cn=loopback+iphostnumber=\\#127.0.0.1 Z", dn4.getRdn().getNormName() );
     }
 
@@ -3464,7 +3464,7 @@ public class DNTest
         assertEquals( "2.5.4.11=example", rdn.getNormName() );
         assertEquals( "ou", rdn.getUpType() );
         assertEquals( "Example",rdn.getUpValue() );
-        assertEquals( "  ou  =  Example ", rdn.getUpName() );
+        assertEquals( "  ou  =  Example ", rdn.getName() );
         
         AVA atav = rdn.getAtav();
         
@@ -3494,7 +3494,7 @@ public class DNTest
         assertEquals( "2.5.4.11=example+2.5.4.11=test", rdn.getNormName() );
         assertEquals( "ou", rdn.getUpType() );
         assertEquals( "Example",rdn.getUpValue() );
-        assertEquals( "  ou  =  Example + ou = TEST ", rdn.getUpName() );
+        assertEquals( "  ou  =  Example + ou = TEST ", rdn.getName() );
         
         // The first ATAV
         AVA atav = rdn.getAtav();
@@ -3545,7 +3545,7 @@ public class DNTest
         assertEquals( "2.5.4.11=ex\\+mple", rdn.getNormName() );
         assertEquals( "ou", rdn.getUpType() );
         assertEquals( "Ex+mple",rdn.getUpValue() );
-        assertEquals( "  ou  =  Ex\\+mple ", rdn.getUpName() );
+        assertEquals( "  ou  =  Ex\\+mple ", rdn.getName() );
         
         AVA atav = rdn.getAtav();
         
@@ -3572,7 +3572,7 @@ public class DNTest
         
         // Check the first RDN
         RDN rdn = dn.getRdn();
-        assertEquals( "  OU  =  Ex\\+mple + ou = T\\+ST\\  ", rdn.getUpName() );
+        assertEquals( "  OU  =  Ex\\+mple + ou = T\\+ST\\  ", rdn.getName() );
         assertEquals( "ou=Ex\\+mple+ou=T\\+ST\\ ", rdn.getNormName() );
 
         assertEquals( "OU", rdn.getUpType() );
@@ -3623,7 +3623,7 @@ public class DNTest
         
         // Check the first RDN
         rdn = dn.getRdn();
-        assertEquals( "  OU  =  Ex\\+mple + ou = T\\+ST\\  ", rdn.getUpName() );
+        assertEquals( "  OU  =  Ex\\+mple + ou = T\\+ST\\  ", rdn.getName() );
         assertEquals( "2.5.4.11=ex\\+mple+2.5.4.11=t\\+st", rdn.getNormName() );
 
         assertEquals( "OU", rdn.getUpType() );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/FastDnParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/FastDnParserTest.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/FastDnParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/FastDnParserTest.java Mon Mar 22 10:14:55 2010
@@ -161,7 +161,7 @@ public class FastDnParserTest
         assertEquals( "a=b", dn.getNormName() );
         assertEquals( "a = b", dn.toString() );
 
-        assertEquals( "a = b", dn.getRdn().getUpName() );
+        assertEquals( "a = b", dn.getRdn().getName() );
         assertEquals( "a=b", dn.getRdn().getNormName() );
 
         assertEquals( "a = b", dn.getRdn().getAtav().getUpName() );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java?rev=926019&r1=926018&r2=926019&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java Mon Mar 22 10:14:55 2010
@@ -307,7 +307,7 @@ public class RdnTest
     {
         RDN rdn = new RDN( "A", "  b  " );
         assertEquals( "a=\\  b \\ ", rdn.getNormName() );
-        assertEquals( "A=  b  ", rdn.getUpName() );
+        assertEquals( "A=  b  ", rdn.getName() );
     }
 
 
@@ -820,7 +820,7 @@ public class RdnTest
     public void testDIRSERVER_703() throws LdapException
     {
         RDN rdn = new RDN( "cn=Kate Bush+sn=Bush" );
-        assertEquals( "cn=Kate Bush+sn=Bush", rdn.getUpName() );
+        assertEquals( "cn=Kate Bush+sn=Bush", rdn.getName() );
     }
 
 
@@ -1367,11 +1367,11 @@ public class RdnTest
 
         assertTrue( RdnParser.isValid( "a=\"b,c\"" ) );
         assertEquals( "a=b\\,c", new RDN( "a=\"b,c\"" ).getNormName() );
-        assertEquals( "a=\"b,c\"", new RDN( "a=\"b,c\"" ).getUpName() );
+        assertEquals( "a=\"b,c\"", new RDN( "a=\"b,c\"" ).getName() );
 
         assertTrue( RdnParser.isValid( "a=\"b\\,c\"" ) );
         RDN rdn = new RDN( "a=\"b\\,c\"" );
-        assertEquals( "a=\"b\\,c\"", rdn.getUpName() );
+        assertEquals( "a=\"b\\,c\"", rdn.getName() );
         assertEquals( "a=b\\,c", rdn.getNormName() );
     }
 
@@ -1422,6 +1422,6 @@ public class RdnTest
     {
         RDN rdn = new RDN( " A = b + C = d " );
         
-        assertEquals( " A = b + C = d ", rdn.getUpName() );
+        assertEquals( " A = b + C = d ", rdn.getName() );
     }
 }



Mime
View raw message