You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/01/03 16:06:06 UTC
svn commit: r895401 [2/4] - in /directory:
apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/
apacheds/branches/apacheds-schema/avl-partition/src/test/java/org/apache/directory/server/core/part...
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Sun Jan 3 15:04:50 2010
@@ -247,10 +247,10 @@
if ( isTheAdministrator( dn ) )
{
- String msg = "User '" + principalDn.getUpName();
+ String msg = "User '" + principalDn.getName();
msg += "' does not have permission to move or rename the admin";
msg += " account. No one not even the admin can del, move or";
- msg += " rename " + dn.getUpName() + "!";
+ msg += " rename " + dn.getName() + "!";
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java Sun Jan 3 15:04:50 2010
@@ -198,7 +198,7 @@
if ( isTheAdministrator( name ) )
{
- String msg = "User " + principalDn.getUpName();
+ String msg = "User " + principalDn.getName();
msg += " does not have permission to delete the admin account.";
msg += " No one not even the admin can delete this account!";
LOG.error( msg );
@@ -211,18 +211,18 @@
{
if ( name.startsWith( USER_BASE_DN ) )
{
- String msg = "User " + principalDn.getUpName();
+ String msg = "User " + principalDn.getName();
msg += " does not have permission to delete the user account: ";
- msg += name.getUpName() + ". Only the admin can delete user accounts.";
+ msg += name.getName() + ". Only the admin can delete user accounts.";
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
if ( name.startsWith( GROUP_BASE_DN ) )
{
- String msg = "User " + principalDn.getUpName();
+ String msg = "User " + principalDn.getName();
msg += " does not have permission to delete the group entry: ";
- msg += name.getUpName() + ". Only the admin can delete groups.";
+ msg += name.getName() + ". Only the admin can delete groups.";
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
@@ -300,7 +300,7 @@
if ( dn.getNormName().equals( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED ) )
{
- String msg = "User " + principalDn.getUpName();
+ String msg = "User " + principalDn.getName();
msg += " does not have permission to modify the account of the";
msg += " admin user.";
LOG.error( msg );
@@ -311,9 +311,9 @@
{
if ( dn.startsWith( USER_BASE_DN ) )
{
- String msg = "User " + principalDn.getUpName();
+ String msg = "User " + principalDn.getName();
msg += " does not have permission to modify the account of the";
- msg += " user " + dn.getUpName() + ".\nEven the owner of an account cannot";
+ msg += " user " + dn.getName() + ".\nEven the owner of an account cannot";
msg += " modify it.\nUser accounts can only be modified by the";
msg += " administrator.";
LOG.error( msg );
@@ -322,9 +322,9 @@
if ( dn.startsWith( GROUP_BASE_DN ) )
{
- String msg = "User " + principalDn.getUpName();
+ String msg = "User " + principalDn.getName();
msg += " does not have permission to modify the group entry ";
- msg += dn.getUpName() + ".\nGroups can only be modified by the admin.";
+ msg += dn.getName() + ".\nGroups can only be modified by the admin.";
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
@@ -396,19 +396,19 @@
if ( isTheAdministrator( dn ) )
{
- String msg = "User '" + principalDn.getUpName();
+ String msg = "User '" + principalDn.getName();
msg += "' does not have permission to move or rename the admin";
msg += " account. No one not even the admin can move or";
- msg += " rename " + dn.getUpName() + "!";
+ msg += " rename " + dn.getName() + "!";
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
if ( dn.size() > 2 && dn.startsWith( USER_BASE_DN ) && !isAnAdministrator( principalDn ) )
{
- String msg = "User '" + principalDn.getUpName();
+ String msg = "User '" + principalDn.getName();
msg += "' does not have permission to move or rename the user";
- msg += " account: " + dn.getUpName() + ". Only the admin can move or";
+ msg += " account: " + dn.getName() + ". Only the admin can move or";
msg += " rename user accounts.";
LOG.error( msg );
throw new LdapNoPermissionException( msg );
@@ -416,9 +416,9 @@
if ( dn.size() > 2 && dn.startsWith( GROUP_BASE_DN ) && !isAnAdministrator( principalDn ) )
{
- String msg = "User " + principalDn.getUpName();
+ String msg = "User " + principalDn.getName();
msg += " does not have permission to move or rename the group entry ";
- msg += dn.getUpName() + ".\nGroups can only be moved or renamed by the admin.";
+ msg += dn.getName() + ".\nGroups can only be moved or renamed by the admin.";
throw new LdapNoPermissionException( msg );
}
}
@@ -452,8 +452,8 @@
return;
}
- String msg = "Access to user account '" + normalizedDn.getUpName() + "' not permitted";
- msg += " for user '" + principalDn.getUpName() + "'. Only the admin can";
+ String msg = "Access to user account '" + normalizedDn.getName() + "' not permitted";
+ msg += " for user '" + principalDn.getName() + "'. Only the admin can";
msg += " access user account information";
LOG.error( msg );
throw new LdapNoPermissionException( msg );
@@ -467,8 +467,8 @@
return;
}
- String msg = "Access to group '" + normalizedDn.getUpName() + "' not permitted";
- msg += " for user '" + principalDn.getUpName() + "'. Only the admin can";
+ String msg = "Access to group '" + normalizedDn.getName() + "' not permitted";
+ msg += " for user '" + principalDn.getName() + "'. Only the admin can";
msg += " access group information";
LOG.error( msg );
throw new LdapNoPermissionException( msg );
@@ -484,7 +484,7 @@
}
String msg = "Access to admin account not permitted for user '";
- msg += principalDn.getUpName() + "'. Only the admin can";
+ msg += principalDn.getName() + "'. Only the admin can";
msg += " access admin account information";
LOG.error( msg );
throw new LdapNoPermissionException( msg );
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Sun Jan 3 15:04:50 2010
@@ -157,7 +157,7 @@
}
else
{
- LOG.warn( "Found group '{}' without any member or uniqueMember attributes", groupDn.getUpName() );
+ LOG.warn( "Found group '{}' without any member or uniqueMember attributes", groupDn.getName() );
}
}
@@ -296,7 +296,7 @@
if ( IS_DEBUG )
{
- LOG.debug( "group cache contents after adding '{}' :\n {}", name.getUpName(), groups );
+ LOG.debug( "group cache contents after adding '{}' :\n {}", name.getName(), groups );
}
}
@@ -321,7 +321,7 @@
if ( IS_DEBUG )
{
- LOG.debug( "group cache contents after deleting '{}' :\n {}", name.getUpName(), groups );
+ LOG.debug( "group cache contents after deleting '{}' :\n {}", name.getName(), groups );
}
}
@@ -414,7 +414,7 @@
if ( IS_DEBUG )
{
- LOG.debug( "group cache contents after modifying '{}' :\n {}", name.getUpName(), groups );
+ LOG.debug( "group cache contents after modifying '{}' :\n {}", name.getName(), groups );
}
}
@@ -446,7 +446,7 @@
if ( IS_DEBUG )
{
- LOG.debug( "group cache contents after modifying '{}' :\n {}", name.getUpName(), groups );
+ LOG.debug( "group cache contents after modifying '{}' :\n {}", name.getName(), groups );
}
}
@@ -543,7 +543,7 @@
if ( IS_DEBUG )
{
- LOG.debug( "group cache contents after renaming '{}' :\n{}", oldName.getUpName(), groups );
+ LOG.debug( "group cache contents after renaming '{}' :\n{}", oldName.getName(), groups );
}
return true;
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java Sun Jan 3 15:04:50 2010
@@ -270,7 +270,7 @@
if ( ( attr != null ) &&
( ( attr.contains( userName.toNormName() ) ||
- ( attr.contains( userName.getUpName() ) ) ) ) )
+ ( attr.contains( userName.getName() ) ) ) ) )
{
return true;
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Sun Jan 3 15:04:50 2010
@@ -347,7 +347,7 @@
forward.setDn( opCtx.getDn() );
forward.setDeleteOldRdn( opCtx.getDelOldDn() );
forward.setNewRdn( opCtx.getNewRdn().getUpName() );
- forward.setNewSuperior( opCtx.getParent().getUpName() );
+ forward.setNewSuperior( opCtx.getParent().getName() );
List<LdifEntry> reverses = LdifRevertor.reverseMoveAndRename(
serverEntry, opCtx.getParent(), new Rdn( opCtx.getNewRdn() ), false );
@@ -367,7 +367,7 @@
LdifEntry forward = new LdifEntry();
forward.setChangeType( ChangeType.ModDn );
forward.setDn( opCtx.getDn() );
- forward.setNewSuperior( opCtx.getParent().getUpName() );
+ forward.setNewSuperior( opCtx.getParent().getName() );
LdifEntry reverse = LdifRevertor.reverseMove( opCtx.getParent(), opCtx.getDn() );
opCtx.setChangeLogEvent( changeLog.log( getPrincipal(), forward, reverse ) );
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Sun Jan 3 15:04:50 2010
@@ -145,8 +145,8 @@
// check if the entry already exists
if ( nextInterceptor.hasEntry( new EntryOperationContext( opContext.getSession(), name ) ) )
{
- LdapNameAlreadyBoundException ne = new LdapNameAlreadyBoundException( name.getUpName() + " already exists!" );
- ne.setResolvedName( new LdapDN( name.getUpName() ) );
+ LdapNameAlreadyBoundException ne = new LdapNameAlreadyBoundException( name.getName() + " already exists!" );
+ ne.setResolvedName( new LdapDN( name.getName() ) );
throw ne;
}
@@ -183,10 +183,10 @@
}
catch ( Exception e )
{
- LdapNameNotFoundException e2 = new LdapNameNotFoundException( "Parent " + parentDn.getUpName()
+ LdapNameNotFoundException e2 = new LdapNameNotFoundException( "Parent " + parentDn.getName()
+ " not found" );
e2.setResolvedName( new LdapDN( nexus.getMatchedName(
- new GetMatchedNameOperationContext( opContext.getSession(), parentDn ) ).getUpName() ) );
+ new GetMatchedNameOperationContext( opContext.getSession(), parentDn ) ).getName() ) );
throw e2;
}
@@ -194,10 +194,10 @@
if ( objectClass.contains( SchemaConstants.ALIAS_OC ) )
{
- String msg = "Attempt to add entry to alias '" + name.getUpName() + "' not allowed.";
+ String msg = "Attempt to add entry to alias '" + name.getName() + "' not allowed.";
ResultCodeEnum rc = ResultCodeEnum.ALIAS_PROBLEM;
LdapNamingException e = new LdapNamingException( msg, rc );
- e.setResolvedName( new LdapDN( parentDn.getUpName() ) );
+ e.setResolvedName( new LdapDN( parentDn.getName() ) );
throw e;
}
else
@@ -247,7 +247,7 @@
if ( hasChildren )
{
LdapContextNotEmptyException e = new LdapContextNotEmptyException();
- e.setResolvedName( new LdapDN( name.getUpName() ) );
+ e.setResolvedName( new LdapDN( name.getName() ) );
throw e;
}
@@ -381,8 +381,8 @@
// This is a nonsense : we can't rename an entry which does not exist
// on the server
LdapNameNotFoundException ldnfe;
- ldnfe = new LdapNameNotFoundException( "target entry " + dn.getUpName() + " des not exist!" );
- ldnfe.setResolvedName( new LdapDN( dn.getUpName() ) );
+ ldnfe = new LdapNameNotFoundException( "target entry " + dn.getName() + " des not exist!" );
+ ldnfe.setResolvedName( new LdapDN( dn.getName() ) );
throw ldnfe;
}
@@ -392,8 +392,8 @@
if ( nextInterceptor.hasEntry( new EntryOperationContext( opContext.getSession(), newDn ) ) )
{
LdapNameAlreadyBoundException e;
- e = new LdapNameAlreadyBoundException( "target entry " + newDn.getUpName() + " already exists!" );
- e.setResolvedName( new LdapDN( newDn.getUpName() ) );
+ e = new LdapNameAlreadyBoundException( "target entry " + newDn.getName() + " already exists!" );
+ e.setResolvedName( new LdapDN( newDn.getName() ) );
throw e;
}
@@ -443,13 +443,13 @@
if ( nextInterceptor.hasEntry( new EntryOperationContext( opContext.getSession(), target ) ) )
{
// we must calculate the resolved name using the user provided Rdn value
- String upRdn = new LdapDN( oriChildName.getUpName() ).get( oriChildName.size() - 1 );
+ String upRdn = new LdapDN( oriChildName.getName() ).get( oriChildName.size() - 1 );
LdapDN upTarget = ( LdapDN ) newParentName.clone();
upTarget.add( upRdn );
LdapNameAlreadyBoundException e;
- e = new LdapNameAlreadyBoundException( "target entry " + upTarget.getUpName() + " already exists!" );
- e.setResolvedName( new LdapDN( upTarget.getUpName() ) );
+ e = new LdapNameAlreadyBoundException( "target entry " + upTarget.getName() + " already exists!" );
+ e.setResolvedName( new LdapDN( upTarget.getName() ) );
throw e;
}
@@ -502,8 +502,8 @@
upTarget.add( opContext.getNewRdn() );
LdapNameAlreadyBoundException e;
- e = new LdapNameAlreadyBoundException( "target entry " + upTarget.getUpName() + " already exists!" );
- e.setResolvedName( new LdapDN( upTarget.getUpName() ) );
+ e = new LdapNameAlreadyBoundException( "target entry " + upTarget.getName() + " already exists!" );
+ e.setResolvedName( new LdapDN( upTarget.getName() ) );
throw e;
}
@@ -574,17 +574,17 @@
if ( msg != null )
{
- e = new LdapNameNotFoundException( msg + dn.getUpName() );
+ e = new LdapNameNotFoundException( msg + dn.getName() );
}
else
{
- e = new LdapNameNotFoundException( dn.getUpName() );
+ e = new LdapNameNotFoundException( dn.getName() );
}
e.setResolvedName(
new LdapDN(
opContext.getSession().getDirectoryService().getOperationManager().getMatchedName(
- new GetMatchedNameOperationContext( opContext.getSession(), dn ) ).getUpName() ) );
+ new GetMatchedNameOperationContext( opContext.getSession(), dn ) ).getName() ) );
throw e;
}
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Sun Jan 3 15:04:50 2010
@@ -517,7 +517,7 @@
LdapDN creatorsName = new LdapDN( attr.getString() );
attr.clear();
- attr.add( denormalizeTypes( creatorsName ).getUpName() );
+ attr.add( denormalizeTypes( creatorsName ).getName() );
}
attr = entry.get( SchemaConstants.MODIFIERS_NAME_AT );
@@ -527,7 +527,7 @@
LdapDN modifiersName = new LdapDN( attr.getString() );
attr.clear();
- attr.add( denormalizeTypes( modifiersName ).getUpName() );
+ attr.add( denormalizeTypes( modifiersName ).getName() );
}
attr = entry.get( ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT );
@@ -537,7 +537,7 @@
LdapDN modifiersName = new LdapDN( attr.getString() );
attr.clear();
- attr.add( denormalizeTypes( modifiersName ).getUpName() );
+ attr.add( denormalizeTypes( modifiersName ).getName() );
}
}
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Sun Jan 3 15:04:50 2010
@@ -330,7 +330,7 @@
system.add( addOperationContext );
}
- String key = system.getSuffixDn().getUpName();
+ String key = system.getSuffixDn().getName();
if ( partitions.containsKey( key ) )
{
@@ -347,12 +347,12 @@
{
namingContexts = new DefaultServerAttribute(
schemaManager.lookupAttributeTypeRegistry( SchemaConstants.NAMING_CONTEXTS_AT ),
- system.getSuffixDn().getUpName() );
+ system.getSuffixDn().getName() );
rootDSE.put( namingContexts );
}
else
{
- namingContexts.add( system.getSuffixDn().getUpName() );
+ namingContexts.add( system.getSuffixDn().getName() );
}
}
@@ -899,12 +899,12 @@
if ( namingContexts == null )
{
namingContexts = new DefaultServerAttribute(
- schemaManager.lookupAttributeTypeRegistry( SchemaConstants.NAMING_CONTEXTS_AT ), partitionSuffix.getUpName() );
+ schemaManager.lookupAttributeTypeRegistry( SchemaConstants.NAMING_CONTEXTS_AT ), partitionSuffix.getName() );
rootDSE.put( namingContexts );
}
else
{
- namingContexts.add( partitionSuffix.getUpName() );
+ namingContexts.add( partitionSuffix.getName() );
}
}
}
@@ -928,7 +928,7 @@
throw new NameNotFoundException( msg );
}
- String partitionSuffix = partition.getSuffixDn().getUpName();
+ String partitionSuffix = partition.getSuffixDn().getName();
// Retrieve the namingContexts from the RootDSE : the partition
// suffix must be present in those namingContexts
@@ -1082,10 +1082,10 @@
if ( namingContexts != null )
{
- namingContexts.remove( partition.getSuffixDn().getUpName() );
+ namingContexts.remove( partition.getSuffixDn().getName() );
}
- partitions.remove( partition.getSuffixDn().getUpName() );
+ partitions.remove( partition.getSuffixDn().getName() );
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java Sun Jan 3 15:04:50 2010
@@ -166,7 +166,7 @@
content.add( mainPnl, java.awt.BorderLayout.NORTH );
getContentPane().add( content, BorderLayout.CENTER );
// set title
- setTitle( "Partition: " + this.partition.getSuffixDn().getUpName() );
+ setTitle( "Partition: " + this.partition.getSuffixDn().getName() );
// add status bar
getContentPane().add( statusBar, BorderLayout.SOUTH );
// add menu bar
@@ -374,7 +374,7 @@
try
{
TreePath path = tree.getSelectionModel().getSelectionPath();
- String parentDn = partition.getSuffixDn().getUpName();
+ String parentDn = partition.getSuffixDn().getName();
if ( null != path )
{
@@ -419,7 +419,7 @@
if ( null == path )
{
- return partition.getSuffixDn().getUpName();
+ return partition.getSuffixDn().getName();
}
Object last = path.getLastPathComponent();
@@ -438,7 +438,7 @@
}
else
{
- base = partition.getSuffixDn().getUpName();
+ base = partition.getSuffixDn().getName();
}
return base;
@@ -463,7 +463,7 @@
for ( LdifEntry entry:new LdifReader( in ) )
{
- String updn = entry.getDn().getUpName();
+ String updn = entry.getDn().getName();
LdapDN ndn = new LdapDN( StringTools.deepTrimToLower( updn ) );
@@ -570,7 +570,7 @@
}
else
{
- dialog.setBase( partition.getSuffixDn().getUpName() );
+ dialog.setBase( partition.getSuffixDn().getName() );
}
dialog.addActionListener( new ActionListener()
@@ -885,7 +885,7 @@
nodes = new HashMap<Long, EntryNode>();
ServerEntry suffix = partition.lookup( partition.getEntryId( partition.getSuffixDn().toNormName() ) );
- Long id = partition.getEntryId( partition.getSuffixDn().getUpName() );
+ Long id = partition.getEntryId( partition.getSuffixDn().getName() );
root = new EntryNode( id, null, partition, suffix, nodes );
/*
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java Sun Jan 3 15:04:50 2010
@@ -115,7 +115,7 @@
LdapDN parentDn = ( ( ServerSystemPreferences ) parent() ).dn;
try
{
- dn = new LdapDN( "prefNodeName=" + name + "," + parentDn.getUpName() );
+ dn = new LdapDN( "prefNodeName=" + name + "," + parentDn.getName() );
dn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
if ( ! directoryService.getAdminSession().exists( dn ) )
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Sun Jan 3 15:04:50 2010
@@ -1776,7 +1776,7 @@
if ( !allowed.contains( attrOid ) )
{
throw new LdapSchemaViolationException( "Attribute " + attribute.getUpId()
- + " not declared in objectClasses of entry " + dn.getUpName(),
+ + " not declared in objectClasses of entry " + dn.getName(),
ResultCodeEnum.OBJECT_CLASS_VIOLATION );
}
}
@@ -1823,7 +1823,7 @@
if ( must.size() != 0 )
{
throw new LdapSchemaViolationException( "Required attributes " + must + " not found within entry "
- + dn.getUpName(), ResultCodeEnum.OBJECT_CLASS_VIOLATION );
+ + dn.getName(), ResultCodeEnum.OBJECT_CLASS_VIOLATION );
}
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Sun Jan 3 15:04:50 2010
@@ -449,7 +449,7 @@
}
catch ( Exception e )
{
- String msg = "Failed while parsing subtreeSpecification for " + name.getUpName();
+ String msg = "Failed while parsing subtreeSpecification for " + name.getName();
LOG.warn( msg );
throw new LdapInvalidAttributeValueException( msg, ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX );
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java Sun Jan 3 15:04:50 2010
@@ -53,7 +53,7 @@
public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws NamingException
{
// Return a safe copy constructed with user provided name.
- return new LdapDN( addedEntryName.getUpName() );
+ return new LdapDN( addedEntryName.getName() );
}
};
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java Sun Jan 3 15:04:50 2010
@@ -54,7 +54,7 @@
public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws Exception
{
// Return a safe copy constructed with user provided name.
- return new LdapDN( deletedEntryName.getUpName() );
+ return new LdapDN( deletedEntryName.getName() );
}
};
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java Sun Jan 3 15:04:50 2010
@@ -70,7 +70,7 @@
public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws NamingException
{
// Return a safe copy constructed with user provided name.
- return new LdapDN( oldDN.getUpName() );
+ return new LdapDN( oldDN.getName() );
}
};
@@ -106,7 +106,7 @@
public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws NamingException
{
// Return a safe copy constructed with user provided name.
- return new LdapDN( newSuperiorDN.getUpName() );
+ return new LdapDN( newSuperiorDN.getName() );
}
};
@@ -118,7 +118,7 @@
public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws NamingException
{
// Return a safe copy constructed with user provided name.
- return new LdapDN( oldRDN.getUpName() );
+ return new LdapDN( oldRDN.getName() );
}
};
@@ -130,7 +130,7 @@
public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws NamingException
{
// Return a safe copy constructed with user provided name.
- return new LdapDN( oldSuperiorDN.getUpName() );
+ return new LdapDN( oldSuperiorDN.getName() );
}
};
@@ -142,7 +142,7 @@
public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws NamingException
{
// Return a safe copy constructed with user provided name.
- return new LdapDN( newDN.getUpName() );
+ return new LdapDN( newDN.getName() );
}
};
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java Sun Jan 3 15:04:50 2010
@@ -62,7 +62,7 @@
public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws NamingException
{
// Return a safe copy constructed with user provided name.
- return new LdapDN( modifiedEntryName.getUpName() );
+ return new LdapDN( modifiedEntryName.getName() );
}
};
Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java Sun Jan 3 15:04:50 2010
@@ -55,7 +55,7 @@
LdapDN dn = ( LdapDN ) PreferencesUtils.toSysDn( test );
- assertEquals( expectedDN, dn.getUpName() );
+ assertEquals( expectedDN, dn.getName() );
// simple test without trailing '/'
@@ -63,7 +63,7 @@
dn = ( LdapDN ) PreferencesUtils.toSysDn( test );
- assertEquals( expectedDN, dn.getUpName() );
+ assertEquals( expectedDN, dn.getName() );
// basis condition tests
@@ -71,7 +71,7 @@
dn = ( LdapDN ) PreferencesUtils.toSysDn( test );
- assertEquals( ServerDNConstants.SYSPREFROOT_SYSTEM_DN, dn.getUpName() );
+ assertEquals( ServerDNConstants.SYSPREFROOT_SYSTEM_DN, dn.getName() );
// endpoint tests
@@ -79,7 +79,7 @@
dn = ( LdapDN ) PreferencesUtils.toSysDn( test );
- assertEquals( ServerDNConstants.SYSPREFROOT_SYSTEM_DN, dn.getUpName() );
+ assertEquals( ServerDNConstants.SYSPREFROOT_SYSTEM_DN, dn.getName() );
}
}
Modified: directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Sun Jan 3 15:04:50 2010
@@ -134,7 +134,7 @@
if ( ( entry.get( SchemaConstants.USER_PASSWORD_AT ) != null ) &&
( entry.get( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ) != null ) )
{
- log.debug( "Adding the entry '{}' for DN '{}'.", entry, normName.getUpName() );
+ log.debug( "Adding the entry '{}' for DN '{}'.", entry, normName.getName() );
ServerBinaryValue userPassword = (ServerBinaryValue)entry.get( SchemaConstants.USER_PASSWORD_AT ).get();
String strUserPassword = userPassword.getString();
@@ -162,7 +162,7 @@
entry.put( getKeyAttribute( addContext.getSession().getDirectoryService().getSchemaManager(), keys ) );
log.debug( "Adding modified entry '{}' for DN '{}'.", entry, normName
- .getUpName() );
+ .getName() );
}
next.add( addContext );
@@ -312,7 +312,7 @@
else
{
subContext.isPrincipal( true );
- log.debug( "DN {} is a Kerberos principal. Will attempt key derivation.", principalDn.getUpName() );
+ log.debug( "DN {} is a Kerberos principal. Will attempt key derivation.", principalDn.getName() );
}
if ( subContext.getPrincipalName() == null )
Modified: directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java Sun Jan 3 15:04:50 2010
@@ -71,7 +71,7 @@
ServerEntry entry = addContext.getEntry();
- log.debug( "Adding the entry '{}' for DN '{}'.", entry, normName.getUpName() );
+ log.debug( "Adding the entry '{}' for DN '{}'.", entry, normName.getName() );
if ( entry.get( SchemaConstants.USER_PASSWORD_AT ) != null )
{
@@ -170,13 +170,13 @@
}
// if userPassword fails checks, throw new NamingException.
- check( name.getUpName(), pwd );
+ check( name.getName(), pwd );
}
}
if ( log.isDebugEnabled() )
{
- log.debug( operation + " for entry '" + name.getUpName() + "' the attribute " + mod.getAttribute() );
+ log.debug( operation + " for entry '" + name.getName() + "' the attribute " + mod.getAttribute() );
}
}
Modified: directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java Sun Jan 3 15:04:50 2010
@@ -54,7 +54,7 @@
LdapDN suffix = new LdapDN( "dc=example, dc=com" );
Partition partition = new JdbmPartition();
- partition.setSuffix( suffix.getUpName() );
+ partition.setSuffix( suffix.getName() );
partitionLookupTree.add( suffix, partition );
@@ -67,7 +67,7 @@
assertTrue( ((DnBranchNode<Partition>)child).contains( "dc=example" ) );
child = ((DnBranchNode<Partition>)child).getChild( "dc=example" );
- assertEquals( "dc=example, dc=com", ((DnLeafNode<Partition>)child).getElement().getSuffixDn().getUpName() );
+ assertEquals( "dc=example, dc=com", ((DnLeafNode<Partition>)child).getElement().getSuffixDn().getName() );
}
@@ -81,13 +81,13 @@
LdapDN suffix1 = new LdapDN( "dc=example, dc=com" );
Partition partition1 = new JdbmPartition();
- partition1.setSuffix( suffix1.getUpName() );
+ partition1.setSuffix( suffix1.getName() );
partitionLookupTree.add( suffix1, partition1 );
LdapDN suffix2 = new LdapDN( "ou=system" );
Partition partition2 = new JdbmPartition();
- partition2.setSuffix( suffix2.getUpName() );
+ partition2.setSuffix( suffix2.getName() );
partitionLookupTree.add( suffix2, partition2 );
@@ -98,7 +98,7 @@
DnNode<Partition> child = ((DnBranchNode<Partition>)partitionLookupTree).getChild( "ou=system" );
assertTrue( child instanceof DnLeafNode );
- assertEquals( "ou=system", ((DnLeafNode<Partition>)child).getElement().getSuffixDn().getUpName() );
+ assertEquals( "ou=system", ((DnLeafNode<Partition>)child).getElement().getSuffixDn().getName() );
child = ((DnBranchNode<Partition>)partitionLookupTree).getChild( "dc=com" );
assertTrue( child instanceof DnBranchNode );
@@ -106,7 +106,7 @@
child = ((DnBranchNode<Partition>)child).getChild( "dc=example" );
assertTrue( child instanceof DnLeafNode );
- assertEquals( "dc=example, dc=com", ((DnLeafNode<Partition>)child).getElement().getSuffixDn().getUpName() );
+ assertEquals( "dc=example, dc=com", ((DnLeafNode<Partition>)child).getElement().getSuffixDn().getName() );
}
@@ -120,13 +120,13 @@
LdapDN suffix1 = new LdapDN( "dc=com" );
Partition partition1 = new JdbmPartition();
- partition1.setSuffix( suffix1.getUpName() );
+ partition1.setSuffix( suffix1.getName() );
partitionLookupTree.add( suffix1, partition1 );
LdapDN suffix2 = new LdapDN( "dc=example, dc=com" );
Partition partition2 = new JdbmPartition();
- partition2.setSuffix( suffix2.getUpName() );
+ partition2.setSuffix( suffix2.getName() );
try
{
@@ -150,13 +150,13 @@
LdapDN suffix1 = new LdapDN( "dc=example1, dc=com" );
Partition partition1 = new JdbmPartition();
- partition1.setSuffix( suffix1.getUpName() );
+ partition1.setSuffix( suffix1.getName() );
partitionLookupTree.add( suffix1, partition1 );
LdapDN suffix2 = new LdapDN( "dc=example2, dc=com" );
Partition partition2 = new JdbmPartition();
- partition2.setSuffix( suffix2.getUpName() );
+ partition2.setSuffix( suffix2.getName() );
partitionLookupTree.add( suffix2, partition2 );
@@ -175,10 +175,10 @@
DnNode<Partition> child1 = ((DnBranchNode<Partition>)child).getChild( "dc=example1" );
assertTrue( child1 instanceof DnLeafNode );
- assertEquals( "dc=example1, dc=com", ((DnLeafNode<Partition>)child1).getElement().getSuffixDn().getUpName() );
+ assertEquals( "dc=example1, dc=com", ((DnLeafNode<Partition>)child1).getElement().getSuffixDn().getName() );
DnNode<Partition> child2 = ((DnBranchNode<Partition>)child).getChild( "dc=example1" );
assertTrue( child2 instanceof DnLeafNode );
- assertEquals( "dc=example1, dc=com", ((DnLeafNode<Partition>)child2).getElement().getSuffixDn().getUpName() );
+ assertEquals( "dc=example1, dc=com", ((DnLeafNode<Partition>)child2).getElement().getSuffixDn().getName() );
}
}
Modified: directory/apacheds/branches/apacheds-schema/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/apacheds/branches/apacheds-schema/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Sun Jan 3 15:04:50 2010
@@ -1058,7 +1058,7 @@
if ( !normalizedAliasTargetDn.startsWith( normSuffix ) )
{
String msg = "[36] aliasDereferencingProblem - "
- + " the alias points to an entry outside of the " + upSuffix.getUpName()
+ + " the alias points to an entry outside of the " + upSuffix.getName()
+ " namingContext to an object whose existence cannot be determined.";
ResultCodeEnum rc = ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM;
LdapNamingException e = new LdapNamingException( msg, rc );
@@ -1079,7 +1079,7 @@
{
// Complain about target not existing
String msg = "[33] aliasProblem - "
- + "the alias '" + aliasDn.getUpName() + "' when dereferenced would not name a known object."
+ + "the alias '" + aliasDn.getName() + "' when dereferenced would not name a known object."
+ "The aliased ObjectName '" + aliasTarget + "' must be set to a valid existing entry.";
ResultCodeEnum rc = ResultCodeEnum.ALIAS_PROBLEM;
LdapNamingException e = new LdapNamingException( msg, rc );
@@ -1198,7 +1198,7 @@
if ( objectClass == null )
{
- String msg = "Entry " + entryDn.getUpName() + " contains no objectClass attribute: " + entry;
+ String msg = "Entry " + entryDn.getName() + " contains no objectClass attribute: " + entry;
ResultCodeEnum rc = ResultCodeEnum.OBJECT_CLASS_VIOLATION;
NamingException e = new LdapSchemaViolationException( msg, rc );
e.setResolvedName( entryDn );
@@ -1226,7 +1226,7 @@
}
ndnIdx.add( entryDn.toNormName(), id );
- updnIdx.add( entryDn.getUpName(), id );
+ updnIdx.add( entryDn.getName(), id );
oneLevelIdx.add( parentId, id );
// Update the EntryCsn index
@@ -1234,7 +1234,7 @@
if ( entryCsn == null )
{
- String msg = "Entry " + entryDn.getUpName() + " contains no entryCsn attribute: " + entry;
+ String msg = "Entry " + entryDn.getName() + " contains no entryCsn attribute: " + entry;
throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_VIOLATION );
}
@@ -1245,7 +1245,7 @@
if ( entryUuid == null )
{
- String msg = "Entry " + entryDn.getUpName() + " contains no entryUuid attribute: " + entry;
+ String msg = "Entry " + entryDn.getName() + " contains no entryUuid attribute: " + entry;
throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_VIOLATION );
}
@@ -1924,7 +1924,7 @@
// update user provided DN index
updnIdx.drop( id );
- updnIdx.add( updn.getUpName(), id );
+ updnIdx.add( updn.getName(), id );
/*
* Read Alias Index Tuples
Modified: directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Sun Jan 3 15:04:50 2010
@@ -345,7 +345,7 @@
assertEquals( 11, store.count() );
assertEquals( "o=Good Times Co.", store.getEntryUpdn( dn.toNormName() ) );
assertEquals( dn.toNormName(), store.getEntryDn( 1L ) );
- assertEquals( dn.getUpName(), store.getEntryUpdn( 1L ) );
+ assertEquals( dn.getName(), store.getEntryUpdn( 1L ) );
// note that the suffix entry returns 0 for it's parent which does not exist
assertEquals( 0L, ( long ) store.getParentId( dn.toNormName() ) );
Modified: directory/apacheds/branches/apacheds-schema/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java (original)
+++ directory/apacheds/branches/apacheds-schema/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java Sun Jan 3 15:04:50 2010
@@ -94,7 +94,7 @@
{
PrincipalStoreEntryModifier modifier = new PrincipalStoreEntryModifier();
- modifier.setDistinguishedName( entry.getDn().getUpName() );
+ modifier.setDistinguishedName( entry.getDn().getName() );
String principal = entry.get( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ).getString();
modifier.setPrincipal( new KerberosPrincipal( principal ) );
Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java Sun Jan 3 15:04:50 2010
@@ -93,7 +93,7 @@
LdapConnection connection = new LdapConnection( "localhost", ldapServer.getPort() );
LdapDN dn = new LdapDN( "uid=admin,ou=system" );
- connection.bind( dn.getUpName(), "secret" );
+ connection.bind( dn.getName(), "secret" );
List<String> controlList = connection.getSupportedConrols();
assertNotNull( controlList );
Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java Sun Jan 3 15:04:50 2010
@@ -200,7 +200,7 @@
LdapConnection connection = new LdapConnection( config );
LdapDN dn = new LdapDN( "uid=admin,ou=system" );
- connection.bind( dn.getUpName(), "secret" );
+ connection.bind( dn.getName(), "secret" );
List<String> controlList = connection.getSupportedConrols();
assertNotNull( controlList );
Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java Sun Jan 3 15:04:50 2010
@@ -80,7 +80,7 @@
connection = new LdapConnection( "localhost", ldapServer.getPort() );
LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
connection.setTimeOut( 0L );
- connection.bind( bindDn.getUpName(), "secret" );
+ connection.bind( bindDn.getName(), "secret" );
session = ldapServer.getDirectoryService().getSession();
}
Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java Sun Jan 3 15:04:50 2010
@@ -68,7 +68,7 @@
{
connection = new LdapConnection( "localhost", ldapServer.getPort() );
LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
- connection.bind( bindDn.getUpName(), "secret" );
+ connection.bind( bindDn.getName(), "secret" );
session = ldapServer.getDirectoryService().getSession();
}
Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java Sun Jan 3 15:04:50 2010
@@ -63,7 +63,7 @@
{
connection = new LdapConnection( "localhost", ldapServer.getPort() );
LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
- connection.bind( bindDn.getUpName(), "secret" );
+ connection.bind( bindDn.getName(), "secret" );
session = ldapServer.getDirectoryService().getSession();
}
@@ -78,7 +78,7 @@
assertNotNull( response );
assertTrue( response.isTrue() );
- response = connection.compare( dn.getUpName(), SchemaConstants.USER_PASSWORD_AT, "secret".getBytes() );
+ response = connection.compare( dn.getName(), SchemaConstants.USER_PASSWORD_AT, "secret".getBytes() );
assertNotNull( response );
assertTrue( response.isTrue() );
}
Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java Sun Jan 3 15:04:50 2010
@@ -105,7 +105,7 @@
connection = new LdapConnection( "localhost", ldapServer.getPort() );
LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
- connection.bind( bindDn.getUpName(), "secret" );
+ connection.bind( bindDn.getName(), "secret" );
session = ldapServer.getDirectoryService().getAdminSession();
}
@@ -124,7 +124,7 @@
assertTrue( session.exists( dn ) );
- DeleteResponse response = connection.delete( dn.getUpName() );
+ DeleteResponse response = connection.delete( dn.getName() );
assertNotNull( response );
assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
@@ -138,7 +138,7 @@
LdapDN dn = new LdapDN( "cn=child1,cn=parent,ou=system" ); // has children
assertTrue( session.exists( dn ) );
- DeleteResponse response = connection.delete( dn.getUpName() );
+ DeleteResponse response = connection.delete( dn.getName() );
assertNotNull( response );
assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_NON_LEAF, response.getLdapResult().getResultCode() );
Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java Sun Jan 3 15:04:50 2010
@@ -63,7 +63,7 @@
{
connection = new LdapConnection( "localhost", ldapServer.getPort() );
LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
- connection.bind( bindDn.getUpName(), "secret" );
+ connection.bind( bindDn.getName(), "secret" );
}
Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java Sun Jan 3 15:04:50 2010
@@ -77,7 +77,7 @@
connection = new LdapConnection( "localhost", ldapServer.getPort() );
LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
- connection.bind( bindDn.getUpName(), "secret" );
+ connection.bind( bindDn.getName(), "secret" );
session = ldapServer.getDirectoryService().getAdminSession();
}
Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Sun Jan 3 15:04:50 2010
@@ -71,7 +71,7 @@
connection = new LdapConnection( "localhost", ldapServer.getPort() );
LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
- connection.bind( bindDn.getUpName(), "secret" );
+ connection.bind( bindDn.getName(), "secret" );
session = ldapServer.getDirectoryService().getAdminSession();
}
Modified: directory/apacheds/branches/apacheds-schema/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java (original)
+++ directory/apacheds/branches/apacheds-schema/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java Sun Jan 3 15:04:50 2010
@@ -163,7 +163,7 @@
{
// Initialize the AvlPartition
wrappedPartition.setId( id );
- wrappedPartition.setSuffix( suffix.getUpName() );
+ wrappedPartition.setSuffix( suffix.getName() );
wrappedPartition.setSchemaManager( schemaManager );
wrappedPartition.initialize();
Modified: directory/apacheds/branches/apacheds-schema/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java (original)
+++ directory/apacheds/branches/apacheds-schema/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java Sun Jan 3 15:04:50 2010
@@ -97,7 +97,7 @@
*/
public void loadConfig() throws Exception
{
- String upsuffixDir = wrappedStore.getUpSuffix().getUpName().toLowerCase();
+ String upsuffixDir = wrappedStore.getUpSuffix().getName().toLowerCase();
File dir = new File( workingDirectory, upsuffixDir );
if( ! dir.exists() )
@@ -198,7 +198,7 @@
ServerEntry entry = lookup( id );
LOG.warn( "deleting the entry with id {} and dn {}", id, entry.getDn() );
- LOG.warn( "having the parent id {}", getParentId( entry.getDn().getUpName() ) );
+ LOG.warn( "having the parent id {}", getParentId( entry.getDn().getName() ) );
wrappedStore.delete( id );
if( entry != null )
Modified: directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java (original)
+++ directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java Sun Jan 3 15:04:50 2010
@@ -220,7 +220,7 @@
LOG.error( "Bad URL ({}) for ref in {}. Reference will be ignored.", ref, referralAncestor );
}
- LdapDN urlDn = new LdapDN( ldapUrl.getDn().getUpName() );
+ LdapDN urlDn = new LdapDN( ldapUrl.getDn().getName() );
urlDn.normalize( session.getCoreSession().getDirectoryService().getSchemaManager()
.getNormalizerMapping() );
@@ -251,7 +251,7 @@
// TODO - fix this by access unormalized RDN values
// seems we have to do this because get returns normalized rdns
- LdapDN reqUnnormalizedDn = new LdapDN( reqTargetDn.getUpName() );
+ LdapDN reqUnnormalizedDn = new LdapDN( reqTargetDn.getName() );
for ( int jj = 0; jj < diff; jj++ )
{
extra.add( reqUnnormalizedDn.get( referralAncestor.getDn().size() + jj ) );
@@ -270,7 +270,7 @@
}
buf.append( "/" );
- buf.append( LdapURL.urlEncode( urlDn.getUpName(), false ) );
+ buf.append( LdapURL.urlEncode( urlDn.getName(), false ) );
referral.addLdapUrl( buf.toString() );
}
@@ -320,7 +320,7 @@
}
// Normalize the DN to check for same dn
- LdapDN urlDn = new LdapDN( ldapUrl.getDn().getUpName() );
+ LdapDN urlDn = new LdapDN( ldapUrl.getDn().getName() );
urlDn.normalize( session.getCoreSession().getDirectoryService().getSchemaManager()
.getNormalizerMapping() );
@@ -343,7 +343,7 @@
// TODO - fix this by access unormalized RDN values
// seems we have to do this because get returns normalized rdns
- LdapDN reqUnnormalizedDn = new LdapDN( req.getBase().getUpName() );
+ LdapDN reqUnnormalizedDn = new LdapDN( req.getBase().getName() );
for ( int jj = 0; jj < diff; jj++ )
{
extra.add( reqUnnormalizedDn.get( referralAncestor.getDn().size() + jj ) );
Modified: directory/apacheds/branches/apacheds-schema/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java Sun Jan 3 15:04:50 2010
@@ -150,12 +150,12 @@
if ( "example".equalsIgnoreCase( partition.getId() ) )
{
assertTrue( partition.isInitialized() );
- assertEquals( "dc=example,dc=com", partition.getSuffixDn().getUpName() );
+ assertEquals( "dc=example,dc=com", partition.getSuffixDn().getName() );
}
else if ( "schema".equalsIgnoreCase( partition.getId() ) )
{
assertTrue( partition.isInitialized() );
- assertEquals( "ou=schema", partition.getSuffixDn().getUpName() );
+ assertEquals( "ou=schema", partition.getSuffixDn().getName() );
}
}
@@ -217,12 +217,12 @@
if ( "example".equalsIgnoreCase( partition.getId() ) )
{
assertTrue( partition.isInitialized() );
- assertEquals( "dc=example,dc=com", partition.getSuffixDn().getUpName() );
+ assertEquals( "dc=example,dc=com", partition.getSuffixDn().getName() );
}
else if ( "schema".equalsIgnoreCase( partition.getId() ) )
{
assertTrue( partition.isInitialized() );
- assertEquals( "ou=schema", partition.getSuffixDn().getUpName() );
+ assertEquals( "ou=schema", partition.getSuffixDn().getName() );
}
}
Modified: directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java Sun Jan 3 15:04:50 2010
@@ -289,7 +289,7 @@
assertNotNull( listener.result );
assertEquals( "cn=Jack Black", listener.result.getName() );
assertEquals( listener.result.control.getChangeType(), ChangeType.MODDN );
- assertEquals( ( RDN + ",ou=system" ), listener.result.control.getPreviousDn().getUpName() );
+ assertEquals( ( RDN + ",ou=system" ), listener.result.control.getPreviousDn().getName() );
tearDownListener();
}
Modified: directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java (original)
+++ directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java Sun Jan 3 15:04:50 2010
@@ -219,7 +219,7 @@
{
AddRequestCodec addRequest = new AddRequestCodec();
- String dn = ldifEntry.getDn().getUpName();
+ String dn = ldifEntry.getDn().getName();
if ( isDebugEnabled() )
{
@@ -292,7 +292,7 @@
{
DelRequestCodec delRequest = new DelRequestCodec();
- String dn = entry.getDn().getUpName();
+ String dn = entry.getDn().getName();
if ( isDebugEnabled() )
{
@@ -351,7 +351,7 @@
{
ModifyDNRequestCodec modifyDNRequest = new ModifyDNRequestCodec();
- String dn = entry.getDn().getUpName();
+ String dn = entry.getDn().getName();
if ( isDebugEnabled() )
{
@@ -415,7 +415,7 @@
{
ModifyRequestCodec modifyRequest = new ModifyRequestCodec();
- String dn = entry.getDn().getUpName();
+ String dn = entry.getDn().getName();
if ( isDebugEnabled() )
{
Modified: directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java (original)
+++ directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java Sun Jan 3 15:04:50 2010
@@ -78,7 +78,7 @@
{
Element element = root.addElement( "searchResultEntry" );
SearchResultEntryCodec searchResultEntry = ( SearchResultEntryCodec ) instance;
- element.addAttribute( "dn", searchResultEntry.getObjectName().getUpName() );
+ element.addAttribute( "dn", searchResultEntry.getObjectName().getName() );
Entry entry = searchResultEntry.getEntry();
for ( EntryAttribute attribute : entry )
Modified: directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java (original)
+++ directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java Sun Jan 3 15:04:50 2010
@@ -83,7 +83,7 @@
// DN
if ( request.getEntry() != null )
{
- element.addAttribute( "dn", request.getEntry().getDn().getUpName() );
+ element.addAttribute( "dn", request.getEntry().getDn().getName() );
}
// Attributes
Modified: directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AuthRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AuthRequestDsml.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AuthRequestDsml.java (original)
+++ directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AuthRequestDsml.java Sun Jan 3 15:04:50 2010
@@ -72,7 +72,7 @@
BindRequestCodec request = ( BindRequestCodec ) instance;
// AbandonID
- String name = request.getName().getUpName();
+ String name = request.getName().getName();
if ( ( name != null ) && ( !"".equals( name ) ) )
{
element.addAttribute( "principal", name );
Modified: directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java (original)
+++ directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java Sun Jan 3 15:04:50 2010
@@ -75,7 +75,7 @@
// DN
if ( request.getEntry() != null )
{
- element.addAttribute( "dn", request.getEntry().getUpName() );
+ element.addAttribute( "dn", request.getEntry().getName() );
}
// Assertion
Modified: directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java (original)
+++ directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java Sun Jan 3 15:04:50 2010
@@ -75,7 +75,7 @@
// DN
if ( request.getEntry() != null )
{
- element.addAttribute( "dn", request.getEntry().getUpName() );
+ element.addAttribute( "dn", request.getEntry().getName() );
}
return element;
Modified: directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java (original)
+++ directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java Sun Jan 3 15:04:50 2010
@@ -76,7 +76,7 @@
// DN
if ( request.getEntry() != null )
{
- element.addAttribute( "dn", request.getEntry().getUpName() );
+ element.addAttribute( "dn", request.getEntry().getName() );
}
// NewRDN
@@ -91,7 +91,7 @@
// NewSuperior
if ( request.getNewRDN() != null )
{
- element.addAttribute( "newSuperior", request.getNewSuperior().getUpName() );
+ element.addAttribute( "newSuperior", request.getNewSuperior().getName() );
}
return element;
Modified: directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java (original)
+++ directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java Sun Jan 3 15:04:50 2010
@@ -83,7 +83,7 @@
// DN
if ( request.getObject() != null )
{
- element.addAttribute( "dn", request.getObject().getUpName() );
+ element.addAttribute( "dn", request.getObject().getName() );
}
// Modifications
Modified: directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java (original)
+++ directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java Sun Jan 3 15:04:50 2010
@@ -91,7 +91,7 @@
// DN
if ( request.getBaseObject() != null )
{
- element.addAttribute( "dn", request.getBaseObject().getUpName() );
+ element.addAttribute( "dn", request.getBaseObject().getName() );
}
// Scope
Modified: directory/shared/branches/shared-schema/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java (original)
+++ directory/shared/branches/shared-schema/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java Sun Jan 3 15:04:50 2010
@@ -916,7 +916,7 @@
{
LOG.debug( "Unauthenticated Bind request : {}", name );
- return bind( name.getUpName(), StringTools.EMPTY_BYTES );
+ return bind( name.getName(), StringTools.EMPTY_BYTES );
}
}
@@ -955,7 +955,7 @@
}
else
{
- return bind( name.getUpName(), StringTools.getBytesUtf8( credentials ) );
+ return bind( name.getName(), StringTools.getBytesUtf8( credentials ) );
}
}
@@ -971,7 +971,7 @@
{
LOG.debug( "Bind request : {}", name );
- return bind( name.getUpName(), credentials );
+ return bind( name.getName(), credentials );
}
@@ -2139,7 +2139,7 @@
*/
private DeleteResponse deleteRecursive( LdapDN dn, Map<LdapDN, Cursor<SearchResponse>> cursorMap, DeleteListener listener ) throws LdapException
{
- LOG.debug( "searching for {}", dn.getUpName() );
+ LOG.debug( "searching for {}", dn.getName() );
DeleteResponse delResponse = null;
Cursor<SearchResponse> cursor = null;
@@ -2154,14 +2154,14 @@
if( cursor == null )
{
- cursor = search( dn.getUpName(), "(objectClass=*)", SearchScope.ONELEVEL, (String[])null );
- LOG.debug( "putting curosr for {}", dn.getUpName() );
+ cursor = search( dn.getName(), "(objectClass=*)", SearchScope.ONELEVEL, (String[])null );
+ LOG.debug( "putting curosr for {}", dn.getName() );
cursorMap.put( dn, cursor );
}
if( ! cursor.next() ) // if this is a leaf entry's DN
{
- LOG.debug( "deleting {}", dn.getUpName() );
+ LOG.debug( "deleting {}", dn.getName() );
cursorMap.remove( dn );
cursor.close();
delResponse = delete( new DeleteRequest( dn ), listener );
@@ -2182,13 +2182,13 @@
cursorMap.remove( dn );
cursor.close();
- LOG.debug( "deleting {}", dn.getUpName() );
+ LOG.debug( "deleting {}", dn.getName() );
delResponse = delete( new DeleteRequest( dn ), listener );
}
}
catch( Exception e )
{
- String msg = "Failed to delete child entries under the DN " + dn.getUpName();
+ String msg = "Failed to delete child entries under the DN " + dn.getName();
LOG.error( msg, e );
throw new LdapException( msg, e );
}