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 [1/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...
Author: elecharny
Date: Sun Jan 3 15:04:50 2010
New Revision: 895401
URL: http://svn.apache.org/viewvc?rev=895401&view=rev
Log:
o Renamed getUpName() to getName()
o deprecated getUpName()
Modified:
directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
directory/apacheds/branches/apacheds-schema/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
directory/apacheds/branches/apacheds-schema/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetRootDSEOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetSuffixOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListSuffixOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/LookupOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RemoveContextPartitionOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java
directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java
directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java
directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java
directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
directory/apacheds/branches/apacheds-schema/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
directory/apacheds/branches/apacheds-schema/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
directory/apacheds/branches/apacheds-schema/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java
directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
directory/apacheds/branches/apacheds-schema/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java
directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AuthRequestDsml.java
directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java
directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java
directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java
directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java
directory/shared/branches/shared-schema/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java
directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResultCodec.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlCodec.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDNSerializer.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/BaseSubtreeSpecification.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureParameter.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java
directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java
directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java
directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java
directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/name/FastLdapDnParserTest.java
directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java
directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDnParserTest.java
Modified: directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java (original)
+++ directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java Sun Jan 3 15:04:50 2010
@@ -98,7 +98,7 @@
// initialize the store
store.setName( getId() );
- store.setSuffixDn( suffix.getUpName() );
+ store.setSuffixDn( suffix.getName() );
Set<Index<?, ServerEntry>> userIndices = new HashSet<Index<?, ServerEntry>>();
@@ -491,7 +491,7 @@
public String getSuffix()
{
- return suffix.getUpName();
+ return suffix.getName();
}
Modified: directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java (original)
+++ directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java Sun Jan 3 15:04:50 2010
@@ -190,7 +190,7 @@
if ( objectClass == null )
{
- String msg = "Entry " + normName.getUpName() + " contains no objectClass attribute: " + entry;
+ String msg = "Entry " + normName.getName() + " contains no objectClass attribute: " + entry;
throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_VIOLATION );
}
@@ -214,7 +214,7 @@
}
ndnIdx.add( normName.toNormName(), id );
- updnIdx.add( normName.getUpName(), id );
+ updnIdx.add( normName.getName(), id );
oneLevelIdx.add( parentId, id );
// Update the EntryCsn index
@@ -222,7 +222,7 @@
if ( entryCsn == null )
{
- String msg = "Entry " + normName.getUpName() + " contains no entryCsn attribute: " + entry;
+ String msg = "Entry " + normName.getName() + " contains no entryCsn attribute: " + entry;
throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_VIOLATION );
}
@@ -233,7 +233,7 @@
if ( entryUuid == null )
{
- String msg = "Entry " + normName.getUpName() + " contains no entryUuid attribute: " + entry;
+ String msg = "Entry " + normName.getName() + " contains no entryUuid attribute: " + entry;
throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_VIOLATION );
}
@@ -552,7 +552,7 @@
try
{
- return new LdapDN( suffixDn.getUpName() );
+ return new LdapDN( suffixDn.getName() );
}
catch ( InvalidNameException e )
{
@@ -571,7 +571,7 @@
return null;
}
- return suffixDn.getUpName();
+ return suffixDn.getName();
}
@@ -892,7 +892,7 @@
// update user provided DN index
updnIdx.drop( id );
- updnIdx.add( updn.getUpName(), id );
+ updnIdx.add( updn.getName(), id );
/*
* Read Alias Index Tuples
@@ -1801,7 +1801,7 @@
{
// Complain specifically about aliases to outside naming contexts
throw new Exception( "[36] aliasDereferencingProblem -" + " the alias points to an entry outside of the "
- + suffixDn.getUpName() + " namingContext to an object whose existance cannot be" + " determined." );
+ + suffixDn.getName() + " namingContext to an object whose existance cannot be" + " determined." );
}
// L O O K U P T A R G E T I D
Modified: directory/apacheds/branches/apacheds-schema/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java Sun Jan 3 15:04:50 2010
@@ -323,7 +323,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/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java Sun Jan 3 15:04:50 2010
@@ -114,12 +114,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/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java Sun Jan 3 15:04:50 2010
@@ -147,7 +147,7 @@
*/
public String toString()
{
- return "['" + name.getUpName() + "', '" + StringTools.utf8ToString( userPassword ) +"']'";
+ return "['" + name.getName() + "', '" + StringTools.utf8ToString( userPassword ) +"']'";
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java Sun Jan 3 15:04:50 2010
@@ -122,6 +122,6 @@
*/
public String toString()
{
- return "AddContext for DN '" + getDn().getUpName() + "'" + ", added entry: " + entry;
+ return "AddContext for DN '" + getDn().getName() + "'" + ", added entry: " + entry;
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java Sun Jan 3 15:04:50 2010
@@ -204,7 +204,7 @@
*/
public String toString()
{
- return "BindContext for DN '" + getDn().getUpName() + "', credentials <" +
+ return "BindContext for DN '" + getDn().getName() + "', credentials <" +
( credentials != null ? StringTools.dumpBytes( credentials ) : "" ) + ">" +
( saslMechanism != null ? ", saslMechanism : <" + saslMechanism + ">" : "" ) +
( saslAuthId != null ? ", saslAuthId <" + saslAuthId + ">" : "" );
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java Sun Jan 3 15:04:50 2010
@@ -175,7 +175,7 @@
*/
public String toString()
{
- return "CompareContext for DN '" + getDn().getUpName() + "'" +
+ return "CompareContext for DN '" + getDn().getName() + "'" +
( ( oid != null ) ? ", oid : <" + oid + ">" : "" ) +
( ( value != null ) ? ", value :'" +
( ( !value.isBinary() ) ?
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java Sun Jan 3 15:04:50 2010
@@ -94,7 +94,7 @@
*/
public String toString()
{
- return "DeleteContext for DN '" + getDn().getUpName() + "'";
+ return "DeleteContext for DN '" + getDn().getName() + "'";
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java Sun Jan 3 15:04:50 2010
@@ -67,6 +67,6 @@
*/
public String toString()
{
- return "EntryContext for DN '" + getDn().getUpName() + "'";
+ return "EntryContext for DN '" + getDn().getName() + "'";
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameOperationContext.java Sun Jan 3 15:04:50 2010
@@ -66,6 +66,6 @@
*/
public String toString()
{
- return "GetMatchedNameContext with DN '" + getDn().getUpName() + "'";
+ return "GetMatchedNameContext with DN '" + getDn().getName() + "'";
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetRootDSEOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetRootDSEOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetRootDSEOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetRootDSEOperationContext.java Sun Jan 3 15:04:50 2010
@@ -65,6 +65,6 @@
*/
public String toString()
{
- return "GetRootDSEContext with DN '" + getDn().getUpName() + "'";
+ return "GetRootDSEContext with DN '" + getDn().getName() + "'";
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetSuffixOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetSuffixOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetSuffixOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetSuffixOperationContext.java Sun Jan 3 15:04:50 2010
@@ -66,6 +66,6 @@
*/
public String toString()
{
- return "GetSuffixOperationContext with DN '" + getDn().getUpName() + "'";
+ return "GetSuffixOperationContext with DN '" + getDn().getName() + "'";
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java Sun Jan 3 15:04:50 2010
@@ -98,6 +98,6 @@
*/
public String toString()
{
- return "List with DN '" + getDn().getUpName() + "'";
+ return "List with DN '" + getDn().getName() + "'";
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListSuffixOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListSuffixOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListSuffixOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListSuffixOperationContext.java Sun Jan 3 15:04:50 2010
@@ -67,6 +67,6 @@
*/
public String toString()
{
- return "ListSuffixOperationContext with DN '" + getDn().getUpName() + "'";
+ return "ListSuffixOperationContext with DN '" + getDn().getName() + "'";
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/LookupOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/LookupOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/LookupOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/LookupOperationContext.java Sun Jan 3 15:04:50 2010
@@ -212,6 +212,6 @@
*/
public String toString()
{
- return "LookupContext for DN '" + getDn().getUpName() + "'" + ( ( attrsId != null ) ? ", attributes : <" + StringTools.listToString( attrsId ) + ">" : "" );
+ return "LookupContext for DN '" + getDn().getName() + "'" + ( ( attrsId != null ) ? ", attributes : <" + StringTools.listToString( attrsId ) + ">" : "" );
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java Sun Jan 3 15:04:50 2010
@@ -173,7 +173,7 @@
{
StringBuilder sb = new StringBuilder();
- sb.append("ModifyContext for DN '").append( getDn().getUpName() ).append( "', modifications :\n" );
+ sb.append("ModifyContext for DN '").append( getDn().getName() ).append( "', modifications :\n" );
if ( modItems != null )
{
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java Sun Jan 3 15:04:50 2010
@@ -118,7 +118,7 @@
{
if ( newDn == null )
{
- newDn = new LdapDN( getParent().getUpName() );
+ newDn = new LdapDN( getParent().getName() );
newDn.add( getNewRdn().getUpName() );
newDn.normalize( session.getDirectoryService()
.getSchemaManager().getNormalizerMapping() );
@@ -133,7 +133,7 @@
*/
public String toString()
{
- return "ReplaceContext for old DN '" + getDn().getUpName() + "'" +
+ return "ReplaceContext for old DN '" + getDn().getName() + "'" +
", parent '" + parent + "'";
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java Sun Jan 3 15:04:50 2010
@@ -121,7 +121,7 @@
*/
public String toString()
{
- return "ReplaceContext for old DN '" + getDn().getUpName() + "'" +
+ return "ReplaceContext for old DN '" + getDn().getName() + "'" +
", parent '" + parent + "'";
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RemoveContextPartitionOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RemoveContextPartitionOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RemoveContextPartitionOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RemoveContextPartitionOperationContext.java Sun Jan 3 15:04:50 2010
@@ -68,6 +68,6 @@
*/
public String toString()
{
- return "RemoveContextPartitionOperationContext for DN '" + getDn().getUpName() + "'";
+ return "RemoveContextPartitionOperationContext for DN '" + getDn().getName() + "'";
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java Sun Jan 3 15:04:50 2010
@@ -196,7 +196,7 @@
*/
public String toString()
{
- return "RenameContext for old DN '" + getDn().getUpName() + "'" +
+ return "RenameContext for old DN '" + getDn().getName() + "'" +
", new RDN '" + newRdn + "'" +
( delOldDn ? ", delete old Dn" : "" ) ;
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java Sun Jan 3 15:04:50 2010
@@ -160,7 +160,7 @@
*/
public String toString()
{
- return "SearchContext for DN '" + getDn().getUpName() + "', filter :'"
+ return "SearchContext for DN '" + getDn().getName() + "', filter :'"
+ filter + "'";
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java Sun Jan 3 15:04:50 2010
@@ -217,7 +217,7 @@
*/
public String toString()
{
- return "ListOperationContext with DN '" + getDn().getUpName() + "'";
+ return "ListOperationContext with DN '" + getDn().getName() + "'";
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java Sun Jan 3 15:04:50 2010
@@ -64,6 +64,6 @@
*/
public String toString()
{
- return "UnbindContext for DN '" + getDn().getUpName() + "'";
+ return "UnbindContext for DN '" + getDn().getName() + "'";
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java Sun Jan 3 15:04:50 2010
@@ -321,7 +321,7 @@
public String getSuffix()
{
- return suffix.getUpName();
+ return suffix.getName();
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java Sun Jan 3 15:04:50 2010
@@ -91,12 +91,12 @@
{
if ( schemaManager.add( attributeType ) )
{
- LOG.debug( "Added {} into the enabled schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "Added {} into the enabled schema {}", dn.getName(), schemaName );
}
else
{
// We have some error : reject the addition and get out
- String msg = "Cannot add the AttributeType " + entry.getDn().getUpName() + " into the registries, "
+ String msg = "Cannot add the AttributeType " + entry.getDn().getName() + " into the registries, "
+ "the resulting registries would be inconsistent :" +
StringTools.listToString( schemaManager.getErrors() );
LOG.info( msg );
@@ -161,7 +161,7 @@
{
// The schema is disabled, nothing to do.
LOG.debug( "The AttributeType {} cannot be removed from the disabled schema {}.",
- dn.getUpName(), schemaName );
+ dn.getName(), schemaName );
return;
}
@@ -178,7 +178,7 @@
else
{
// We have some error : reject the deletion and get out
- String msg = "Cannot delete the AttributeType " + entry.getDn().getUpName() + " from the registries, "
+ String msg = "Cannot delete the AttributeType " + entry.getDn().getName() + " from the registries, "
+ "the resulting registries would be inconsistent :" +
StringTools.listToString( schemaManager.getErrors() );
LOG.info( msg );
@@ -221,7 +221,7 @@
// Check that the entry has no descendant
if ( schemaManager.getAttributeTypeRegistry().hasDescendants( oldAt.getOid() ) )
{
- String msg = "Cannot rename " + entry.getDn().getUpName() + " to " + newDn
+ String msg = "Cannot rename " + entry.getDn().getName() + " to " + newDn
+ " as the later has descendants' AttributeTypes";
throw new LdapOperationNotSupportedException( msg, ResultCodeEnum.UNWILLING_TO_PERFORM );
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java Sun Jan 3 15:04:50 2010
@@ -126,12 +126,12 @@
{
if ( schemaManager.add( comparator ) )
{
- LOG.debug( "Added {} into the enabled schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "Added {} into the enabled schema {}", dn.getName(), schemaName );
}
else
{
// We have some error : reject the addition and get out
- String msg = "Cannot add the Comparator " + entry.getDn().getUpName() + " into the registries, "
+ String msg = "Cannot add the Comparator " + entry.getDn().getName() + " into the registries, "
+ "the resulting registries would be inconsistent :" +
StringTools.listToString( schemaManager.getErrors() );
LOG.info( msg );
@@ -140,7 +140,7 @@
}
else
{
- LOG.debug( "The Comparator {} cannot be added in the disabled schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "The Comparator {} cannot be added in the disabled schema {}", dn.getName(), schemaName );
}
}
@@ -166,7 +166,7 @@
if ( schema.isDisabled() )
{
// The schema is disabled, nothing to do.
- LOG.debug( "The Comparator {} cannot be deleted from the disabled schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "The Comparator {} cannot be deleted from the disabled schema {}", dn.getName(), schemaName );
return;
}
@@ -194,7 +194,7 @@
else
{
// Ok, definitively an error
- String msg = "Cannot delete the Comparator " + entry.getDn().getUpName() + " as it "
+ String msg = "Cannot delete the Comparator " + entry.getDn().getName() + " as it "
+ "does not exist in any schema";
LOG.info( msg );
throw new LdapSchemaViolationException( msg, ResultCodeEnum.UNWILLING_TO_PERFORM );
@@ -207,11 +207,11 @@
{
if ( schemaManager.delete( comparator ) )
{
- LOG.debug( "Deleted {} from the enabled schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "Deleted {} from the enabled schema {}", dn.getName(), schemaName );
}
else
{
- String msg = "Cannot delete the Comparator " + entry.getDn().getUpName() + " into the registries, "
+ String msg = "Cannot delete the Comparator " + entry.getDn().getName() + " into the registries, "
+ "the resulting registries would be inconsistent :" + StringTools.listToString( errors );
LOG.info( msg );
throw new LdapOperationNotSupportedException( msg, ResultCodeEnum.UNWILLING_TO_PERFORM );
@@ -219,7 +219,7 @@
}
else
{
- LOG.debug( "The Comparator {} cannot be deleted from the disabled schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "The Comparator {} cannot be deleted from the disabled schema {}", dn.getName(), schemaName );
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java Sun Jan 3 15:04:50 2010
@@ -122,12 +122,12 @@
{
if ( schemaManager.add( matchingRule ) )
{
- LOG.debug( "Added {} into the enabled schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "Added {} into the enabled schema {}", dn.getName(), schemaName );
}
else
{
// We have some error : reject the addition and get out
- String msg = "Cannot add the MatchingRule " + entry.getDn().getUpName() + " into the registries, "
+ String msg = "Cannot add the MatchingRule " + entry.getDn().getName() + " into the registries, "
+ "the resulting registries would be inconsistent :" +
StringTools.listToString( schemaManager.getErrors() );
LOG.info( msg );
@@ -163,7 +163,7 @@
{
// The schema is disabled, nothing to do.
LOG.debug( "The MatchingRule {} cannot be removed from the disabled schema {}.",
- dn.getUpName(), schemaName );
+ dn.getName(), schemaName );
return;
}
@@ -181,7 +181,7 @@
{
// We have some error : reject the deletion and get out
// The schema is disabled. We still have to update the backend
- String msg = "Cannot delete the MatchingRule " + entry.getDn().getUpName() + " into the registries, "
+ String msg = "Cannot delete the MatchingRule " + entry.getDn().getName() + " into the registries, "
+ "the resulting registries would be inconsistent :" +
StringTools.listToString( schemaManager.getErrors() );
LOG.info( msg );
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java Sun Jan 3 15:04:50 2010
@@ -124,11 +124,11 @@
{
if ( schemaManager.add( normalizer ) )
{
- LOG.debug( "Added {} into the enabled schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "Added {} into the enabled schema {}", dn.getName(), schemaName );
}
else
{
- String msg = "Cannot delete the Normalizer " + entry.getDn().getUpName() + " into the registries, "
+ String msg = "Cannot delete the Normalizer " + entry.getDn().getName() + " into the registries, "
+ "the resulting registries would be inconsistent :" + StringTools.listToString( errors );
LOG.info( msg );
throw new LdapOperationNotSupportedException( msg, ResultCodeEnum.UNWILLING_TO_PERFORM );
@@ -141,13 +141,13 @@
if ( !errors.isEmpty() )
{
- String msg = "Cannot add the Normalizer " + entry.getDn().getUpName() + " into the registries, "
+ String msg = "Cannot add the Normalizer " + entry.getDn().getName() + " into the registries, "
+ "we have got some errors :" + StringTools.listToString( errors );
throw new LdapOperationNotSupportedException( msg, ResultCodeEnum.UNWILLING_TO_PERFORM );
}
- LOG.debug( "The normalizer {} cannot be added in schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "The normalizer {} cannot be added in schema {}", dn.getName(), schemaName );
}
}
@@ -174,7 +174,7 @@
{
if ( schemaManager.getRegistries().isReferenced( normalizer ) )
{
- String msg = "Cannot delete " + entry.getDn().getUpName() + ", as there are some "
+ String msg = "Cannot delete " + entry.getDn().getName() + ", as there are some "
+ " dependant SchemaObjects :\n" + getReferenced( normalizer );
LOG.warn( msg );
throw new LdapOperationNotSupportedException( msg, ResultCodeEnum.UNWILLING_TO_PERFORM );
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java Sun Jan 3 15:04:50 2010
@@ -118,12 +118,12 @@
{
if ( schemaManager.add( objectClass ) )
{
- LOG.debug( "Added {} into the enabled schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "Added {} into the enabled schema {}", dn.getName(), schemaName );
}
else
{
// We have some error : reject the addition and get out
- String msg = "Cannot add the ObjectClass " + entry.getDn().getUpName() + " into the registries, "
+ String msg = "Cannot add the ObjectClass " + entry.getDn().getName() + " into the registries, "
+ "the resulting registries would be inconsistent :" +
StringTools.listToString( schemaManager.getErrors() );
LOG.info( msg );
@@ -160,7 +160,7 @@
{
// The schema is disabled, nothing to do.
LOG.debug( "The ObjectClass {} cannot be removed from the disabled schema {}.",
- dn.getUpName(), schemaName );
+ dn.getName(), schemaName );
return;
}
@@ -177,7 +177,7 @@
else
{
// We have some error : reject the deletion and get out
- String msg = "Cannot delete the ObjectClass " + entry.getDn().getUpName() + " from the registries, "
+ String msg = "Cannot delete the ObjectClass " + entry.getDn().getName() + " from the registries, "
+ "the resulting registries would be inconsistent :" +
StringTools.listToString( schemaManager.getErrors() );
LOG.info( msg );
@@ -228,7 +228,7 @@
// Check that the entry has no descendant
if ( schemaManager.getObjectClassRegistry().hasDescendants( oldOc.getOid() ) )
{
- String msg = "Cannot rename " + entry.getDn().getUpName() + " to " + newDn
+ String msg = "Cannot rename " + entry.getDn().getName() + " to " + newDn
+ " as the later has descendants' ObjectClasses";
throw new LdapOperationNotSupportedException( msg, ResultCodeEnum.UNWILLING_TO_PERFORM );
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java Sun Jan 3 15:04:50 2010
@@ -188,7 +188,7 @@
if ( !parentDn.equals( ouSchemaDN ) )
{
- throw new LdapInvalidNameException( "The parent dn of a schema should be " + ouSchemaDN.getUpName() + " and not: "
+ throw new LdapInvalidNameException( "The parent dn of a schema should be " + ouSchemaDN.getName() + " and not: "
+ parentDn.toNormName(), ResultCodeEnum.NAMING_VIOLATION );
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java Sun Jan 3 15:04:50 2010
@@ -124,11 +124,11 @@
{
if ( schemaManager.add( syntaxChecker ) )
{
- LOG.debug( "Added {} into the enabled schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "Added {} into the enabled schema {}", dn.getName(), schemaName );
}
else
{
- String msg = "Cannot delete the SyntaxChecker " + entry.getDn().getUpName() + " into the registries, "
+ String msg = "Cannot delete the SyntaxChecker " + entry.getDn().getName() + " into the registries, "
+ "the resulting registries would be inconsistent :" +
StringTools.listToString( schemaManager.getErrors() );
LOG.info( msg );
@@ -137,7 +137,7 @@
}
else
{
- LOG.debug( "The SyntaxChecker {} cannot be added in the disabled schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "The SyntaxChecker {} cannot be added in the disabled schema {}", dn.getName(), schemaName );
}
}
@@ -163,7 +163,7 @@
if ( schema.isDisabled() )
{
// The schema is disabled, nothing to do.
- LOG.debug( "The SyntaxChecker {} cannot be deleted from the disabled schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "The SyntaxChecker {} cannot be deleted from the disabled schema {}", dn.getName(), schemaName );
return;
}
@@ -191,7 +191,7 @@
else
{
// Ok, definitively an error
- String msg = "Cannot delete the SyntaxChecker " + entry.getDn().getUpName() + " as it "
+ String msg = "Cannot delete the SyntaxChecker " + entry.getDn().getName() + " as it "
+ "does not exist in any schema";
LOG.info( msg );
throw new LdapSchemaViolationException( msg, ResultCodeEnum.UNWILLING_TO_PERFORM );
@@ -202,11 +202,11 @@
{
if ( schemaManager.delete( syntaxChecker ) )
{
- LOG.debug( "Deleted {} from the enabled schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "Deleted {} from the enabled schema {}", dn.getName(), schemaName );
}
else
{
- String msg = "Cannot delete the syntaxChecker " + entry.getDn().getUpName() + " into the registries, "
+ String msg = "Cannot delete the syntaxChecker " + entry.getDn().getName() + " into the registries, "
+ "the resulting registries would be inconsistent :" +
StringTools.listToString( schemaManager.getErrors() );
LOG.info( msg );
@@ -215,7 +215,7 @@
}
else
{
- LOG.debug( "The syntaxChecker {} cannot be deleted from the disabled schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "The syntaxChecker {} cannot be deleted from the disabled schema {}", dn.getName(), schemaName );
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java Sun Jan 3 15:04:50 2010
@@ -124,12 +124,12 @@
{
if ( schemaManager.add( syntax ) )
{
- LOG.debug( "Added {} into the enabled schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "Added {} into the enabled schema {}", dn.getName(), schemaName );
}
else
{
// We have some error : reject the addition and get out
- String msg = "Cannot add the Syntax " + entry.getDn().getUpName() + " into the registries, "
+ String msg = "Cannot add the Syntax " + entry.getDn().getName() + " into the registries, "
+ "the resulting registries would be inconsistent :" +
StringTools.listToString( schemaManager.getErrors() );
LOG.info( msg );
@@ -138,7 +138,7 @@
}
else
{
- LOG.debug( "The Syntax {} cannot be added in the disabled schema {}", dn.getUpName(), schemaName );
+ LOG.debug( "The Syntax {} cannot be added in the disabled schema {}", dn.getName(), schemaName );
}
}
@@ -218,7 +218,7 @@
{
// The schema is disabled, nothing to do.
LOG.debug( "The Syntax {} cannot be removed from the disabled schema {}.",
- dn.getUpName(), schemaName );
+ dn.getName(), schemaName );
return;
}
@@ -237,7 +237,7 @@
else
{
// We have some error : reject the deletion and get out
- String msg = "Cannot delete the Syntax " + entry.getDn().getUpName() + " into the registries, "
+ String msg = "Cannot delete the Syntax " + entry.getDn().getName() + " into the registries, "
+ "the resulting registries would be inconsistent :" + StringTools.listToString( errors );
LOG.info( msg );
throw new LdapOperationNotSupportedException( msg, ResultCodeEnum.UNWILLING_TO_PERFORM );
Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java Sun Jan 3 15:04:50 2010
@@ -2494,7 +2494,7 @@
if ( dn.isNormalized() )
{
sb.append( "[n]: " );
- sb.append( dn.getUpName() );
+ sb.append( dn.getName() );
}
else
{
Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java Sun Jan 3 15:04:50 2010
@@ -615,7 +615,7 @@
ServerSearchResult rec = result.next();
SearchResult searchResult = new SearchResult(
- rec.getDn().getUpName(),
+ rec.getDn().getName(),
rec.getObject(),
toBasicAttributes( rec.getServerEntry() ),
rec.isRelative() );
@@ -643,7 +643,7 @@
ServerSearchResult rec = result.next();
SearchResult searchResult = new SearchResult(
- rec.getDn().getUpName(),
+ rec.getDn().getName(),
rec.getObject(),
toBasicAttributes( rec.getServerEntry() ),
rec.isRelative() );
Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java Sun Jan 3 15:04:50 2010
@@ -131,7 +131,7 @@
*/
public String toString()
{
- String name = (dn == null ? "null" : ( dn == LdapDN.EMPTY_LDAPDN ? "\"\"" : dn.getUpName() ) );
+ String name = (dn == null ? "null" : ( dn == LdapDN.EMPTY_LDAPDN ? "\"\"" : dn.getName() ) );
return "ServerSearchResult : " + name + "\n" + serverEntry;
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java Sun Jan 3 15:04:50 2010
@@ -59,7 +59,7 @@
service.getAdminSession().add(
new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) );
- LdapContext sysRoot = getContext( akarasulu.getDn().getUpName(), service, "ou=system" );
+ LdapContext sysRoot = getContext( akarasulu.getDn().getName(), service, "ou=system" );
HashSet<String> set = new HashSet<String>();
NamingEnumeration<NameClassPair> list = sysRoot.list( "" );
@@ -82,7 +82,7 @@
service.getAdminSession().add(
new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) );
- LdapContext sysRoot = getContext( akarasulu.getDn().getUpName(), service, "ou=system" );
+ LdapContext sysRoot = getContext( akarasulu.getDn().getName(), service, "ou=system" );
HashSet<String> set = new HashSet<String>();
NamingEnumeration<NameClassPair> list = sysRoot.list( "ou=users" );
Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java Sun Jan 3 15:04:50 2010
@@ -272,7 +272,7 @@
}
catch ( PartialResultException pre )
{
- assertEquals( "cn=alex karasulu,ou=apache", ((LdapDN)pre.getRemainingName()).getUpName() );
+ assertEquals( "cn=alex karasulu,ou=apache", ((LdapDN)pre.getRemainingName()).getName() );
assertEquals( LdapDN.EMPTY_LDAPDN, pre.getResolvedName() );
}
}
@@ -308,8 +308,8 @@
}
catch ( LdapReferralException lre )
{
- assertEquals( "cn=alex karasulu,ou=apache", ((LdapDN)lre.getRemainingName()).getUpName() );
- assertEquals( "ou=users,ou=system", ((LdapDN)lre.getResolvedName()).getUpName() );
+ assertEquals( "cn=alex karasulu,ou=apache", ((LdapDN)lre.getRemainingName()).getName() );
+ assertEquals( "ou=users,ou=system", ((LdapDN)lre.getResolvedName()).getName() );
}
}
@@ -343,7 +343,7 @@
}
catch ( PartialResultException pre )
{
- assertEquals( "cn=alex karasulu,ou=apache", ((LdapDN)pre.getRemainingName()).getUpName() );
+ assertEquals( "cn=alex karasulu,ou=apache", ((LdapDN)pre.getRemainingName()).getName() );
assertEquals( LdapDN.EMPTY_LDAPDN, pre.getResolvedName() );
}
}
Modified: directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java Sun Jan 3 15:04:50 2010
@@ -117,7 +117,7 @@
{
try
{
- Binding binding = new Binding( opContext.getDn().getUpName(),
+ Binding binding = new Binding( opContext.getDn().getName(),
ServerEntryUtils.toBasicAttributes( opContext.getEntry() ), false );
NamingEvent evt = new NamingEvent( source, NamingEvent.OBJECT_ADDED,
binding, null, opContext );
@@ -143,7 +143,7 @@
{
if ( listener instanceof NamespaceChangeListener )
{
- Binding binding = new Binding( opContext.getDn().getUpName(),
+ Binding binding = new Binding( opContext.getDn().getName(),
ServerEntryUtils.toBasicAttributes( opContext.getEntry() ), false );
NamingEvent evt = new NamingEvent( source, NamingEvent.OBJECT_REMOVED, null,
binding, opContext );
@@ -164,9 +164,9 @@
{
try
{
- Binding newBinding = new Binding( opContext.getDn().getUpName(),
+ Binding newBinding = new Binding( opContext.getDn().getName(),
ServerEntryUtils.toBasicAttributes( opContext.getEntry() ), false );
- Binding oldBinding = new Binding( opContext.getDn().getUpName(),
+ Binding oldBinding = new Binding( opContext.getDn().getName(),
ServerEntryUtils.toBasicAttributes( opContext.getEntry().getOriginalEntry() ), false );
NamingEvent evt = new NamingEvent( source, NamingEvent.OBJECT_CHANGED,
newBinding, oldBinding, opContext );
@@ -192,9 +192,9 @@
{
if ( listener instanceof NamespaceChangeListener )
{
- Binding newBinding = new Binding( opContext.getDn().getUpName(),
+ Binding newBinding = new Binding( opContext.getDn().getName(),
ServerEntryUtils.toBasicAttributes( opContext.getEntry() ), false );
- Binding oldBinding = new Binding( opContext.getDn().getUpName(),
+ Binding oldBinding = new Binding( opContext.getDn().getName(),
ServerEntryUtils.toBasicAttributes( opContext.getEntry().getOriginalEntry() ), false );
NamingEvent evt = new NamingEvent( source, NamingEvent.OBJECT_RENAMED,
newBinding, oldBinding, opContext );
@@ -217,9 +217,9 @@
{
if ( listener instanceof NamespaceChangeListener )
{
- Binding newBinding = new Binding( opContext.getDn().getUpName(),
+ Binding newBinding = new Binding( opContext.getDn().getName(),
ServerEntryUtils.toBasicAttributes( opContext.getEntry() ), false );
- Binding oldBinding = new Binding( opContext.getDn().getUpName(),
+ Binding oldBinding = new Binding( opContext.getDn().getName(),
ServerEntryUtils.toBasicAttributes( opContext.getEntry().getOriginalEntry() ), false );
NamingEvent evt = new NamingEvent( source, NamingEvent.OBJECT_RENAMED,
newBinding, oldBinding, opContext );
@@ -242,9 +242,9 @@
{
if ( listener instanceof NamespaceChangeListener )
{
- Binding newBinding = new Binding( opContext.getDn().getUpName(),
+ Binding newBinding = new Binding( opContext.getDn().getName(),
ServerEntryUtils.toBasicAttributes( opContext.getEntry() ), false );
- Binding oldBinding = new Binding( opContext.getDn().getUpName(),
+ Binding oldBinding = new Binding( opContext.getDn().getName(),
ServerEntryUtils.toBasicAttributes( opContext.getEntry().getOriginalEntry() ), false );
NamingEvent evt = new NamingEvent( source, NamingEvent.OBJECT_RENAMED,
newBinding, oldBinding, null );
Modified: directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java Sun Jan 3 15:04:50 2010
@@ -116,7 +116,7 @@
JndiUtils.wrap( e );
}
- SearchResult result = new SearchResult( entry.getDn().getUpName(), null,
+ SearchResult result = new SearchResult( entry.getDn().getName(), null,
ServerEntryUtils.toBasicAttributes( entry ) );
result.setRelative( false );
return result;
Modified: directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Sun Jan 3 15:04:50 2010
@@ -653,7 +653,7 @@
*/
public String getNameInNamespace() throws NamingException
{
- return dn.getUpName();
+ return dn.getName();
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Sun Jan 3 15:04:50 2010
@@ -1392,7 +1392,7 @@
{
LdifEntry ldifEntry = testEntry.clone();
Entry entry = ldifEntry.getEntry();
- String dn = ldifEntry.getDn().getUpName();
+ String dn = ldifEntry.getDn().getName();
try
{
@@ -1458,7 +1458,7 @@
if( changeLog.isExposed() && changeLog.isTagSearchSupported() )
{
- String clSuffix = ( ( TaggableSearchableChangeLogStore ) changeLog.getChangeLogStore() ).getPartition().getSuffixDn().getUpName();
+ String clSuffix = ( ( TaggableSearchableChangeLogStore ) changeLog.getChangeLogStore() ).getPartition().getSuffixDn().getName();
partitionNexus.getRootDSE( null ).getOriginalEntry().add( SchemaConstants.CHANGELOG_CONTEXT_AT, clSuffix );
}
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Sun Jan 3 15:04:50 2010
@@ -443,7 +443,7 @@
// This is a case where the Bind request contains a DN, but no password.
// We don't check the DN, we just return a UnwillingToPerform error
// Cf RFC 4513, chap. 5.1.2
- throw new LdapOperationNotSupportedException( "Cannot Bind for DN " + opContext.getDn().getUpName(), ResultCodeEnum.UNWILLING_TO_PERFORM );
+ throw new LdapOperationNotSupportedException( "Cannot Bind for DN " + opContext.getDn().getName(), ResultCodeEnum.UNWILLING_TO_PERFORM );
}
Collection<Authenticator> authenticators = getAuthenticators( level.getName() );
@@ -513,7 +513,7 @@
}
LdapDN dn = opContext.getDn();
- String upDn = ( dn == null ? "" : dn.getUpName() );
+ String upDn = ( dn == null ? "" : dn.getName() );
throw new LdapAuthenticationException( "Cannot authenticate user " + upDn );
}
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=895401&r1=895400&r2=895401&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Sun Jan 3 15:04:50 2010
@@ -329,7 +329,7 @@
else
{
// Bad password ...
- String message = "Password not correct for user '" + opContext.getDn().getUpName() + "'";
+ String message = "Password not correct for user '" + opContext.getDn().getName() + "'";
LOG.info( message );
throw new LdapAuthenticationException( message );
}
@@ -337,7 +337,7 @@
else
{
// Bad password ...
- String message = "Password not correct for user '" + opContext.getDn().getUpName() + "'";
+ String message = "Password not correct for user '" + opContext.getDn().getName() + "'";
LOG.info( message );
throw new LdapAuthenticationException( message );
}
@@ -605,7 +605,7 @@
if ( userEntry == null )
{
LdapDN dn = opContext.getDn();
- String upDn = ( dn == null ? "" : dn.getUpName() );
+ String upDn = ( dn == null ? "" : dn.getName() );
throw new LdapAuthenticationException( "Failed to lookup user for authentication: " + upDn );
}